From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:21:42 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:21:42 +0000 Subject: Change in libosmocore[master]: ns2: Use proper return value from write_queue callback function In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22551 ) Change subject: ns2: Use proper return value from write_queue callback function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I93c858facfe7e1c533df8dccc4502a574686bc8a Gerrit-Change-Number: 22551 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-Comment-Date: Mon, 01 Feb 2021 00:21:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:22:00 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:22:00 +0000 Subject: Change in libosmocore[master]: ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22552 ) Change subject: ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ba64e96c60e23d2e6c8ecdcab0b52b3833f092c Gerrit-Change-Number: 22552 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:22:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:29:47 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:29:47 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add simple NS traffic generator In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22553 ) Change subject: osmo-ns-dummy: Add simple NS traffic generator ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22553/2/utils/osmo-ns-dummy-vty.c File utils/osmo-ns-dummy-vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22553/2/utils/osmo-ns-dummy-vty.c at 189 PS2, Line 189: if (ntg->running) { I would have used osmo_timer_pending() instead of running -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad3b694c85962dbbc6b4a27a0ed5bc841add464f Gerrit-Change-Number: 22553 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:29:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:50:22 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:50:22 +0000 Subject: Change in libosmocore[master]: ns2: Work around AF_PACKET socket ENOBUFS problems In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22555 ) Change subject: ns2: Work around AF_PACKET socket ENOBUFS problems ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4f79a246236c94175ceffa5f3f556c8931c6bc62 Gerrit-Change-Number: 22555 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:50:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:50:56 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:50:56 +0000 Subject: Change in libosmocore[master]: ns2: Use named array initializers to avoid mistakes In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22556 ) Change subject: ns2: Use named array initializers to avoid mistakes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id0ebd2a202a465ca0298f4245f1fb5c495235fc8 Gerrit-Change-Number: 22556 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:50:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:51:41 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:51:41 +0000 Subject: Change in libosmocore[master]: ns2: encapsulate calls to nsvc->bind->send_vc() In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22557 ) Change subject: ns2: encapsulate calls to nsvc->bind->send_vc() ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22557/2/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/22557/2/src/gb/gprs_ns2_message.c at 169 PS2, Line 169: static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg) inline? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8d14c7b8d3aacc2bed033072d7934dbd6aab41df Gerrit-Change-Number: 22557 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:51:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:52:10 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:52:10 +0000 Subject: Change in libosmocore[master]: ns2: Increment Rx and Tx byte / packet counters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22558 ) Change subject: ns2: Increment Rx and Tx byte / packet counters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If5e93f69cddbc8962cbbae38c07b504dd9b1ecd1 Gerrit-Change-Number: 22558 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:52:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:58:50 +0000 Subject: Change in libosmocore[master]: ns2: Properly report packet drops in FR code In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22559 ) Change subject: ns2: Properly report packet drops in FR code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4bb517fd04af69dbe6da628b132d57994ab3e5a4 Gerrit-Change-Number: 22559 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:58:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 00:59:59 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 00:59:59 +0000 Subject: Change in libosmocore[master]: ns2: count number of dropped packets / bytes on transmit In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22560 ) Change subject: ns2: count number of dropped packets / bytes on transmit ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If21906ff5379038f7be10cf48c68d1f756dd7c1e Gerrit-Change-Number: 22560 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 00:59:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:00:30 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:00:30 +0000 Subject: Change in libosmocore[master]: ns2: Implement more rate counters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22561 ) Change subject: ns2: Implement more rate counters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75d8637bd142722fdf9a162a2369aa9cdc980a57 Gerrit-Change-Number: 22561 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:00:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:05:43 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:05:43 +0000 Subject: Change in libosmocore[master]: ns2: Add a rate_ctr for each NS-UNBLOCK In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22562 ) Change subject: ns2: Add a rate_ctr for each NS-UNBLOCK ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I693109b7bc4d72b6803b40aae15327389aa37c69 Gerrit-Change-Number: 22562 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:05:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:07:01 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:07:01 +0000 Subject: Change in libosmocore[master]: ns2: Implement more rate counters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22561 ) Change subject: ns2: Implement more rate counters ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22561/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22561/2/src/gb/gprs_ns2_vc_fsm.c at 300 PS2, Line 300: if (old_state != GPRS_NS2_ST_BLOCKED) { I'm unsure about this blocked. Need to look another look. Only +1. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75d8637bd142722fdf9a162a2369aa9cdc980a57 Gerrit-Change-Number: 22561 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:07:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:09:52 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:09:52 +0000 Subject: Change in libosmocore[master]: ns2: remove "invalid NSEI" and "invalid NS-VCI" counters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22563 ) Change subject: ns2: remove "invalid NSEI" and "invalid NS-VCI" counters ...................................................................... Patch Set 2: You can receive an invalid packet (wrong NSEI/wrong NSVCI) on a specific NSVC. The question is where do we want to track it? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iadb4baee6d459e2db7b16a64a213164572774a2e Gerrit-Change-Number: 22563 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:09:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:23:56 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:23:56 +0000 Subject: Change in libosmocore[master]: ns2: Move to one common/shared ns2_bind_alloc() In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22566 ) Change subject: ns2: Move to one common/shared ns2_bind_alloc() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I535fc68e94fcd695de827dd922706adc1c5a2cb7 Gerrit-Change-Number: 22566 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:23:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:25:44 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:25:44 +0000 Subject: Change in libosmocore[master]: ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22568 ) Change subject: ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx ...................................................................... Patch Set 2: Code-Review+2 In general I would like to drop the requirement of the index in the rate_ctr code. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68a2ef3b48097f524831dd04821824b21d6d1e18 Gerrit-Change-Number: 22568 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:25:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:27:21 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:27:21 +0000 Subject: Change in libosmocore[master]: ns2: Introduce a per-bind stat_item group with backlog length In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22569 ) Change subject: ns2: Introduce a per-bind stat_item group with backlog length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c55b4619b1221d7e607ace58649323407faf86b Gerrit-Change-Number: 22569 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:27:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:27:38 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:27:38 +0000 Subject: Change in libosmocore[master]: ns2: Fix typos in comments In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22570 ) Change subject: ns2: Fix typos in comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I155fd697e229621561f7d00204421ac941101d77 Gerrit-Change-Number: 22570 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:27:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:29:33 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:29:33 +0000 Subject: Change in libosmocore[master]: ns2: Print NS-STATUS.ind primitives to the log In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22571 ) Change subject: ns2: Print NS-STATUS.ind primitives to the log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I368883acfc8ea76529befcd429bf8f2445a60a94 Gerrit-Change-Number: 22571 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:29:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:31:55 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:31:55 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22572 ) Change subject: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22572/1/utils/osmo-ns-dummy.c File utils/osmo-ns-dummy.c: https://gerrit.osmocom.org/c/libosmocore/+/22572/1/utils/osmo-ns-dummy.c at 221 PS1, Line 221: extern int nsdummy_vty_init(struct gprs_ns2_inst *nsi); you removed the argument from nsdummy_vty_init() https://gerrit.osmocom.org/c/libosmocore/+/22572/1/utils/osmo-ns-dummy.c at 291 PS1, Line 291: gprs_ns2_free(g_nsi); wihtout g_nsi() -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda Gerrit-Change-Number: 22572 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:31:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 1 01:32:06 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Feb 2021 01:32:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <60175a315fbad_32fe2b11e4bbc5f81552641@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 158s] make[3]: Entering directory '/usr/src/packages/BUILD/src/sim' [ 158s] CC core.lo [ 159s] CC reader.lo [ 159s] CC class_tables.lo [ 159s] CC card_fs_sim.lo [ 159s] card_fs_sim.c:105:1: error: initializer element is not constant [ 159s] }; [ 159s] ^ [ 159s] card_fs_sim.c:105:1: error: (near initialization for 'ts11_11_sw[22]') [ 159s] Makefile:531: recipe for target 'card_fs_sim.lo' failed [ 159s] make[3]: *** [card_fs_sim.lo] Error 1 [ 159s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/sim' [ 159s] Makefile:693: recipe for target 'all-recursive' failed [ 159s] make[2]: *** [all-recursive] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 159s] Makefile:471: recipe for target 'all' failed [ 159s] make[1]: *** [all] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: make -j1 returned exit code 2 [ 159s] debian/rules:15: recipe for target 'build' failed [ 159s] make: *** [build] Error 2 [ 159s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 159s] ### VM INTERACTION START ### [ 161s] Powering off. [ 161s] [ 153.998812] reboot: Power down [ 161s] ### VM INTERACTION END ### [ 161s] [ 161s] sheep81 failed "build libosmocore_1.4.0.429.4d400.dsc" at Mon Feb 1 01:31:50 UTC 2021. [ 161s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Feb 1 01:40:06 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Feb 2021 01:40:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <60175c11808_32fe2b11e4bbc5f815559d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 197s] make[3]: Entering directory '/usr/src/packages/BUILD/src/sim' [ 197s] CC core.lo [ 198s] CC reader.lo [ 198s] CC class_tables.lo [ 198s] CC card_fs_sim.lo [ 198s] card_fs_sim.c:105:1: error: initializer element is not constant [ 198s] }; [ 198s] ^ [ 198s] card_fs_sim.c:105:1: error: (near initialization for 'ts11_11_sw[22]') [ 198s] Makefile:531: recipe for target 'card_fs_sim.lo' failed [ 198s] make[3]: *** [card_fs_sim.lo] Error 1 [ 198s] make[3]: Leaving directory '/usr/src/packages/BUILD/src/sim' [ 198s] Makefile:693: recipe for target 'all-recursive' failed [ 198s] make[2]: *** [all-recursive] Error 1 [ 198s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 198s] Makefile:471: recipe for target 'all' failed [ 198s] make[1]: *** [all] Error 2 [ 198s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 198s] dh_auto_build: make -j1 returned exit code 2 [ 198s] debian/rules:15: recipe for target 'build' failed [ 198s] make: *** [build] Error 2 [ 198s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 198s] ### VM INTERACTION START ### [ 199s] Powering off. [ 199s] [ 189.103952] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] lamb53 failed "build libosmocore_1.4.0.429.4d400.dsc" at Mon Feb 1 01:39:57 UTC 2021. [ 200s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:45:19 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:45:19 +0000 Subject: Change in libosmocore[master]: frame_relay: Send "Fuil Status" ENQUIRY after link recovers In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22573 ) Change subject: frame_relay: Send "Fuil Status" ENQUIRY after link recovers ...................................................................... Patch Set 1: Code-Review+1 In theory it should be also appended to link integrity verification. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f905a18a7d130a3c02b4a3e7a2a2dc24afc0ea1 Gerrit-Change-Number: 22573 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:45:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:45:29 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:45:29 +0000 Subject: Change in libosmocore[master]: ns2: cosmetic: fix indent levels In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22574 ) Change subject: ns2: cosmetic: fix indent levels ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifcb0d5ddf824cd876de91afca1021aeb4f6c3e8b Gerrit-Change-Number: 22574 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:45:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:46:33 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:46:33 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 01:46:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 01:49:28 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 01:49:28 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: lynxis lazus has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Removed Code-Review+2 by lynxis lazus -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:01:26 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:01:26 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c at a421 PS2, Line 421: return I'm not as 100 % sure here. I would still say we have to follow the Network on the DLCs which are valid or not. As long our link is invalid it doesn't matter. https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c at a437 PS2, Line 437: return; we can't remove this. Otherwise the link recovery would set all User Equipment configured DLCs active. But only the network can say which DLCs are active. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:01:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:01:30 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:01:30 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:01:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 1 02:02:06 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Feb 2021 02:02:06 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6017613689eca_32fe2b11e4bbc5f81561330@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 116s] [COMPILING apps/dfu/main.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 116s] Memory region Used Size Region Size %age Used [ 116s] rom: 16580 B 16 KB 101.20% [ 116s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 116s] collect2: error: ld returned 1 exit status [ 116s] % [ 116s] make[2]: *** [Makefile:234: flash] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 116s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] dh_auto_build: error: make -j1 returned exit code 2 [ 116s] make: *** [debian/rules:16: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 108.229769] sysrq: Power Off [ 119s] [ 108.233664] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] sheep86 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 1 02:01:54 UTC 2021. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:04:58 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:04:58 +0000 Subject: Change in libosmocore[master]: frame_relay: Discard received messages for DLC not yet active In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22576 ) Change subject: frame_relay: Discard received messages for DLC not yet active ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia4a045fdf165b526f429f4617e0fdc76036480bd Gerrit-Change-Number: 22576 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:04:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:05:29 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:05:29 +0000 Subject: Change in libosmocore[master]: frame_relay: cosmetic: Unify log syntax when discarding Rx packets In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22577 ) Change subject: frame_relay: cosmetic: Unify log syntax when discarding Rx packets ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22577/2/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22577/2/src/gb/frame_relay.c at 797 PS2, Line 797: di typo -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 Gerrit-Change-Number: 22577 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:05:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:06:48 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:06:48 +0000 Subject: Change in libosmocore[master]: ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22578 ) Change subject: ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31fe695a83d38ea1f10f5444e840633d7fa68442 Gerrit-Change-Number: 22578 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:06:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:07:33 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:07:33 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22579 ) Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22579/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22579/2/src/gb/gprs_ns2_vc_fsm.c at 636 PS2, Line 636: stop_test_procedure(priv); can we move this into the state_enter? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:07:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:09:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:09:12 +0000 Subject: Change in libosmocore[master]: ns2: Don't start sending NS-RESET until FR DLC is available In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22580 ) Change subject: ns2: Don't start sending NS-RESET until FR DLC is available ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id4e7565ba166ca1d12f8800c643d9f2bc4d66873 Gerrit-Change-Number: 22580 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:09:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 1 02:18:24 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 01 Feb 2021 02:18:24 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601764fb93682_32fe2b11e4bbc5f81566275@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 227s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 227s] [COMPILING libboard/qmod/source/card_pres.c] [ 227s] [COMPILING libboard/qmod/source/wwan_led.c] [ 228s] [COMPILING libboard/qmod/source/i2c.c] [ 228s] [COMPILING libboard/qmod/source/board_qmod.c] [ 228s] [COMPILING apps/dfu/main.c] [ 228s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 228s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 229s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 229s] Memory region Used Size Region Size %age Used [ 229s] rom: 16588 B 16 KB 101.25% [ 229s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 229s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 229s] collect2: error: ld returned 1 exit status [ 229s] % [ 229s] make[2]: *** [Makefile:234: flash] Error 1 [ 229s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 229s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 229s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 229s] dh_auto_build: error: make -j1 returned exit code 2 [ 229s] make: *** [debian/rules:16: build] Error 25 [ 229s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 229s] ### VM INTERACTION START ### [ 232s] [ 211.925348] sysrq: Power Off [ 232s] [ 211.936429] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] lamb24 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 1 02:18:08 UTC 2021. [ 232s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:19:06 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:19:06 +0000 Subject: Change in libosmocore[master]: ns2: Implement more rate counters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22561 ) Change subject: ns2: Implement more rate counters ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22561/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22561/2/src/gb/gprs_ns2_vc_fsm.c at 300 PS2, Line 300: if (old_state != GPRS_NS2_ST_BLOCKED) { > I'm unsure about this blocked. Need to look another look. Only +1. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75d8637bd142722fdf9a162a2369aa9cdc980a57 Gerrit-Change-Number: 22561 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:19:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:19:27 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:19:27 +0000 Subject: Change in libosmocore[master]: ns2: remove "invalid NSEI" and "invalid NS-VCI" counters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22563 ) Change subject: ns2: remove "invalid NSEI" and "invalid NS-VCI" counters ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iadb4baee6d459e2db7b16a64a213164572774a2e Gerrit-Change-Number: 22563 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 02:19:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 02:59:43 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 02:59:43 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22587 ) Change subject: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration ...................................................................... gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration A correct configured PCU wrote the following vty configuration to the file ns encapsulation udp use-reset-block-unblock enabled encapsulation framerelay-gre enabled 0 Even there shouldn't be any NS configuration part of PCU configuration. To ignore those configuration call gprs_ns2_vty_ignore_legacy(). gprs_ns2_vty_ignore_legacy will only register dummy and deprecated vty calls. Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f --- M src/gb/Makefile.am M src/gb/libosmogb.map 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/22587/1 diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index d0db814..7392948 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -25,7 +25,7 @@ gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c gprs_bssgp_rim.c \ gprs_bssgp_bss.c \ gprs_ns2.c gprs_ns2_udp.c gprs_ns2_frgre.c gprs_ns2_fr.c gprs_ns2_vc_fsm.c gprs_ns2_sns.c \ - gprs_ns2_message.c gprs_ns2_vty.c \ + gprs_ns2_message.c gprs_ns2_vty.c gprs_ns2_vty_legacy.c \ gprs_bssgp2.c bssgp_bvc_fsm.c \ common_vty.c frame_relay.c diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index a3171d0..ff6d45c 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -186,6 +186,7 @@ gprs_ns2_sns_del_endpoint; gprs_ns2_vty_init; gprs_ns2_vty_init_reduced; +gprs_ns2_vty_ignore_legacy; gprs_nsvc_create2; gprs_nsvc_delete; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f Gerrit-Change-Number: 22587 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 03:58:51 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 03:58:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22587 to look at the new patch set (#2). Change subject: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration ...................................................................... gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration A correct configured PCU wrote the following vty configuration to the file: ns encapsulation udp use-reset-block-unblock enabled encapsulation framerelay-gre enabled 0 Even there shouldn't be any NS configuration part of PCU configuration. To ignore those configuration call gprs_ns2_vty_ignore_legacy(). gprs_ns2_vty_ignore_legacy will only register dummy and deprecated vty calls. Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f --- M src/gb/Makefile.am A src/gb/gprs_ns2_vty_legacy.c M src/gb/libosmogb.map 3 files changed, 61 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/22587/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f Gerrit-Change-Number: 22587 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:30:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:30:41 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add simple NS traffic generator In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22553 ) Change subject: osmo-ns-dummy: Add simple NS traffic generator ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22553/2/utils/osmo-ns-dummy-vty.c File utils/osmo-ns-dummy-vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22553/2/utils/osmo-ns-dummy-vty.c at 189 PS2, Line 189: if (ntg->running) { > I would have used osmo_timer_pending() instead of running will try to get this merged first and then submit a patch to get rid of 'running' -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad3b694c85962dbbc6b4a27a0ed5bc841add464f Gerrit-Change-Number: 22553 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 08:30:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:31:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:31:36 +0000 Subject: Change in libosmocore[master]: ns2: encapsulate calls to nsvc->bind->send_vc() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22557 ) Change subject: ns2: encapsulate calls to nsvc->bind->send_vc() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22557/2/src/gb/gprs_ns2_message.c File src/gb/gprs_ns2_message.c: https://gerrit.osmocom.org/c/libosmocore/+/22557/2/src/gb/gprs_ns2_message.c at 169 PS2, Line 169: static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg) > inline? I'll let the compiler figure that out. It's 2021 and I would have expected any compiler in the last 15+ years to do it by itself for a static function of this size... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8d14c7b8d3aacc2bed033072d7934dbd6aab41df Gerrit-Change-Number: 22557 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 08:31:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:09 +0000 Subject: Change in libosmocore[master]: ns2: Use proper return value from write_queue callback function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22551 ) Change subject: ns2: Use proper return value from write_queue callback function ...................................................................... ns2: Use proper return value from write_queue callback function write_queue expects a -errno value on error, not '-1'. Change-Id: I93c858facfe7e1c533df8dccc4502a574686bc8a Related: OS#4995 --- M src/gb/gprs_ns2_fr.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 1c88db6..f73033b 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -247,7 +247,12 @@ static int handle_netif_write(struct osmo_fd *ofd, struct msgb *msg) { - return write(ofd->fd, msgb_data(msg), msgb_length(msg)); + int rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); + /* write_queue expects a "-errno" type return value in case of failure */ + if (rc == -1) + return -errno; + else + return rc; } /*! determine if given bind is for FR-GRE encapsulation. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I93c858facfe7e1c533df8dccc4502a574686bc8a Gerrit-Change-Number: 22551 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:11 +0000 Subject: Change in libosmocore[master]: ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22552 ) Change subject: ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS ...................................................................... ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS Related: OS#4995 Change-Id: I2ba64e96c60e23d2e6c8ecdcab0b52b3833f092c --- M src/gb/gprs_ns2_fr.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index f73033b..096e150 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -247,11 +247,15 @@ static int handle_netif_write(struct osmo_fd *ofd, struct msgb *msg) { - int rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); + struct gprs_ns2_vc_bind *bind = ofd->data; + int rc; + + rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); /* write_queue expects a "-errno" type return value in case of failure */ - if (rc == -1) + if (rc == -1) { + LOGBIND(bind, LOGL_ERROR, "error during write to AF_PACKET: %s\n", strerror(errno)); return -errno; - else + } else return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ba64e96c60e23d2e6c8ecdcab0b52b3833f092c Gerrit-Change-Number: 22552 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:12 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add simple NS traffic generator In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22553 ) Change subject: osmo-ns-dummy: Add simple NS traffic generator ...................................................................... osmo-ns-dummy: Add simple NS traffic generator This adds a simple NS traffic generator that can be used to perform load testing on NS links, particularly those with limited bandwidth such as frame-relay E1 lines. Related: OS#4995 Change-Id: Iad3b694c85962dbbc6b4a27a0ed5bc841add464f --- M utils/Makefile.am A utils/osmo-ns-dummy-vty.c M utils/osmo-ns-dummy.c 3 files changed, 312 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/utils/Makefile.am b/utils/Makefile.am index 4fac477..4e54a78 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -29,7 +29,7 @@ if ENABLE_EXT_TESTS if ENABLE_GB noinst_PROGRAMS += osmo-ns-dummy -osmo_ns_dummy_SOURCES = osmo-ns-dummy.c +osmo_ns_dummy_SOURCES = osmo-ns-dummy.c osmo-ns-dummy-vty.c osmo_ns_dummy_LDADD = $(LDADD) $(TALLOC_LIBS) \ $(top_builddir)/src/gb/libosmogb.la \ $(top_builddir)/src/vty/libosmovty.la \ diff --git a/utils/osmo-ns-dummy-vty.c b/utils/osmo-ns-dummy-vty.c new file mode 100644 index 0000000..1b7ce1c --- /dev/null +++ b/utils/osmo-ns-dummy-vty.c @@ -0,0 +1,309 @@ +/* VTY for osmo-ns-dummy */ + +/* (C) 2021 Harald Welte + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include + + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +static struct gprs_ns2_inst *g_nsi; +static struct llist_head g_ns_traf_gens = LLIST_HEAD_INIT(g_ns_traf_gens); + +/* one NS traffic generator instance. You can have as many of these as you want, + * just as long as they have unique names */ +struct ns_traf_gen { + struct llist_head list; + const char *name; + struct { + uint16_t nsei; + uint16_t bvci; + /* size of each packet */ + uint16_t pkt_size; + /* interval between packets in us */ + uint32_t interval_us; + /* fixed (false) or random (true) LSP */ + bool lsp_randomize; + /* (fixeD) Link Selector Parameter */ + uint32_t lsp; + } cfg; + struct osmo_fd timerfd; + bool running; +}; + +#define LOGNTG(ntg, lvl, fmt, args ...) \ + LOGP(DLGLOBAL, lvl, "traf-gen(%s): " fmt, (ntg)->name, ## args) + +/* allocate and transmit one NS message */ +static int ntg_tx_one(struct ns_traf_gen *ntg) +{ + struct osmo_gprs_ns2_prim nsp = {}; + struct msgb *msg = msgb_alloc_headroom(3072, 20, "NS traffic gen"); + + if (!msg) + return -ENOMEM; + msgb_put(msg, ntg->cfg.pkt_size); + nsp.bvci = ntg->cfg.bvci; + nsp.nsei = ntg->cfg.nsei; + if (ntg->cfg.lsp_randomize) + nsp.u.unitdata.link_selector = rand(); + else + nsp.u.unitdata.link_selector = ntg->cfg.lsp; + osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, PRIM_OP_REQUEST, msg); + return gprs_ns2_recv_prim(g_nsi, &nsp.oph); +} + +/* call-back from transmit timer-fd */ +static int ntg_timerfd_cb(struct osmo_fd *ofd, unsigned int what) +{ + uint64_t expire_count; + struct ns_traf_gen *ntg = ofd->data; + unsigned int i; + int rc; + + OSMO_ASSERT(what & OSMO_FD_READ); + + rc = read(ofd->fd, (void *) &expire_count, sizeof(expire_count)); + if (rc < 0 && errno == EAGAIN) + return 0; + OSMO_ASSERT(rc == sizeof(expire_count)); + + for (i = 0; i < expire_count; i++) + ntg_tx_one(ntg); + + return 0; +} + +static struct ns_traf_gen *ns_traf_gen_find(const char *name) +{ + struct ns_traf_gen *ntg; + + llist_for_each_entry(ntg, &g_ns_traf_gens, list) { + if (!strcmp(ntg->name, name)) + return ntg; + } + return NULL; +} + +static struct ns_traf_gen *ns_traf_gen_find_or_alloc(const char *name) +{ + struct ns_traf_gen *ntg; + int rc; + + ntg = ns_traf_gen_find(name); + if (ntg) + return ntg; + + ntg = talloc_zero(g_nsi, struct ns_traf_gen); + OSMO_ASSERT(ntg); + ntg->name = talloc_strdup(ntg, name); + ntg->timerfd.fd = -1; + rc = osmo_timerfd_setup(&ntg->timerfd, ntg_timerfd_cb, ntg); + OSMO_ASSERT(rc >= 0); + llist_add_tail(&ntg->list, &g_ns_traf_gens); + + return ntg; +} + +enum nodes { + NTG_NODE = _LAST_OSMOVTY_NODE + 1, +}; + +static struct cmd_node ntg_node = { + NTG_NODE, + "%s(config-ns-traf-gen)# ", + 1, +}; + +static int config_write_ntg(struct vty *vty) +{ + struct ns_traf_gen *ntg; + + llist_for_each_entry(ntg, &g_ns_traf_gens, list) { + vty_out(vty, "ns-traffic-generator %s%s", ntg->name, VTY_NEWLINE); + vty_out(vty, " nsei %u%s", ntg->cfg.nsei, VTY_NEWLINE); + vty_out(vty, " bvci %u%s", ntg->cfg.bvci, VTY_NEWLINE); + vty_out(vty, " packet-size %u%s", ntg->cfg.pkt_size, VTY_NEWLINE); + vty_out(vty, " interval-us %u%s", ntg->cfg.interval_us, VTY_NEWLINE); + vty_out(vty, " lsp %u%s", ntg->cfg.lsp, VTY_NEWLINE); + vty_out(vty, " lsp-mode %s%s", ntg->cfg.lsp_randomize ? "randomized" : "fixed", VTY_NEWLINE); + } + + return 0; +} + +DEFUN(ntg_start, ntg_start_stop_cmd, + "ns-traffic-generator (start|stop) NAME", + "Control named NS traffic generator\n" + "Start generating traffic in this traffic generator\n" + "Stop generating traffic in this traffic generator\n" + "Name of NS traffic generator to start\n") +{ + struct ns_traf_gen *ntg = ns_traf_gen_find(argv[1]); + if (!ntg) { + vty_out(vty, "NS Traffic generator '%s' doesn't exist%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + + if (!strcmp(argv[0], "start")) { + struct timespec interval; + if (ntg->running) { + vty_out(vty, "NS Traffic generator was already started%s", VTY_NEWLINE); + return CMD_WARNING; + } + interval.tv_sec = ntg->cfg.interval_us / 1000000; + interval.tv_nsec = (ntg->cfg.interval_us % 1000000) * 1000; + osmo_timerfd_schedule(&ntg->timerfd, NULL, &interval); + ntg->running = true; + } else { + if (!ntg->running) { + vty_out(vty, "NS Traffic generator was already stopped%s", VTY_NEWLINE); + return CMD_WARNING; + } + osmo_timerfd_disable(&ntg->timerfd); + ntg->running = false; + } + + return CMD_SUCCESS; +} + +DEFUN(ntg_nsei, ntg_nsei_cmd, + "nsei <0-65535>", + "NSEI to use when generating traffic\n" + "NSEI to use when generating traffic\n") +{ + struct ns_traf_gen *ntg = vty->index; + ntg->cfg.nsei = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(ntg_bvci, ntg_bvci_cmd, + "bvci <0-65535>", + "BVCI to use when generating traffic\n" + "BVCI to use when generating traffic\n") +{ + struct ns_traf_gen *ntg = vty->index; + ntg->cfg.bvci = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(ntg_pkt_size, ntg_pkt_size_cmd, + "packet-size <0-2048>", + "Packet size for generated NS-UNITDATA payload\n" + "Packet size for generated NS-UNITDATA payload\n") +{ + struct ns_traf_gen *ntg = vty->index; + ntg->cfg.pkt_size = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(ntg_pkt_intv_us, ntg_pkt_intv_us_cmd, + "interval-us <0-1000000>", + "Interval between packets in microseconds\n" + "Interval between packets in microseconds\n") +{ + struct ns_traf_gen *ntg = vty->index; + ntg->cfg.interval_us = atoi(argv[0]); + if (ntg->running) { + /* TODO: update timer */ + } + return CMD_SUCCESS; +} + +DEFUN(ntg_lsp, ntg_lsp_cmd, + "lsp <0-4294967295>", + "Link Selector Parameter (only used in fixed mode)\n" + "Link Selector Parameter (only used in fixed mode)\n") +{ + struct ns_traf_gen *ntg = vty->index; + ntg->cfg.lsp = strtoul(argv[0], NULL, 10); + return CMD_SUCCESS; +} + +DEFUN(ntg_lsp_mode, ntg_lsp_mode_cmd, + "lsp-mode (fixed|randomized)", + "Link Selector Parameter Mode\n" + "Fixed / Staic LSP\n" + "Randomized LSP\n") +{ + struct ns_traf_gen *ntg = vty->index; + if (!strcmp(argv[0], "randomized")) + ntg->cfg.lsp_randomize = true; + else + ntg->cfg.lsp_randomize = false; + return CMD_SUCCESS; +} + +DEFUN(gen_traffic, gen_traffic_cmd, + "ns-traffic-generator NAME", + "Configure a given NS traffic generator\n" "Name of NS traffic generator\n") +{ + struct ns_traf_gen *ntg = ns_traf_gen_find_or_alloc(argv[0]); + + if (!ntg) + return CMD_WARNING; + + vty->index = ntg; + vty->node = NTG_NODE; + + return CMD_SUCCESS; +} + +int nsdummy_vty_init(struct gprs_ns2_inst *nsi) +{ + g_nsi = nsi; + + /* configuration of traffic generators via CONFIG / NTG node */ + install_element(CONFIG_NODE, &gen_traffic_cmd); + install_node(&ntg_node, config_write_ntg); + install_element(NTG_NODE, &ntg_nsei_cmd); + install_element(NTG_NODE, &ntg_bvci_cmd); + install_element(NTG_NODE, &ntg_pkt_size_cmd); + install_element(NTG_NODE, &ntg_pkt_intv_us_cmd); + install_element(NTG_NODE, &ntg_lsp_cmd); + install_element(NTG_NODE, &ntg_lsp_mode_cmd); + + /* starting/stopping the traffic generators is in 'enable' mode, not 'config' */ + install_element(ENABLE_NODE, &ntg_start_stop_cmd); + + return 0; +} diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c index 5625f75..4b93788 100644 --- a/utils/osmo-ns-dummy.c +++ b/utils/osmo-ns-dummy.c @@ -199,6 +199,7 @@ return 0; } +extern int nsdummy_vty_init(struct gprs_ns2_inst *nsi); int main (int argc, char *argv[]) { @@ -230,6 +231,7 @@ } gprs_ns2_vty_init(nsi); + nsdummy_vty_init(nsi); rc = vty_read_config_file(config_file, NULL); if (rc < 0 && config_given) { fprintf(stderr, "Failed to parse the config file: '%s'\n", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad3b694c85962dbbc6b4a27a0ed5bc841add464f Gerrit-Change-Number: 22553 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:12 +0000 Subject: Change in libosmocore[master]: ns2: Work around AF_PACKET socket ENOBUFS problems In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22555 ) Change subject: ns2: Work around AF_PACKET socket ENOBUFS problems ...................................................................... ns2: Work around AF_PACKET socket ENOBUFS problems AF_PACKET sockets cannot be written-to using select(), as they will always return "writable" but then still fail with ENOBUFS. This also means that we cannot use osmo_wqueue() as it assumes that a writable socket can actually be written to. As there's no way to figure out when exactly we can again perform a successful write, we have no other option but to start a timer and re-try at a later time. We will scale that timer based on the estimated duration of transmission for the just-failed PDU on the line rate of a 31TS E1 Line. Furthermore, with this patch, we stop queueing anything but signaling traffic (NS-BVCI=0) or Q.933 LMI. User data (NS-BVCI != 0) will instead be dropped in order to avoid buffer-bloat. Change-Id: I4f79a246236c94175ceffa5f3f556c8931c6bc62 Closes: OS#4995 --- M src/gb/gprs_ns2_fr.c 1 file changed, 166 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 096e150..4bd9ff1 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -4,7 +4,7 @@ * 3GPP TS 08.16 version 8.0.1 Release 1999 / ETSI TS 101 299 V8.0.1 (2002-05) * as well as its successor 3GPP TS 48.016 */ -/* (C) 2009-2010,2014,2017 by Harald Welte +/* (C) 2009-2021 by Harald Welte * (C) 2020 sysmocom - s.f.m.c. GmbH * Author: Alexander Couzens * @@ -51,9 +51,11 @@ #include #include #include +#include #include -#include #include +#include +#include #ifdef ENABLE_LIBMNL #include @@ -72,6 +74,14 @@ # define IPPROTO_GRE 47 #endif +#define E1_LINERATE 2048000 +#define E1_SLOTS_TOTAL 32 +#define E1_SLOTS_USED 31 +/* usable bitrate of the E1 superchannel with 31 of 32 timeslots */ +#define SUPERCHANNEL_LINERATE (E1_LINERATE*E1_SLOTS_USED)/E1_SLOTS_TOTAL +/* nanoseconds per bit (504) */ +#define BIT_DURATION_NS (1000000000 / SUPERCHANNEL_LINERATE) + struct gre_hdr { uint16_t flags; uint16_t ptype; @@ -88,9 +98,19 @@ struct priv_bind { char netif[IFNAMSIZ]; struct osmo_fr_link *link; - struct osmo_wqueue wqueue; int ifindex; bool if_running; + /* backlog queue for AF_PACKET / ENOBUFS handling (see OS#4993) */ + struct { + /* file-descriptor for AF_PACKET socket */ + struct osmo_fd ofd; + /* list of msgb (backlog) */ + struct llist_head list; + /* timer to trigger next attempt of AF_PACKET write */ + struct osmo_timer_list timer; + /* re-try after that many micro-seconds */ + uint32_t retry_us; + } backlog; }; struct priv_vc { @@ -138,6 +158,7 @@ static void free_bind(struct gprs_ns2_vc_bind *bind) { struct priv_bind *priv; + struct msgb *msg, *msg2; OSMO_ASSERT(gprs_ns2_is_fr_bind(bind)); if (!bind) @@ -147,8 +168,13 @@ OSMO_ASSERT(llist_empty(&bind->nsvc)); + osmo_timer_del(&priv->backlog.timer); + llist_for_each_entry_safe(msg, msg2, &priv->backlog.list, list) { + msgb_free(msg); + } + osmo_fr_link_free(priv->link); - osmo_fd_close(&priv->wqueue.bfd); + osmo_fd_close(&priv->backlog.ofd); talloc_free(priv); } @@ -200,15 +226,21 @@ } /* PDU from the network interface towards the fr layer (upwards) */ -static int handle_netif_read(struct osmo_fd *bfd) +static int fr_netif_ofd_cb(struct osmo_fd *bfd, uint32_t what) { struct gprs_ns2_vc_bind *bind = bfd->data; struct priv_bind *priv = bind->priv; - struct msgb *msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR/GRE Rx"); + struct msgb *msg; struct sockaddr_ll sll; socklen_t sll_len = sizeof(sll); int rc = 0; + /* we only handle read here. write to AF_PACKET sockets cannot be triggered + * by select or poll, see OS#4995 */ + if (!(what & OSMO_FD_READ)) + return 0; + + msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR/GRE Rx"); if (!msg) return -ENOMEM; @@ -245,18 +277,35 @@ return rc; } -static int handle_netif_write(struct osmo_fd *ofd, struct msgb *msg) +static int fr_netif_write_one(struct gprs_ns2_vc_bind *bind, struct msgb *msg) { - struct gprs_ns2_vc_bind *bind = ofd->data; + struct priv_bind *priv = bind->priv; + unsigned int len = msgb_length(msg); int rc; - rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); - /* write_queue expects a "-errno" type return value in case of failure */ - if (rc == -1) { - LOGBIND(bind, LOGL_ERROR, "error during write to AF_PACKET: %s\n", strerror(errno)); - return -errno; - } else - return rc; + /* estimate the retry time based on the data rate it takes to transmit */ + priv->backlog.retry_us = (BIT_DURATION_NS * 8 * len) / 1000; + + rc = write(priv->backlog.ofd.fd, msgb_data(msg), len); + if (rc == len) { + msgb_free(msg); + return 0; + } else if (rc < 0) { + /* don't free, the caller might want to re-transmit */ + switch (errno) { + case EAGAIN: + case ENOBUFS: + return -errno; + default: + LOGBIND(bind, LOGL_ERROR, "error during write to AF_PACKET: %s\n", strerror(errno)); + return -errno; + } + } else { + /* short write */ + LOGBIND(bind, LOGL_ERROR, "short write on AF_PACKET: %d < %d\n", rc, len); + msgb_free(msg); + return 0; + } } /*! determine if given bind is for FR-GRE encapsulation. */ @@ -274,16 +323,108 @@ return osmo_fr_tx_dlc(msg); } +static void enqueue_at_head(struct gprs_ns2_vc_bind *bind, struct msgb *msg) +{ + struct priv_bind *priv = bind->priv; + llist_add(&msg->list, &priv->backlog.list); + osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); +} + +static void enqueue_at_tail(struct gprs_ns2_vc_bind *bind, struct msgb *msg) +{ + struct priv_bind *priv = bind->priv; + llist_add_tail(&msg->list, &priv->backlog.list); + osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); +} + +#define LMI_Q933A_DLCI 0 + +/* enqueue to backlog (LMI, signaling) or drop (userdata msg) */ +static void backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg) +{ + uint8_t dlci = msg->data[0]; + uint8_t ns_pdu_type; + uint16_t bvci; + + if (msgb_length(msg) < 1) + goto out_free; + + /* we want to enqueue only Q.933 LMI traffic or NS signaling; NOT user traffic */ + switch (dlci) { + case LMI_Q933A_DLCI: + /* enqueue Q.933 LMI at head of queue */ + enqueue_at_head(bind, msg); + return; + default: + if (msgb_length(msg) < 3) + break; + ns_pdu_type = msg->data[2]; + switch (ns_pdu_type) { + case NS_PDUT_UNITDATA: + if (msgb_length(msg) < 6) + break; + bvci = osmo_load16be(msg->data + 4); + /* enqueue BVCI=0 traffic at tail of queue */ + if (bvci == BVCI_SIGNALLING) { + enqueue_at_tail(bind, msg); + return; + } + break; + default: + /* enqueue NS signaling traffic at head of queue */ + enqueue_at_head(bind, msg); + return; + } + break; + } + +out_free: + /* drop everything that is not LMI, NS-signaling or BVCI-0 */ + msgb_free(msg); +} + +static void fr_backlog_timer_cb(void *data) +{ + struct gprs_ns2_vc_bind *bind = data; + struct priv_bind *priv = bind->priv; + int i, rc; + + /* attempt to send up to 10 messages in every timer */ + for (i = 0; i < 10; i++) { + struct msgb *msg = msgb_dequeue(&priv->backlog.list); + if (!msg) + break; + + rc = fr_netif_write_one(bind, msg); + if (rc < 0) { + /* re-add at head of list */ + llist_add(&msg->list, &priv->backlog.list); + break; + } + } + + /* re-start timer if we still have data in the queue */ + if (!llist_empty(&priv->backlog.list)) + osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); +} + /* PDU from the frame relay layer towards the network interface (downwards) */ int fr_tx_cb(void *data, struct msgb *msg) { struct gprs_ns2_vc_bind *bind = data; struct priv_bind *priv = bind->priv; + int rc; - if (osmo_wqueue_enqueue(&priv->wqueue, msg)) { - LOGBIND(bind, LOGL_ERROR, "frame relay %s: failed to enqueue message\n", priv->netif); - msgb_free(msg); - return -EINVAL; + if (llist_empty(&priv->backlog.list)) { + /* attempt to transmit right now */ + rc = fr_netif_write_one(bind, msg); + if (rc < 0) { + /* enqueue to backlog in case it fails */ + backlog_enqueue_or_free(bind, msg); + } + } else { + /* enqueue to backlog */ + backlog_enqueue_or_free(bind, msg); } return 0; @@ -643,11 +784,11 @@ rc = open_socket(priv->ifindex, bind); if (rc < 0) goto err_fr; - osmo_wqueue_init(&priv->wqueue, 10); - priv->wqueue.write_cb = handle_netif_write; - priv->wqueue.read_cb = handle_netif_read; - osmo_fd_setup(&priv->wqueue.bfd, rc, OSMO_FD_READ, osmo_wqueue_bfd_cb, bind, 0); - rc = osmo_fd_register(&priv->wqueue.bfd); + INIT_LLIST_HEAD(&priv->backlog.list); + priv->backlog.retry_us = 2500; /* start with some non-zero value; this corrsponds to 496 bytes */ + osmo_timer_setup(&priv->backlog.timer, fr_backlog_timer_cb, bind); + osmo_fd_setup(&priv->backlog.ofd, rc, OSMO_FD_READ, fr_netif_ofd_cb, bind, 0); + rc = osmo_fd_register(&priv->backlog.ofd); if (rc < 0) goto err_fd; @@ -667,7 +808,7 @@ return rc; err_fd: - close(priv->wqueue.bfd.fd); + close(priv->backlog.ofd.fd); err_fr: osmo_fr_link_free(fr_link); err_priv: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4f79a246236c94175ceffa5f3f556c8931c6bc62 Gerrit-Change-Number: 22555 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:13 +0000 Subject: Change in libosmocore[master]: ns2: Use named array initializers to avoid mistakes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22556 ) Change subject: ns2: Use named array initializers to avoid mistakes ...................................................................... ns2: Use named array initializers to avoid mistakes It's always a bad idea to have an array of descriptions that's indexed by an enum, without using named initializers. It's too easy to get inconsistencies. Change-Id: Id0ebd2a202a465ca0298f4245f1fb5c495235fc8 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c 3 files changed, 27 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index be35513..6be16a2 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -160,18 +160,18 @@ }; static const struct rate_ctr_desc nsvc_ctr_description[] = { - { "packets:in", "Packets at NS Level ( In)" }, - { "packets:out","Packets at NS Level (Out)" }, - { "bytes:in", "Bytes at NS Level ( In)" }, - { "bytes:out", "Bytes at NS Level (Out)" }, - { "blocked", "NS-VC Block count " }, - { "dead", "NS-VC gone dead count " }, - { "replaced", "NS-VC replaced other count" }, - { "nsei-chg", "NS-VC changed NSEI count " }, - { "inv-nsvci", "NS-VCI was invalid count " }, - { "inv-nsei", "NSEI was invalid count " }, - { "lost:alive", "ALIVE ACK missing count " }, - { "lost:reset", "RESET ACK missing count " }, + [NS_CTR_PKTS_IN] = { "packets:in", "Packets at NS Level ( In)" }, + [NS_CTR_PKTS_OUT] = { "packets:out", "Packets at NS Level (Out)" }, + [NS_CTR_BYTES_IN] = { "bytes:in", "Bytes at NS Level ( In)" }, + [NS_CTR_BYTES_OUT] = { "bytes:out", "Bytes at NS Level (Out)" }, + [NS_CTR_BLOCKED] = { "blocked", "NS-VC Block count " }, + [NS_CTR_DEAD] = { "dead", "NS-VC gone dead count " }, + [NS_CTR_REPLACED] = { "replaced", "NS-VC replaced other count" }, + [NS_CTR_NSEI_CHG] = { "nsei-chg", "NS-VC changed NSEI count " }, + [NS_CTR_INV_VCI] = { "inv-nsvci", "NS-VCI was invalid count " }, + [NS_CTR_INV_NSEI] = { "inv-nsei", "NSEI was invalid count " }, + [NS_CTR_LOST_ALIVE] = { "lost:alive", "ALIVE ACK missing count " }, + [NS_CTR_LOST_RESET] = { "lost:reset", "RESET ACK missing count " }, }; static const struct rate_ctr_group_desc nsvc_ctrg_desc = { @@ -184,7 +184,7 @@ static const struct osmo_stat_item_desc nsvc_stat_description[] = { - { "alive.delay", "ALIVE response time ", "ms", 16, 0 }, + [NS_STAT_ALIVE_DELAY] = { "alive.delay", "ALIVE response time ", "ms", 16, 0 }, }; static const struct osmo_stat_item_group_desc nsvc_statg_desc = { diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 0574cb2..68f28db 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -85,6 +85,20 @@ NS2_CS_ERROR, /*!< Failed to process message */ }; +enum ns_ctr { + NS_CTR_PKTS_IN, + NS_CTR_PKTS_OUT, + NS_CTR_BYTES_IN, + NS_CTR_BYTES_OUT, + NS_CTR_BLOCKED, + NS_CTR_DEAD, + NS_CTR_REPLACED, + NS_CTR_NSEI_CHG, + NS_CTR_INV_VCI, + NS_CTR_INV_NSEI, + NS_CTR_LOST_ALIVE, + NS_CTR_LOST_RESET, +}; #define NSE_S_BLOCKED 0x0001 #define NSE_S_ALIVE 0x0002 diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index c525dd7..67ee254 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -46,23 +46,6 @@ LOGNSVC(nsvc, LOGL_DEBUG, "invalid packet %s with SNS\n", reason); \ } while (0) -enum ns_ctr { - NS_CTR_PKTS_IN, - NS_CTR_PKTS_OUT, - NS_CTR_BYTES_IN, - NS_CTR_BYTES_OUT, - NS_CTR_BLOCKED, - NS_CTR_DEAD, - NS_CTR_REPLACED, - NS_CTR_NSEI_CHG, - NS_CTR_INV_VCI, - NS_CTR_INV_NSEI, - NS_CTR_LOST_ALIVE, - NS_CTR_LOST_RESET, -}; - - - static int ns2_validate_reset(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp, uint8_t *cause) { if (!TLVP_PRES_LEN(tp, NS_IE_CAUSE, 1) || -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id0ebd2a202a465ca0298f4245f1fb5c495235fc8 Gerrit-Change-Number: 22556 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:13 +0000 Subject: Change in libosmocore[master]: ns2: encapsulate calls to nsvc->bind->send_vc() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22557 ) Change subject: ns2: encapsulate calls to nsvc->bind->send_vc() ...................................................................... ns2: encapsulate calls to nsvc->bind->send_vc() Don't call the function pointer of the underlying transport directly, as we many still want to do some common processing, such as statistics counting (see follow-up patches). Change-Id: I8d14c7b8d3aacc2bed033072d7934dbd6aab41df --- M src/gb/gprs_ns2_message.c 1 file changed, 17 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 67ee254..d97c2a5 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -166,6 +166,11 @@ } +static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg) +{ + return nsvc->bind->send_vc(nsvc, msg); +} + /* transmit functions */ static int ns2_tx_simple(struct gprs_ns2_vc *nsvc, uint8_t pdu_type) { @@ -183,7 +188,7 @@ nsh->pdu_type = pdu_type; - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Transmit a NS-BLOCK on a given NS-VC. @@ -216,7 +221,7 @@ msgb_tvlv_put(msg, NS_IE_CAUSE, 1, &cause); msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Transmit a NS-BLOCK-ACK on a given NS-VC. @@ -245,7 +250,7 @@ msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Transmit a NS-RESET on a given NS-VC. @@ -278,7 +283,7 @@ msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci); msgb_tvlv_put(msg, NS_IE_NSEI, 2, (uint8_t *) &nsei); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Transmit a NS-RESET-ACK on a given NS-VC. @@ -313,7 +318,7 @@ msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&nsvci); msgb_tvlv_put(msg, NS_IE_NSEI, 2, (uint8_t *)&nsei); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Transmit a NS-UNBLOCK on a given NS-VC. @@ -399,7 +404,7 @@ nsh->data[1] = bvci >> 8; nsh->data[2] = bvci & 0xff; - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Transmit a NS-STATUS on a given NS-VC. @@ -454,7 +459,7 @@ if (cause == NS_CAUSE_BVCI_UNKNOWN) msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&bvci); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } @@ -514,7 +519,7 @@ (const uint8_t *)ip6_elems); } - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Encode + Transmit a SNS-CONFIG as per Section 9.3.4. @@ -569,7 +574,7 @@ (const uint8_t *)ip6_elems); } - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Encode + Transmit a SNS-CONFIG-ACK as per Section 9.3.5. @@ -608,7 +613,7 @@ if (cause) msgb_tvlv_put(msg, NS_IE_CAUSE, 1, cause); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } @@ -657,7 +662,7 @@ if (ip6_ep_nr >= 0) msgb_tv16_put(msg, NS_IE_IPv6_EP_NR, ip6_ep_nr); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } /*! Encode + Transmit a SNS-SIZE-ACK as per Section 9.3.8. @@ -692,7 +697,7 @@ if (cause) msgb_tvlv_put(msg, NS_IE_CAUSE, 1, cause); - return nsvc->bind->send_vc(nsvc, msg); + return ns_vc_tx(nsvc, msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8d14c7b8d3aacc2bed033072d7934dbd6aab41df Gerrit-Change-Number: 22557 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:14 +0000 Subject: Change in libosmocore[master]: ns2: Increment Rx and Tx byte / packet counters In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22558 ) Change subject: ns2: Increment Rx and Tx byte / packet counters ...................................................................... ns2: Increment Rx and Tx byte / packet counters Change-Id: If5e93f69cddbc8962cbbae38c07b504dd9b1ecd1 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_message.c 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 6be16a2..d3c1e69 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1053,6 +1053,9 @@ log_set_context(LOG_CTX_GB_NSE, nsvc->nse); log_set_context(LOG_CTX_GB_NSVC, nsvc); + rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_PKTS_IN]); + rate_ctr_add(&nsvc->ctrg->ctr[NS_CTR_BYTES_IN], msg->len); + if (msg->len < sizeof(struct gprs_ns_hdr)) return -EINVAL; diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index d97c2a5..cd49896 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -168,6 +168,9 @@ static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg) { + rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_PKTS_OUT]); + rate_ctr_add(&nsvc->ctrg->ctr[NS_CTR_BYTES_OUT], msgb_length(msg)); + return nsvc->bind->send_vc(nsvc, msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If5e93f69cddbc8962cbbae38c07b504dd9b1ecd1 Gerrit-Change-Number: 22558 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:17 +0000 Subject: Change in libosmocore[master]: ns2: Properly report packet drops in FR code In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22559 ) Change subject: ns2: Properly report packet drops in FR code ...................................................................... ns2: Properly report packet drops in FR code When the FR code decides to drop a packet (ENOBUFS from the AF_PACKET socket for non-signaling packet), let's report that back via the frame_relay code into the generic NS2 code. This way the generic NS2 code always knows if a packet was actually successfully transmitted, or if it was dropped for some reason. Change-Id: I4bb517fd04af69dbe6da628b132d57994ab3e5a4 --- M src/gb/gprs_ns2_fr.c 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 4bd9ff1..9de2b06 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -340,7 +340,7 @@ #define LMI_Q933A_DLCI 0 /* enqueue to backlog (LMI, signaling) or drop (userdata msg) */ -static void backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg) +static int backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg) { uint8_t dlci = msg->data[0]; uint8_t ns_pdu_type; @@ -354,7 +354,7 @@ case LMI_Q933A_DLCI: /* enqueue Q.933 LMI at head of queue */ enqueue_at_head(bind, msg); - return; + return 0; default: if (msgb_length(msg) < 3) break; @@ -367,13 +367,13 @@ /* enqueue BVCI=0 traffic at tail of queue */ if (bvci == BVCI_SIGNALLING) { enqueue_at_tail(bind, msg); - return; + return 0; } break; default: /* enqueue NS signaling traffic at head of queue */ enqueue_at_head(bind, msg); - return; + return 0; } break; } @@ -381,6 +381,7 @@ out_free: /* drop everything that is not LMI, NS-signaling or BVCI-0 */ msgb_free(msg); + return -1; } static void fr_backlog_timer_cb(void *data) @@ -420,11 +421,11 @@ rc = fr_netif_write_one(bind, msg); if (rc < 0) { /* enqueue to backlog in case it fails */ - backlog_enqueue_or_free(bind, msg); + return backlog_enqueue_or_free(bind, msg); } } else { /* enqueue to backlog */ - backlog_enqueue_or_free(bind, msg); + return backlog_enqueue_or_free(bind, msg); } return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4bb517fd04af69dbe6da628b132d57994ab3e5a4 Gerrit-Change-Number: 22559 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:32:18 +0000 Subject: Change in libosmocore[master]: ns2: count number of dropped packets / bytes on transmit In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22560 ) Change subject: ns2: count number of dropped packets / bytes on transmit ...................................................................... ns2: count number of dropped packets / bytes on transmit Differentiate between successfully transmitted packets/bytes, and pacets/bytes that were dropped (i.e. overflow of net-device) OsmoNSdummy# show ns nsvc 1001 stats NSVCI 01001: UNBLOCKED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlc1 dlci: 1001 NSVC Peer Statistics: Packets at NS Level ( In): 36 (0/s 8/m 32/h 0/d) Packets at NS Level (Out): 23344 (170/s 20556/m 13119/h 0/d) Dropped Packets (Out): 30692 (230/s 27056/m 17221/h 0/d) Bytes at NS Level ( In): 262 (0/s 24/m 250/h 0/d) Bytes at NS Level (Out): 32741312 (238680/s 28849400/m 18391024/h 0/d) Dropped Bytes (Out): 43014628 (322920/s 37986624/m 24101344/h 0/d) Change-Id: If21906ff5379038f7be10cf48c68d1f756dd7c1e --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c 3 files changed, 17 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index d3c1e69..0f65d37 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -162,8 +162,10 @@ static const struct rate_ctr_desc nsvc_ctr_description[] = { [NS_CTR_PKTS_IN] = { "packets:in", "Packets at NS Level ( In)" }, [NS_CTR_PKTS_OUT] = { "packets:out", "Packets at NS Level (Out)" }, + [NS_CTR_PKTS_OUT_DROP] = { "packets:out:drop", "Dropped Packets (Out)" }, [NS_CTR_BYTES_IN] = { "bytes:in", "Bytes at NS Level ( In)" }, [NS_CTR_BYTES_OUT] = { "bytes:out", "Bytes at NS Level (Out)" }, + [NS_CTR_BYTES_OUT_DROP] = { "bytes:out:drop", "Dropped Bytes (Out)" }, [NS_CTR_BLOCKED] = { "blocked", "NS-VC Block count " }, [NS_CTR_DEAD] = { "dead", "NS-VC gone dead count " }, [NS_CTR_REPLACED] = { "replaced", "NS-VC replaced other count" }, diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 68f28db..98b3f29 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -88,8 +88,10 @@ enum ns_ctr { NS_CTR_PKTS_IN, NS_CTR_PKTS_OUT, + NS_CTR_PKTS_OUT_DROP, NS_CTR_BYTES_IN, NS_CTR_BYTES_OUT, + NS_CTR_BYTES_OUT_DROP, NS_CTR_BLOCKED, NS_CTR_DEAD, NS_CTR_REPLACED, diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index cd49896..bfb8781 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -168,10 +168,20 @@ static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg) { - rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_PKTS_OUT]); - rate_ctr_add(&nsvc->ctrg->ctr[NS_CTR_BYTES_OUT], msgb_length(msg)); + unsigned int bytes = msgb_length(msg); + int rc; - return nsvc->bind->send_vc(nsvc, msg); + + rc = nsvc->bind->send_vc(nsvc, msg); + if (rc < 0) { + rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_PKTS_OUT_DROP]); + rate_ctr_add(&nsvc->ctrg->ctr[NS_CTR_BYTES_OUT_DROP], bytes); + } else { + rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_PKTS_OUT]); + rate_ctr_add(&nsvc->ctrg->ctr[NS_CTR_BYTES_OUT], bytes); + } + + return rc; } /* transmit functions */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If21906ff5379038f7be10cf48c68d1f756dd7c1e Gerrit-Change-Number: 22560 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:32:46 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 08:32:46 +0000 Subject: Change in libosmocore[master]: sim: fix gcc 4.9.2 + -std=gnu11 error References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22588 ) Change subject: sim: fix gcc 4.9.2 + -std=gnu11 error ...................................................................... sim: fix gcc 4.9.2 + -std=gnu11 error Remove "(const struct osim_card_sw)" infront of OSIM_CARD_SW_LAST, so debian 8's gcc 4.9.2 doesn't fail anymore with the following error each time the macro is used: card_fs_sim.c:105:1: error: initializer element is not constant I verified with docker that there aren't any other build errors with gcc 4.9.2. Fixes: OS#4991 Change-Id: I9d3abbf9812dc09201eff0e9f7542cddedb6848b --- M include/osmocom/sim/sim.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/22588/1 diff --git a/include/osmocom/sim/sim.h b/include/osmocom/sim/sim.h index bfd1ac9..72e7904 100644 --- a/include/osmocom/sim/sim.h +++ b/include/osmocom/sim/sim.h @@ -283,7 +283,7 @@ } u; }; -#define OSIM_CARD_SW_LAST (const struct osim_card_sw) { \ +#define OSIM_CARD_SW_LAST { \ .code = 0, .mask = 0, .type = SW_TYPE_NONE, \ .class = SW_CLS_NONE, .u.str = NULL \ } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d3abbf9812dc09201eff0e9f7542cddedb6848b Gerrit-Change-Number: 22588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:37:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:37:15 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c at a421 PS2, Line 421: return > I'm not as 100 % sure here. [?] if the link has failed, I would argue that by definition you have lost all DLCs. Otherwise you would loose the link but the local applications still think the DLCs are active. Marking the DLCs as inactive (and notifying them) will make the application aware... https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c at a437 PS2, Line 437: return; > we can't remove this. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 08:37:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:38:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:38:20 +0000 Subject: Change in libosmocore[master]: ns2: Implement more rate counters In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22561 ) Change subject: ns2: Implement more rate counters ...................................................................... ns2: Implement more rate counters The counters had all been lost in the ns -> ns2 configuration, let's try to implement some more of them: LOST_ALIVE, BLOCKED, LOST_RESET. Change-Id: I75d8637bd142722fdf9a162a2369aa9cdc980a57 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 457a41f..e69f327 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -204,6 +204,7 @@ osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); break; case NS_TOUT_TNS_ALIVE: + rate_ctr_inc(&priv->nsvc->ctrg->ctr[NS_CTR_LOST_ALIVE]); priv->alive.N++; if (priv->alive.N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) { @@ -296,8 +297,10 @@ { struct gprs_ns2_vc_priv *priv = fi->priv; - if (old_state != GPRS_NS2_ST_BLOCKED) + if (old_state != GPRS_NS2_ST_BLOCKED) { priv->N = 0; + rate_ctr_inc(&priv->nsvc->ctrg->ctr[NS_CTR_BLOCKED]); + } if (priv->om_blocked) { /* we are already blocked after a RESET */ @@ -480,6 +483,7 @@ switch (fi->state) { case GPRS_NS2_ST_RESET: if (priv->initiate_reset) { + rate_ctr_inc(&priv->nsvc->ctrg->ctr[NS_CTR_LOST_RESET]); priv->N++; if (priv->N <= nsi->timeout[NS_TOUT_TNS_RESET_RETRIES]) { osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75d8637bd142722fdf9a162a2369aa9cdc980a57 Gerrit-Change-Number: 22561 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:38:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:38:20 +0000 Subject: Change in libosmocore[master]: ns2: Add a rate_ctr for each NS-UNBLOCK In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22562 ) Change subject: ns2: Add a rate_ctr for each NS-UNBLOCK ...................................................................... ns2: Add a rate_ctr for each NS-UNBLOCK We have one for BLOCK, so let's also add one for UNBLOCK. Change-Id: I693109b7bc4d72b6803b40aae15327389aa37c69 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_vc_fsm.c 3 files changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 0f65d37..d4d215c 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -167,6 +167,7 @@ [NS_CTR_BYTES_OUT] = { "bytes:out", "Bytes at NS Level (Out)" }, [NS_CTR_BYTES_OUT_DROP] = { "bytes:out:drop", "Dropped Bytes (Out)" }, [NS_CTR_BLOCKED] = { "blocked", "NS-VC Block count " }, + [NS_CTR_UNBLOCKED] = { "unblocked", "NS-VC Unblock count " }, [NS_CTR_DEAD] = { "dead", "NS-VC gone dead count " }, [NS_CTR_REPLACED] = { "replaced", "NS-VC replaced other count" }, [NS_CTR_NSEI_CHG] = { "nsei-chg", "NS-VC changed NSEI count " }, diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 98b3f29..e149767 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -93,6 +93,7 @@ NS_CTR_BYTES_OUT, NS_CTR_BYTES_OUT_DROP, NS_CTR_BLOCKED, + NS_CTR_UNBLOCKED, NS_CTR_DEAD, NS_CTR_REPLACED, NS_CTR_NSEI_CHG, diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index e69f327..839bf6f 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -373,6 +373,9 @@ struct gprs_ns2_vc *nsvc = priv->nsvc; struct gprs_ns2_nse *nse = nsvc->nse; + if (old_state != GPRS_NS2_ST_UNBLOCKED) + rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_UNBLOCKED]); + priv->accept_unitdata = true; ns2_nse_notify_unblocked(nsvc, true); ns2_prim_status_ind(nse, nsvc, 0, GPRS_NS2_AFF_CAUSE_VC_RECOVERY); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I693109b7bc4d72b6803b40aae15327389aa37c69 Gerrit-Change-Number: 22562 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:44:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:44:45 +0000 Subject: Change in libosmocore[master]: frame_relay: cosmetic: Unify log syntax when discarding Rx packets In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22577 to look at the new patch set (#3). Change subject: frame_relay: cosmetic: Unify log syntax when discarding Rx packets ...................................................................... frame_relay: cosmetic: Unify log syntax when discarding Rx packets Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 --- M src/gb/frame_relay.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/22577/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 Gerrit-Change-Number: 22577 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:45:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 08:45:09 +0000 Subject: Change in libosmocore[master]: ns2: Memory allocation failures are ENOMEM, not ENOSPC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22567 ) Change subject: ns2: Memory allocation failures are ENOMEM, not ENOSPC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia4c16d8278dc30c7cc69169b18428cda5272738d Gerrit-Change-Number: 22567 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 08:45:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:50:00 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 08:50:00 +0000 Subject: Change in osmo-ci[master]: master + gerrit jenkins jobs: Add osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22582 ) Change subject: master + gerrit jenkins jobs: Add osmo-gbproxy ...................................................................... Patch Set 1: Code-Review+2 contrib/jenkins.sh needs to be adjusted too, I'll take care of it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id29c83bdcd9b626bb7920738c8b1f945ef7f3671 Gerrit-Change-Number: 22582 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 08:50:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:50:13 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 08:50:13 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Build osmo-cbc In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22583 ) Change subject: osmocom-latest-packages: Build osmo-cbc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia5bfd126ad168da7ab629b1f18ecfd60d4a49a51 Gerrit-Change-Number: 22583 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 08:50:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 08:51:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 08:51:30 +0000 Subject: Change in osmo-gbproxy[master]: Updatre README to cover osmo-gbproxy and not osmo-sgsn In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 ) Change subject: Updatre README to cover osmo-gbproxy and not osmo-sgsn ...................................................................... Patch Set 3: Code-Review+1 LGTM. I'll fix contrib/jenkins.sh. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7e86dfed985f98ae87af9adcde6f776c5a15044 Gerrit-Change-Number: 22581 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 08:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:16:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 09:16:26 +0000 Subject: Change in osmo-gbproxy[master]: Further clean-up in osmo-sgsn -> osmo-gbproxy migration In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 ) Change subject: Further clean-up in osmo-sgsn -> osmo-gbproxy migration ...................................................................... Further clean-up in osmo-sgsn -> osmo-gbproxy migration * fix manuals builds, including vty reference generation * remove manuals from osmo-sgsn * update .gitreview * update osmoappdesc.py Related: OS#4992 Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 --- M .gitreview M Makefile.am M doc/manuals/Makefile.am D doc/manuals/chapters/configuration.adoc D doc/manuals/chapters/control.adoc D doc/manuals/chapters/counters.adoc M doc/manuals/chapters/counters_generated.adoc D doc/manuals/chapters/overview.adoc D doc/manuals/chapters/running.adoc M doc/manuals/osmogbproxy-usermanual.adoc M doc/manuals/osmogbproxy-vty-reference.xml D doc/manuals/osmosgsn-usermanual-docinfo.xml D doc/manuals/osmosgsn-usermanual.adoc D doc/manuals/osmosgsn-vty-reference.xml M doc/manuals/regen_doc.sh R doc/manuals/vty/gbproxy_vty_additions.xml R doc/manuals/vty/gbproxy_vty_reference.xml D doc/manuals/vty/sgsn_vty_additions.xml D doc/manuals/vty/sgsn_vty_reference.xml M osmoappdesc.py M src/gb_proxy_main.c 21 files changed, 384 insertions(+), 3,816 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/86/22586/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 Gerrit-Change-Number: 22586 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:16:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 09:16:26 +0000 Subject: Change in osmo-gbproxy[master]: Update README to cover osmo-gbproxy and not osmo-sgsn In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 ) Change subject: Update README to cover osmo-gbproxy and not osmo-sgsn ...................................................................... Update README to cover osmo-gbproxy and not osmo-sgsn While we're at it, also convert it to markdown. Related: OS#4992 Change-Id: Ic7e86dfed985f98ae87af9adcde6f776c5a15044 --- D README A README.md M contrib/osmo-gbproxy.spec.in M debian/copyright 4 files changed, 30 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/81/22581/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7e86dfed985f98ae87af9adcde6f776c5a15044 Gerrit-Change-Number: 22581 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:03 +0000 Subject: Change in libosmocore[master]: ns2: Move to one common/shared ns2_bind_alloc() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22566 ) Change subject: ns2: Move to one common/shared ns2_bind_alloc() ...................................................................... ns2: Move to one common/shared ns2_bind_alloc() Avoid code duplication between three different drivers by sharing the "core" of the bind initialization in a new, shared ns2_bind_alloc(). Change-Id: I535fc68e94fcd695de827dd922706adc1c5a2cb7 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c 6 files changed, 67 insertions(+), 84 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index d4d215c..4f3bc5e 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1353,4 +1353,36 @@ return transfer_cap; } +/*! common allocation + low-level initialization of a bind. Called by vc-drivers */ +int ns2_bind_alloc(struct gprs_ns2_inst *nsi, const char *name, + struct gprs_ns2_vc_bind **result) +{ + struct gprs_ns2_vc_bind *bind; + + if (!name) + return -EINVAL; + + if (gprs_ns2_bind_by_name(nsi, name)) + return -EALREADY; + + bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); + if (!bind) + return -ENOSPC; + + bind->name = talloc_strdup(bind, name); + if (!bind->name) { + talloc_free(bind); + return -ENOSPC; + } + + bind->nsi = nsi; + INIT_LLIST_HEAD(&bind->nsvc); + llist_add(&bind->list, &nsi->binding); + + if (result) + *result = bind; + + return 0; +} + /*! @} */ diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 9de2b06..953f4ca 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -719,21 +719,15 @@ struct osmo_fr_link *fr_link; int rc = 0; - if (!name) + if (strlen(netif) > IFNAMSIZ) return -EINVAL; if (gprs_ns2_bind_by_name(nsi, name)) return -EALREADY; - bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); - if (!bind) - return -ENOSPC; - - bind->name = talloc_strdup(bind, name); - if (!bind->name) { - rc = -ENOSPC; - goto err_bind; - } + rc = ns2_bind_alloc(nsi, name, &bind); + if (rc < 0) + return rc; bind->driver = &vc_driver_fr; bind->ll = GPRS_NS2_LL_FR; @@ -742,27 +736,19 @@ bind->send_vc = fr_vc_sendmsg; bind->free_vc = free_vc; bind->dump_vty = dump_vty; - bind->nsi = nsi; priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { rc = -ENOSPC; - goto err_name; + goto err_bind; } - if (strlen(netif) > IFNAMSIZ) { - rc = -EINVAL; - goto err_priv; - } OSMO_STRLCPY_ARRAY(priv->netif, netif); - if (result) - *result = bind; - /* FIXME: move fd handling into socket.c */ fr_link = osmo_fr_link_alloc(fr_network, fr_role, netif); if (!fr_link) { rc = -EINVAL; - goto err_priv; + goto err_bind; } fr_link->tx_cb = fr_tx_cb; @@ -793,9 +779,6 @@ if (rc < 0) goto err_fd; - INIT_LLIST_HEAD(&bind->nsvc); - llist_add(&bind->list, &nsi->binding); - #ifdef ENABLE_LIBMNL if (!nsi->linkmon_mnl) nsi->linkmon_mnl = osmo_mnl_init(nsi, NETLINK_ROUTE, RTMGRP_LINK, linkmon_mnl_cb, nsi); @@ -806,18 +789,17 @@ linkmon_initial_dump(nsi->linkmon_mnl); #endif + if (result) + *result = bind; + return rc; err_fd: close(priv->backlog.ofd.fd); err_fr: osmo_fr_link_free(fr_link); -err_priv: - talloc_free(priv); -err_name: - talloc_free((char *)bind->name); err_bind: - talloc_free(bind); + gprs_ns2_free_bind(bind); return rc; } diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 5047af0..863f8f2 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -537,29 +537,22 @@ int dscp, struct gprs_ns2_vc_bind **result) { - struct gprs_ns2_vc_bind *bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); + struct gprs_ns2_vc_bind *bind; struct priv_bind *priv; int rc; - if (!name) - return -ENOSPC; - - if (gprs_ns2_bind_by_name(nsi, name)) - return -EALREADY; - - if (!bind) - return -ENOSPC; - - if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) { - talloc_free(bind); + if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) return -EINVAL; + + bind = gprs_ns2_bind_by_name(nsi, name); + if (bind) { + *result = bind; + return -EALREADY; } - bind->name = talloc_strdup(bind, name); - if (!bind->name) { - talloc_free(bind); - return -ENOSPC; - } + rc = ns2_bind_alloc(nsi, name, &bind); + if (rc < 0) + return rc; bind->driver = &vc_driver_frgre; bind->ll = GPRS_NS2_LL_FR_GRE; @@ -571,7 +564,7 @@ priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { - talloc_free(bind); + gprs_ns2_free_bind(bind); return -ENOSPC; } priv->fd.cb = frgre_fd_cb; @@ -579,14 +572,11 @@ priv->addr = *local; INIT_LLIST_HEAD(&bind->nsvc); - llist_add(&bind->list, &nsi->binding); - rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_RAW, IPPROTO_GRE, local, NULL, OSMO_SOCK_F_BIND); if (rc < 0) { - talloc_free(priv); - talloc_free(bind); + gprs_ns2_free_bind(bind); return rc; } diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index e149767..4a899ed 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -274,6 +274,9 @@ enum gprs_ns2_vc_mode vc_mode, const char *id); +int ns2_bind_alloc(struct gprs_ns2_inst *nsi, const char *name, + struct gprs_ns2_vc_bind **result); + struct msgb *ns2_msgb_alloc(void); void ns2_sns_write_vty(struct vty *vty, const struct gprs_ns2_nse *nse); diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 43ece13..b4bcd01 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -315,32 +315,18 @@ struct priv_bind *priv; int rc; - if (!name) + if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) return -EINVAL; - if (gprs_ns2_bind_by_name(nsi, name)) - return -EALREADY; - bind = gprs_ns2_ip_bind_by_sockaddr(nsi, local); if (bind) { *result = bind; return -EBUSY; } - bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); - if (!bind) - return -ENOSPC; - - bind->name = talloc_strdup(bind, name); - if (!bind->name) { - talloc_free(bind); - return -ENOSPC; - } - - if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6) { - talloc_free(bind); - return -EINVAL; - } + rc = ns2_bind_alloc(nsi, name, &bind); + if (rc < 0) + return rc; bind->driver = &vc_driver_ip; bind->ll = GPRS_NS2_LL_UDP; @@ -351,24 +337,21 @@ bind->send_vc = nsip_vc_sendmsg; bind->free_vc = free_vc; bind->dump_vty = dump_vty; - bind->nsi = nsi; priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { - talloc_free(bind); + gprs_ns2_free_bind(bind); return -ENOSPC; } priv->fd.cb = nsip_fd_cb; priv->fd.data = bind; priv->addr = *local; - INIT_LLIST_HEAD(&bind->nsvc); rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_DGRAM, IPPROTO_UDP, local, NULL, OSMO_SOCK_F_BIND); if (rc < 0) { - talloc_free(priv); - talloc_free(bind); + gprs_ns2_free_bind(bind); return rc; } @@ -382,7 +365,6 @@ dscp, rc, errno); } - llist_add(&bind->list, &nsi->binding); if (result) *result = bind; diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index 9e4e02f..2027e63 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -104,20 +104,17 @@ static struct gprs_ns2_vc_bind *dummy_bind(struct gprs_ns2_inst *nsi, const char *name) { - struct gprs_ns2_vc_bind *bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); + struct gprs_ns2_vc_bind *bind = NULL; + OSMO_ASSERT(ns2_bind_alloc(nsi, name, &bind) == 0); OSMO_ASSERT(bind); - bind->name = talloc_strdup(bind, name); bind->driver = &vc_driver_dummy; bind->ll = GPRS_NS2_LL_UDP; bind->transfer_capability = 42; - bind->nsi = nsi; bind->send_vc = vc_sendmsg; bind->priv = talloc_zero(bind, struct osmo_wqueue); struct osmo_wqueue *queue = bind->priv; - INIT_LLIST_HEAD(&bind->nsvc); - llist_add(&bind->list, &nsi->binding); osmo_wqueue_init(queue, 100); return bind; @@ -150,16 +147,13 @@ /* a loop back bind to use the tx_ functions from gprs_ns2_message.c */ static struct gprs_ns2_vc_bind *loopback_bind(struct gprs_ns2_inst *nsi, const char *name) { - struct gprs_ns2_vc_bind *bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); + struct gprs_ns2_vc_bind *bind = NULL; + OSMO_ASSERT(ns2_bind_alloc(nsi, name, &bind) == 0) OSMO_ASSERT(bind); - bind->name = talloc_strdup(bind, name); bind->driver = &vc_driver_loopback; bind->ll = GPRS_NS2_LL_UDP; bind->transfer_capability = 99; - bind->nsi = nsi; bind->send_vc = loopback_sendmsg; - INIT_LLIST_HEAD(&bind->nsvc); - llist_add(&bind->list, &nsi->binding); return bind; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I535fc68e94fcd695de827dd922706adc1c5a2cb7 Gerrit-Change-Number: 22566 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:04 +0000 Subject: Change in libosmocore[master]: ns2: Memory allocation failures are ENOMEM, not ENOSPC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22567 ) Change subject: ns2: Memory allocation failures are ENOMEM, not ENOSPC ...................................................................... ns2: Memory allocation failures are ENOMEM, not ENOSPC ENOSPC is used with non-volatile (disk) storage, while ENOMEM is customarily used for RAM allocation failures. Change-Id: Ia4c16d8278dc30c7cc69169b18428cda5272738d --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 4 files changed, 5 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 4f3bc5e..2dde693 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1367,12 +1367,12 @@ bind = talloc_zero(nsi, struct gprs_ns2_vc_bind); if (!bind) - return -ENOSPC; + return -ENOMEM; bind->name = talloc_strdup(bind, name); if (!bind->name) { talloc_free(bind); - return -ENOSPC; + return -ENOMEM; } bind->nsi = nsi; diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 953f4ca..c32bce8 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -738,7 +738,7 @@ bind->dump_vty = dump_vty; priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { - rc = -ENOSPC; + rc = -ENOMEM; goto err_bind; } diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 863f8f2..88ef037 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -565,7 +565,7 @@ priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { gprs_ns2_free_bind(bind); - return -ENOSPC; + return -ENOMEM; } priv->fd.cb = frgre_fd_cb; priv->fd.data = bind; diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index b4bcd01..9277f9a 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -341,7 +341,7 @@ priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { gprs_ns2_free_bind(bind); - return -ENOSPC; + return -ENOMEM; } priv->fd.cb = nsip_fd_cb; priv->fd.data = bind; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia4c16d8278dc30c7cc69169b18428cda5272738d Gerrit-Change-Number: 22567 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:05 +0000 Subject: Change in libosmocore[master]: ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22568 ) Change subject: ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx ...................................................................... ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx We will soon get another of those indexes. Change-Id: I68a2ef3b48097f524831dd04821824b21d6d1e18 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 2dde693..9c9da79 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -508,17 +508,17 @@ nsvc->sig_weight = 1; nsvc->data_weight = 1; - nsvc->ctrg = rate_ctr_group_alloc(nsvc, &nsvc_ctrg_desc, bind->nsi->rate_ctr_idx); + nsvc->ctrg = rate_ctr_group_alloc(nsvc, &nsvc_ctrg_desc, bind->nsi->nsvc_rate_ctr_idx); if (!nsvc->ctrg) { goto err; } - nsvc->statg = osmo_stat_item_group_alloc(nsvc, &nsvc_statg_desc, bind->nsi->rate_ctr_idx); + nsvc->statg = osmo_stat_item_group_alloc(nsvc, &nsvc_statg_desc, bind->nsi->nsvc_rate_ctr_idx); if (!nsvc->statg) goto err_group; if (!ns2_vc_fsm_alloc(nsvc, id, initiater)) goto err_statg; - bind->nsi->rate_ctr_idx++; + bind->nsi->nsvc_rate_ctr_idx++; llist_add(&nsvc->list, &nse->nsvc); llist_add(&nsvc->blist, &bind->nsvc); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 4a899ed..f3c68f5 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -128,7 +128,7 @@ uint16_t timeout[NS_TIMERS_COUNT]; /*! workaround for rate counter until rate counter accepts char str as index */ - uint32_t rate_ctr_idx; + uint32_t nsvc_rate_ctr_idx; /*! libmnl netlink socket for link state monitoring */ struct osmo_mnl *linkmon_mnl; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68a2ef3b48097f524831dd04821824b21d6d1e18 Gerrit-Change-Number: 22568 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:06 +0000 Subject: Change in libosmocore[master]: ns2: Introduce a per-bind stat_item group with backlog length In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22569 ) Change subject: ns2: Introduce a per-bind stat_item group with backlog length ...................................................................... ns2: Introduce a per-bind stat_item group with backlog length The backlog length indicates the instantaneous length of the backlog. Change-Id: I1c55b4619b1221d7e607ace58649323407faf86b --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_vty.c 4 files changed, 37 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 9c9da79..1f7525e 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -198,6 +198,18 @@ .class_id = OSMO_STATS_CLASS_PEER, }; +const struct osmo_stat_item_desc nsbind_stat_description[] = { + [NS2_BIND_STAT_BACKLOG_LEN] = { "tx_backlog_length", "Transmit backlog length", "packets", 16, 0 }, +}; + +static const struct osmo_stat_item_group_desc nsbind_statg_desc = { + .group_name_prefix = "ns.bind", + .group_description = "NS Bind Statistics", + .num_items = ARRAY_SIZE(nsbind_stat_description), + .item_desc = nsbind_stat_description, + .class_id = OSMO_STATS_CLASS_PEER, +}; + const struct value_string gprs_ns2_aff_cause_prim_strs[] = { { GPRS_NS2_AFF_CAUSE_VC_FAILURE, "NSVC failure" }, { GPRS_NS2_AFF_CAUSE_VC_RECOVERY, "NSVC recovery" }, @@ -1245,6 +1257,7 @@ bind->driver->free_bind(bind); llist_del(&bind->list); + osmo_stat_item_group_free(bind->statg); talloc_free((char *)bind->name); talloc_free(bind); } @@ -1375,10 +1388,18 @@ return -ENOMEM; } + bind->statg = osmo_stat_item_group_alloc(bind, &nsbind_statg_desc, nsi->bind_rate_ctr_idx); + if (!bind->statg) { + talloc_free(bind); + return -ENOMEM; + } + bind->nsi = nsi; INIT_LLIST_HEAD(&bind->nsvc); llist_add(&bind->list, &nsi->binding); + nsi->bind_rate_ctr_idx++; + if (result) *result = bind; diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index c32bce8..49e92ae 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -47,6 +47,7 @@ #include #include +#include #include #include #include @@ -327,6 +328,7 @@ { struct priv_bind *priv = bind->priv; llist_add(&msg->list, &priv->backlog.list); + osmo_stat_item_inc(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1); osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); } @@ -334,6 +336,7 @@ { struct priv_bind *priv = bind->priv; llist_add_tail(&msg->list, &priv->backlog.list); + osmo_stat_item_inc(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1); osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); } @@ -402,6 +405,7 @@ llist_add(&msg->list, &priv->backlog.list); break; } + osmo_stat_item_dec(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1); } /* re-start timer if we still have data in the queue */ diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index f3c68f5..6462907 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -72,10 +72,14 @@ _NSVC_TIMER_NR, }; -enum ns_stat { +enum ns2_vc_stat { NS_STAT_ALIVE_DELAY, }; +enum ns2_bind_stat { + NS2_BIND_STAT_BACKLOG_LEN, +}; + /*! Osmocom NS2 VC create status */ enum ns2_cs { NS2_CS_CREATED, /*!< A NSVC object has been created */ @@ -129,6 +133,7 @@ /*! workaround for rate counter until rate counter accepts char str as index */ uint32_t nsvc_rate_ctr_idx; + uint32_t bind_rate_ctr_idx; /*! libmnl netlink socket for link state monitoring */ struct osmo_mnl *linkmon_mnl; @@ -251,6 +256,8 @@ /*! allow to show information for the vty */ void (*dump_vty)(const struct gprs_ns2_vc_bind *bind, struct vty *vty, bool stats); + + struct osmo_stat_item_group *statg; }; struct gprs_ns2_vc_driver { diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index c2b9bd9..5d0f5c0 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1374,6 +1374,10 @@ { if (bind->dump_vty) bind->dump_vty(bind, vty, stats); + + if (stats) { + vty_out_stat_item_group(vty, " ", bind->statg); + } } static void dump_ns_bind(struct vty *vty, const struct gprs_ns2_inst *nsi, bool stats) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c55b4619b1221d7e607ace58649323407faf86b Gerrit-Change-Number: 22569 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:06 +0000 Subject: Change in libosmocore[master]: ns2: Fix typos in comments In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22570 ) Change subject: ns2: Fix typos in comments ...................................................................... ns2: Fix typos in comments Change-Id: I155fd697e229621561f7d00204421ac941101d77 --- M include/osmocom/gprs/gprs_ns2.h 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 042e19b..1bf8c7f 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -48,7 +48,7 @@ GPRS_NS2_LL_FR_GRE, /*!< NS/FR/GRE/IP */ }; -/*! Osmocom NS primitives according to 48.016 5.2 Service primitves */ +/*! Osmocom NS primitives according to 48.016 5.2 Service primitives */ enum gprs_ns2_prim { GPRS_NS2_PRIM_UNIT_DATA, GPRS_NS2_PRIM_CONGESTION, @@ -66,7 +66,7 @@ static inline const char *gprs_ns2_lltype_str(enum gprs_ns2_ll val) { return get_value_string(gprs_ns2_lltype_strs, val); } -/*! Osmocom NS primitives according to 48.016 5.2.2.4 Service primitves */ +/*! Osmocom NS primitives according to 48.016 5.2.2.4 Service primitives */ enum gprs_ns2_congestion_cause { GPRS_NS2_CONG_CAUSE_BACKWARD_BEGIN, GPRS_NS2_CONG_CAUSE_BACKWARD_END, @@ -74,7 +74,7 @@ GPRS_NS2_CONG_CAUSE_FORWARD_END, }; -/*! Osmocom NS primitives according to 48.016 5.2.2.6 Service primitves */ +/*! Osmocom NS primitives according to 48.016 5.2.2.6 Service primitives */ enum gprs_ns2_affecting_cause { GPRS_NS2_AFF_CAUSE_VC_FAILURE, GPRS_NS2_AFF_CAUSE_VC_RECOVERY, @@ -88,11 +88,11 @@ extern const struct value_string gprs_ns2_aff_cause_prim_strs[]; -/*! Obtain a human-readable string for NS affective cause in primitives */ +/*! Obtain a human-readable string for NS affecting cause in primitives */ static inline const char *gprs_ns2_aff_cause_prim_str(enum gprs_ns2_affecting_cause val) { return get_value_string(gprs_ns2_aff_cause_prim_strs, val); } -/*! Osmocom NS primitives according to 48.016 5.2.2.7 Service primitves */ +/*! Osmocom NS primitives according to 48.016 5.2.2.7 Service primitives */ enum gprs_ns2_change_ip_endpoint { GRPS_NS2_ENDPOINT_NO_CHANGE, GPRS_NS2_ENDPOINT_REQUEST_CHANGE, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I155fd697e229621561f7d00204421ac941101d77 Gerrit-Change-Number: 22570 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:07 +0000 Subject: Change in libosmocore[master]: ns2: Print NS-STATUS.ind primitives to the log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22571 ) Change subject: ns2: Print NS-STATUS.ind primitives to the log ...................................................................... ns2: Print NS-STATUS.ind primitives to the log Log the NS-STATUS primitives from within the library, so we don't have to keep related code in each and every application. Change-Id: I368883acfc8ea76529befcd429bf8f2445a60a94 --- M src/gb/gprs_ns2.c 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 1f7525e..1cf2335 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -489,11 +489,18 @@ nsp.u.status.transfer = ns2_count_transfer_cap(nse, bvci); nsp.u.status.first = nse->first; nsp.u.status.persistent = nse->persistent; - if (nsvc) + if (nsvc) { nsp.u.status.nsvc = gprs_ns2_ll_str_buf(nsvc_str, sizeof(nsvc_str), nsvc); + LOGNSVC(nsvc, LOGL_NOTICE, "NS-STATUS.ind(bvci=%05u): cause=%s, transfer=%d, first=%d\n", + nsp.bvci, gprs_ns2_aff_cause_prim_str(nsp.u.status.cause), + nsp.u.status.transfer, nsp.u.status.first); + } else { + LOGNSE(nse, LOGL_NOTICE, "NS-STATUS.ind(bvci=%05u): cause=%s, transfer=%d, first=%d\n", + nsp.bvci, gprs_ns2_aff_cause_prim_str(nsp.u.status.cause), + nsp.u.status.transfer, nsp.u.status.first); + } - osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_STATUS, - PRIM_OP_INDICATION, NULL); + osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_STATUS, PRIM_OP_INDICATION, NULL); nse->nsi->cb(&nsp.oph, nse->nsi->cb_data); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I368883acfc8ea76529befcd429bf8f2445a60a94 Gerrit-Change-Number: 22571 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:17:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:17:08 +0000 Subject: Change in libosmocore[master]: ns2: cosmetic: fix indent levels In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22574 ) Change subject: ns2: cosmetic: fix indent levels ...................................................................... ns2: cosmetic: fix indent levels Change-Id: Ifcb0d5ddf824cd876de91afca1021aeb4f6c3e8b --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 839bf6f..a6e49e6 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -122,17 +122,17 @@ }; static const struct value_string ns2_vc_event_names[] = { - { GPRS_NS2_EV_REQ_START, "START" }, + { GPRS_NS2_EV_REQ_START, "START" }, { GPRS_NS2_EV_RX_RESET, "RESET" }, { GPRS_NS2_EV_RX_RESET_ACK, "RESET_ACK" }, - { GPRS_NS2_EV_RX_UNBLOCK, "UNBLOCK" }, + { GPRS_NS2_EV_RX_UNBLOCK, "UNBLOCK" }, { GPRS_NS2_EV_RX_UNBLOCK_ACK, "UNBLOCK_ACK" }, { GPRS_NS2_EV_RX_BLOCK, "BLOCK" }, { GPRS_NS2_EV_RX_BLOCK_ACK, "BLOCK_ACK" }, { GPRS_NS2_EV_RX_ALIVE, "ALIVE" }, { GPRS_NS2_EV_RX_ALIVE_ACK, "ALIVE_ACK" }, - { GPRS_NS2_EV_RX_STATUS, "STATUS" }, - { GPRS_NS2_EV_RX_UNITDATA, "UNITDATA" }, + { GPRS_NS2_EV_RX_STATUS, "STATUS" }, + { GPRS_NS2_EV_RX_UNITDATA, "UNITDATA" }, { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "FORCE_UNCONFIGURED" }, { GPRS_NS2_EV_REQ_OM_BLOCK, "REQ-O&M-BLOCK"}, { GPRS_NS2_EV_REQ_OM_UNBLOCK, "REQ-O&M-UNBLOCK"}, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifcb0d5ddf824cd876de91afca1021aeb4f6c3e8b Gerrit-Change-Number: 22574 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:19:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:19:29 +0000 Subject: Change in libosmocore[master]: sim: fix gcc 4.9.2 + -std=gnu11 error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22588 ) Change subject: sim: fix gcc 4.9.2 + -std=gnu11 error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d3abbf9812dc09201eff0e9f7542cddedb6848b Gerrit-Change-Number: 22588 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 09:19:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:19:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:19:35 +0000 Subject: Change in libosmocore[master]: sim: fix gcc 4.9.2 + -std=gnu11 error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22588 ) Change subject: sim: fix gcc 4.9.2 + -std=gnu11 error ...................................................................... sim: fix gcc 4.9.2 + -std=gnu11 error Remove "(const struct osim_card_sw)" infront of OSIM_CARD_SW_LAST, so debian 8's gcc 4.9.2 doesn't fail anymore with the following error each time the macro is used: card_fs_sim.c:105:1: error: initializer element is not constant I verified with docker that there aren't any other build errors with gcc 4.9.2. Fixes: OS#4991 Change-Id: I9d3abbf9812dc09201eff0e9f7542cddedb6848b --- M include/osmocom/sim/sim.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sim/sim.h b/include/osmocom/sim/sim.h index bfd1ac9..72e7904 100644 --- a/include/osmocom/sim/sim.h +++ b/include/osmocom/sim/sim.h @@ -283,7 +283,7 @@ } u; }; -#define OSIM_CARD_SW_LAST (const struct osim_card_sw) { \ +#define OSIM_CARD_SW_LAST { \ .code = 0, .mask = 0, .type = SW_TYPE_NONE, \ .class = SW_CLS_NONE, .u.str = NULL \ } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d3abbf9812dc09201eff0e9f7542cddedb6848b Gerrit-Change-Number: 22588 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:20:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 09:20:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22587 ) Change subject: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration ...................................................................... Patch Set 2: I'm not so sure about this one. a) whether we want it in general, and b) whether it should also ignore configuration that differs from what we [now] implement by default. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f Gerrit-Change-Number: 22587 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 09:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:22:02 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 09:22:02 +0000 Subject: Change in osmo-gbproxy[master]: contrib/jenkins.sh: adjust to osmo-gbproxy split References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 ) Change subject: contrib/jenkins.sh: adjust to osmo-gbproxy split ...................................................................... contrib/jenkins.sh: adjust to osmo-gbproxy split Related: OS#4992 Change-Id: Ie82fc7a5a1166507460cf96ddbdf8ca77430ea64 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/89/22589/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 2325897..1a58268 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash -# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# This is how we build on jenkins.osmocom.org # # environment variables: -# * IU: configure 3G support (values: "--enable-iu", "--disable-iu") # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") # @@ -32,21 +31,6 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" -osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif -osmo-build-dep.sh osmo-ggsn -osmo-build-dep.sh osmo-hlr - -enable_werror="" -if [ "x$IU" = "x--enable-iu" ]; then - osmo-build-dep.sh libosmo-sccp - osmo-build-dep.sh libasn1c - #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh - osmo-build-dep.sh osmo-iuh -else - enable_werror="--enable-werror" -fi - # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then @@ -57,18 +41,18 @@ echo echo echo -echo " =============================== osmo-sgsn ===============================" +echo " =============================== osmo-gbproxy ===============================" echo set -x cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror $IU --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-werror --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$enable_werror $IU --enable-external-tests $CONFIG" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-werror --enable-external-tests $CONFIG" \ $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie82fc7a5a1166507460cf96ddbdf8ca77430ea64 Gerrit-Change-Number: 22589 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 09:51:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 09:51:27 +0000 Subject: Change in osmo-gbproxy[master]: Further clean-up in osmo-sgsn -> osmo-gbproxy migration In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 ) Change subject: Further clean-up in osmo-sgsn -> osmo-gbproxy migration ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 Gerrit-Change-Number: 22586 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 09:51:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:02:06 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:02:06 +0000 Subject: Change in libosmocore[master]: frame_relay: Send "Fuil Status" ENQUIRY after link recovers In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22573 ) Change subject: frame_relay: Send "Fuil Status" ENQUIRY after link recovers ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f905a18a7d130a3c02b4a3e7a2a2dc24afc0ea1 Gerrit-Change-Number: 22573 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:02:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:09:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 10:09:59 +0000 Subject: Change in osmo-gbproxy[master]: Further clean-up in osmo-sgsn -> osmo-gbproxy migration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 ) Change subject: Further clean-up in osmo-sgsn -> osmo-gbproxy migration ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 Gerrit-Change-Number: 22586 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 10:09:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 10:10:15 +0000 Subject: Change in osmo-gbproxy[master]: contrib/jenkins.sh: adjust to osmo-gbproxy split In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 ) Change subject: contrib/jenkins.sh: adjust to osmo-gbproxy split ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie82fc7a5a1166507460cf96ddbdf8ca77430ea64 Gerrit-Change-Number: 22589 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 10:10:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:10:18 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:10:18 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22575/3/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22575/3/src/gb/frame_relay.c at a437 PS3, Line 437: return; You Acked lynxis issue, but still remove this line? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:10:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:10:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 10:10:38 +0000 Subject: Change in osmo-gbproxy[master]: Update README to cover osmo-gbproxy and not osmo-sgsn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 ) Change subject: Update README to cover osmo-gbproxy and not osmo-sgsn ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7e86dfed985f98ae87af9adcde6f776c5a15044 Gerrit-Change-Number: 22581 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 10:10:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:11:12 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:11:12 +0000 Subject: Change in libosmocore[master]: frame_relay: Discard received messages for DLC not yet active In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22576 ) Change subject: frame_relay: Discard received messages for DLC not yet active ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia4a045fdf165b526f429f4617e0fdc76036480bd Gerrit-Change-Number: 22576 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:11:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:15:58 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:15:58 +0000 Subject: Change in libosmocore[master]: frame_relay: cosmetic: Unify log syntax when discarding Rx packets In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22577 ) Change subject: frame_relay: cosmetic: Unify log syntax when discarding Rx packets ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 Gerrit-Change-Number: 22577 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:15:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:26:31 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:26:31 +0000 Subject: Change in libosmocore[master]: ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22578 ) Change subject: ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31fe695a83d38ea1f10f5444e840633d7fa68442 Gerrit-Change-Number: 22578 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:26:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:28:00 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:28:00 +0000 Subject: Change in libosmocore[master]: ns2: Don't start sending NS-RESET until FR DLC is available In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22580 ) Change subject: ns2: Don't start sending NS-RESET until FR DLC is available ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id4e7565ba166ca1d12f8800c643d9f2bc4d66873 Gerrit-Change-Number: 22580 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:28:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:33:03 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 10:33:03 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22579 ) Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22579/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22579/2/src/gb/gprs_ns2_vc_fsm.c at 636 PS2, Line 636: stop_test_procedure(priv); > can we move this into the state_enter? ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 10:33:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:36:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:36:22 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22544 ) Change subject: gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib1aac538afeb0a5c76a1df472d555139a496e12e Gerrit-Change-Number: 22544 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:36:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:41:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:41:33 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22587 ) Change subject: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration ...................................................................... Patch Set 2: Code-Review-1 This should be marked somehow as "DEPRECATED" and log some sort of deprecation warning when the cmd is used. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f Gerrit-Change-Number: 22587 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 10:41:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:43:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:43:05 +0000 Subject: Change in osmo-gbproxy[master]: Further clean-up in osmo-sgsn -> osmo-gbproxy migration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 ) Change subject: Further clean-up in osmo-sgsn -> osmo-gbproxy migration ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 Gerrit-Change-Number: 22586 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:43:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:43:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:43:39 +0000 Subject: Change in osmo-gbproxy[master]: contrib/jenkins.sh: adjust to osmo-gbproxy split In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 ) Change subject: contrib/jenkins.sh: adjust to osmo-gbproxy split ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie82fc7a5a1166507460cf96ddbdf8ca77430ea64 Gerrit-Change-Number: 22589 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:43:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:45:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:45:01 +0000 Subject: Change in libosmocore[master]: frame_relay: cosmetic: Unify log syntax when discarding Rx packets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22577 ) Change subject: frame_relay: cosmetic: Unify log syntax when discarding Rx packets ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 Gerrit-Change-Number: 22577 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:45:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:45:02 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 10:45:02 +0000 Subject: Change in osmo-gbproxy[master]: Further clean-up in osmo-sgsn -> osmo-gbproxy migration In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 ) Change subject: Further clean-up in osmo-sgsn -> osmo-gbproxy migration ...................................................................... Further clean-up in osmo-sgsn -> osmo-gbproxy migration * fix manuals builds, including vty reference generation * fix vty tests * remove manuals from osmo-sgsn * update .gitreview * update osmoappdesc.py Related: OS#4992 Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 --- M .gitreview M Makefile.am M doc/manuals/Makefile.am D doc/manuals/chapters/configuration.adoc D doc/manuals/chapters/control.adoc D doc/manuals/chapters/counters.adoc M doc/manuals/chapters/counters_generated.adoc D doc/manuals/chapters/overview.adoc D doc/manuals/chapters/running.adoc M doc/manuals/osmogbproxy-usermanual.adoc M doc/manuals/osmogbproxy-vty-reference.xml D doc/manuals/osmosgsn-usermanual-docinfo.xml D doc/manuals/osmosgsn-usermanual.adoc D doc/manuals/osmosgsn-vty-reference.xml M doc/manuals/regen_doc.sh R doc/manuals/vty/gbproxy_vty_additions.xml R doc/manuals/vty/gbproxy_vty_reference.xml D doc/manuals/vty/sgsn_vty_additions.xml D doc/manuals/vty/sgsn_vty_reference.xml M osmoappdesc.py M src/gb_proxy_main.c M tests/Makefile.am M tests/vty_test_runner.py 23 files changed, 390 insertions(+), 3,992 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/.gitreview b/.gitreview index 560ddef..06de549 100644 --- a/.gitreview +++ b/.gitreview @@ -1,3 +1,3 @@ [gerrit] host=gerrit.osmocom.org -project=osmo-sgsn +project=osmo-gbproxy diff --git a/Makefile.am b/Makefile.am index 47988ca..bb4758b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,9 @@ $(NULL) SUBDIRS = \ - doc \ include \ src \ + doc \ contrib \ tests \ $(NULL) diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index cd57cf1..fa342ab 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -1,23 +1,26 @@ -EXTRA_DIST = osmosgsn-usermanual.adoc \ - osmosgsn-usermanual-docinfo.xml \ - osmosgsn-vty-reference.xml \ +EXTRA_DIST = \ osmogbproxy-usermanual.adoc \ osmogbproxy-usermanual-docinfo.xml \ - regen_doc.sh \ - chapters \ - vty \ osmogbproxy-vty-reference.xml \ - vty-osmogbproxy \ + chapters \ + regen_doc.sh \ + vty \ $(NULL) if BUILD_MANUALS - ASCIIDOC = osmosgsn-usermanual.adoc osmogbproxy-usermanual.adoc - ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc + ASCIIDOC = osmogbproxy-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + osmogbproxy-usermanual.pdf: $(srcdir)/chapters/*.adoc #$(srcdir)/chapters/*.dot - VTY_REFERENCE = osmosgsn-vty-reference.xml osmogbproxy-vty-reference.xml + VTY_REFERENCE = osmogbproxy-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/gbproxy_vty_reference.xml + $(builddir)/vty/gbproxy_vty_reference.xml: $(top_builddir)/src/osmo-gbproxy + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-gbproxy --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - OSMO_REPOSITORY = osmo-sgsn + OSMO_REPOSITORY = osmo-gbproxy include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc endif diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc deleted file mode 100644 index 7d3072e..0000000 --- a/doc/manuals/chapters/configuration.adoc +++ /dev/null @@ -1,378 +0,0 @@ -== Configuring OsmoSGSN - -Contrary to other network elements (like OsmoBSC, OsmoNITB), the -OsmoSGSN has a relatively simple configuration. - -On the one hand, this is primary because the PCU configuration happens -from the BSC side. - -On the other hand, it is because the Gb interface does not need an -explicit configuration of each PCU connecting to the SGSN. The -administrator only has to ensure that the NS and BSSGP layer identities -(NSEI, NSVCI, BVCI) are unique for each PCU connecting to the SGSN. - -=== Configuring the Gp interface - -The Gp interface is the GTP-C and GTP-U based interface between the SGSN -and the GGSNs. It is implemented via UDP on well-known source and -destination ports. - -When an MS requests establishment of a PDP context, it specifies the APN -(Access Point Name) to which the context shall be established. This APN -determines which GGSN shall be used, and that in turn determines which -external IP network the MS will be connected to. - -There are two modes in which GGSNs can be configured: - -. static GGSN/APN configuration -. dynamic GGSN/APN configuration - -==== Static GGSN/APN configuration - -In this mode, there is a static list of GGSNs and APNs configured in -OsmoSGSN via the VTY / config file. - -This is a non-standard method outside of the 3GPP specifications for the -SGSN, and is typically only used in private/small GPRS networks without -any access to a GRX. - -.Example: Static GGSN/APN configuration (single catch-all GGSN) ----- -OsmoSGSN(config-sgsn)# gtp local-ip 172.0.0.1 <1> -OsmoSGSN(config-sgsn)# ggsn 0 remote-ip 127.0.0.2 <2> -OsmoSGSN(config-sgsn)# ggsn 0 gtp-version 1 <3> -OsmoSGSN(config-sgsn)# apn * ggsn 0 <4> ----- -<1> Configure the local IP address at the SGSN used for Gp/GTP -<2> Specify the remote IP address of the GGSN (for GGSN 0) -<3> Specify the GTP protocol version used for GGSN 0 -<4> Route all APN names to GGSN 0 - - -==== Dynamic GGSN/APN configuration - -In this mode, the SGSN will use a DNS-based method to perform the lookup -from the APN (as specified by the MS) towards the GGSN IP address. - -This is the official method as per the 3GPP specifications for the SGSN, -and what is used on GRX. - -.Example: Dynamic GGSN/APN configuration ----- -OsmoSGSN(config-sgsn)# gtp local-ip 192.168.0.11 <1> -OsmoSGSN(config-sgsn)# ggsn dynamic <2> -OsmoSGSN(config-sgsn)# grx-dns-add 1.2.3.4 <3> ----- -<1> Configure the local IP address at the SGSN used for Gp/GTP -<2> Enable the dynamic GGSN resolving mode -<3> Specify the IP address of a DNS server for APN resolution - -[[auth-pol]] -=== Authorization Policy - -The authorization policy controls by which rules a subscriber is accepted or -rejected. The possible options range from accepting just all subscribers without -further checking, to a fine grained access-control, handled by an external HLR. - -accept-all:: All subscribers that attempt to attach to the GPRS network are -accepted without further checking. This option is intended to be used for -testing in a controlled environment only. A wide-open network may attract -subscribers from foreign networks and disrupt their service. It is highly -recommended to pick one of the options below. - -remote:: This option allows to connect OsmoSGSN to an external HLR via the -GSUP protocol. This will be the preferred option in larger networks. - -acl-only:: If no external HLR is available, the network operator has the -option to control the access using an access control list. The access control -list contains the IMSI numbers of the allowed subscribers. This method offers -fine grained access control and is ideal for small networks and lab test -environments. - -closed:: This policy mode softens the strict *acl-only* only mode by also -implicitly accepting home network subscribers. The decision is made by the MCC -and MNC part of the IMSI number. The combination of MCC and MNC fully identifies -a subscribers home network, also known as a Home Network Identity (HNI, i.e. -MCC and MNC found at the start of the IMSI, e.g. MCC 901 and MNC 700 with -IMSI 901700000003080). - -NOTE: The policy mode *closed* must not be confused with the equally named -policy that is defined for osmo-nitb! - - -.Example: Assign or change authorization policy ----- -OsmoSGSN> enable -OsmoSGSN# configure terminal -OsmoSGSN(config)# sgsn -OsmoSGSN(config-sgsn)# auth-policy acl-only <1> -OsmoSGSN(config-sgsn)# write <2> -Configuration saved to sgsn.cfg -OsmoSGSN(config-sgsn)# end -OsmoSGSN# disable -OsmoSGSN> ----- -<1> 'acl-only' is selected as authorization policy -<2> Saves current changes to cofiguration to make this policy -persistent - -.Example: Access control list ----- -sgsn - auth-policy acl-only <1> - imsi-acl add 001010000000003 - imsi-acl add 001010000000002 - imsi-acl add 001010000000001 - imsi-acl add 901700000000068 <2> ----- -<1> Set the authorization policy -<2> Add as many subscribers as required - -=== Subscriber Configuration - -As opposed to OsmoNITB, OsmoSGSN does not feature a built-in HLR. - -It can thus operate only in the following two modes: - -. Accessing an external HLR (or HLR gateway) via the GSUP protocol -. Accepting subscribers based on internal ACL (access control list), - see also <> - -==== Accessing an external HLR via GSUP - -The non-standard GSUP protocol was created to provide OsmoSGSN with -access to an external HLR while avoiding the complexities of the -TCAP/MAP protocol stack commonly used by HLRs. - -A custom HLR could either directly implement GSUP, or an external gateway -can be used to convert GSUP to the respective MAP operations. - -The primitives/operations of GSUP are modelled to have a 1:1 -correspondence to their MAP counterparts. However, the encoding is much -simplified by use of a binary TLV encoding similar to Layer 3 of -GSM/GPRS. - -GSUP performs a challenge-response authentication protocol called OAP, -which uses the standard MILENAGE algorithm for mutual authentication -between OsmoSGSN and the HLR/HLR-GW. - -[[sgsn-ex-gsup]] -.Example: Using an external HLR via GSUP ----- -OsmoSGSN(config-sgsn)# gsup remote-ip 2.3.4.5 <1> -OsmoSGSN(config-sgsn)# gsup remote-port 10000 <2> -OsmoSGSN(config-sgsn)# gsup oap-k 000102030405060708090a0b0c0d0e0f <3> -OsmoSGSN(config-sgsn)# gsup oap-opc 101112131415161718191a1b1c1d1e1f <4> ----- -<1> Configure the IP address of the (remote) HLR or HLR-GW -<2> Configure the TCP port of the (remote) HLR or HLR-GW -<3> Specify the OAP shared key -<4> Specify the OAP shared OPC - - -=== CDR configuration - -OsmoSGSN can write a text log file containing CDR (call data records), -which are commonly used for accounting/billing purpose. - -.Example: CDR log file configuration ----- -OsmoSGSN(config-sgsn)# cdr filename /var/log/osmosgsn.cdr -OsmoSGSN(config-sgsn)# cdr interval 600 <1> ----- -<1> Periodically log existing PDP contexts every 600 seconds (10 min) - -The CDR file is a simple CSV file including a header line naming the -individual fields of each CSV line. - -==== CDR CTRL interface - -Independently of whether logging CDR to a file is enabled or not, OsmoSGSN can -also provide delivery of CDR through the CTRL interface. CDR are sent by means -of TRAP messages with variable name _cdr-v1_, and its value is filled using the -same CSV line format as in the log file, but without CSV header line. - -.Example: CDR delivery through CTRL TRAP messages ----- -OsmoSGSN(config-sgsn)# cdr trap ----- - -==== CDR Format - -[[sgsn-cdr]] -.Description of CSV fields in OsmoSGSN CDR file -[options="header",cols="15%,85%"] -|=== -|Field Name|Description -|timestamp|Timestamp in YYYYMMDDhhmmssXXX where XXX are milli-seconds -|imsi|IMSI causing this CDR -|imei|IMEI causing this CDR -|msisdn|MSISDN causing this CDR (if known) -|cell_id|Cell ID in which the MS was registered last -|lac|Location Area Code in which the MS was registered last -|hlr|HLR of the subscriber -|event|Possible events are explained below in <> -|=== - -If the _event_ field describes a pdp context related action (starts with -_pdp-_), then the following extra CSV fields are appended to the line: - -[[sgsn-cdr-pdp]] -.Description of extra CSV fields for pdp context related events -[options="header",cols="15%,85%"] -|=== -|Field Name|Description -|pdp_duration|duration of the PDP context so far -|ggsn_addr|GGSN related to the PDP context -|sgsn_addr|SGSN related to the PDP context -|apni|APN identifier of the PDP context -|eua_addr|IP address allocated to the PDP context -|vol_in|Number of bytes in MO direction -|vol_out|Number of bytes in MT direction -|charging_id|Related charging ID -|=== - -[[sgsn-cdr-event]] -.Description of OsmoSGSN CDR Events -[options="header",cols="15%,85%"] -|=== -|Event|Description -|attach|GMM ATTACH COMPLETE about to be sent to MS -|update|GMM ROUTING AREA UPDATE COMPLETE about to be sent to MS -|detach|GMM DETACH REQUEST received from MS -|free|Release of the MM context memory -|pdp-act|GTP CREATE PDP CONTEXT CONFIRM received from GGSN -|pdp-deact|GTP DELETE PDP CONTEXT CONFIRM received from GGSN -|pdp-terminate|Forced PDP context termination during MM context release -|pdp-free|Release of the PDP context memory -|pdp-periodic|Triggered by periodic timer, see VTY cmd _cdr interval_ -|=== - - -=== User traffic compression - -In order to save GPRS bandwith, OsmoSGSN implements header and data -compression schemes which will reduce the packet length. - -==== Header compression - -On TCP/IP connections, each packet is prepended with a fairly long TCP/IP -header. The header contains a lot of static information that never changes -throughout the connection. (source and destination address, port numbers etc.) -OsmoSGSN implements a TCP/IP header compression scheme called RFC1144, also -known as SLHC. This type of header compression removes the TCP/IP header -entirely and replaces it with a shorter version, that only contains the -information that is absolutely necessary to identify and check the packet. -The receiving part then restores the original header and forwards it to higher -layers. - -*compression rfc1144 passive*:: -TCP/IP header compression has to be actively requested by the modem. The -network will not promote compression by itself. This is the recommended mode -of operation. - -*compression rfc1144 active slots <1-256>*:: -TCP/IP header compression is actively promoted by the network. Modems may still -actively request different compression parameters or reject the offered -compression parameters entirely. The number of slots is the maximum number -of packet headers per subscriber that can be stored in the codebook. - -.Example: Accept compression if requested ----- -sgsn - compression rfc1144 passive ----- - -.Example: Actively promote compression ----- -sgsn - compression rfc1144 active slots 8 ----- - -.Example: Turn off compression ----- -sgsn - no compression rfc1144 ----- - -NOTE: The usage of TCP/IP options may disturb the RFC1144 header compression -scheme. TCP/IP options may render RFC1144 ineffective if variable data is -encoded into the option section of the TCP/IP packet. (e.g. TCP option 8, -Timestamp) - - -==== Data compression - -Data compression works on the raw packet data, including the header part of the -packet. If enabled, header compression is applied first before data compression -is applied. OsmoSGSN implements the V.42bis data compression scheme. - -*compression v42bis passive*:: -V42bis data compression has to be actively requested by the modem. The network -will not promote compression by itself. This is the recommended mode of -operation. - -*compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250>*:: -V42bis data compression is actively promoted by the network. Modems may still -actively request different compression parameters or reject the offered -compression parameters entirely. The direction configures which sides are -allowed to send compressed packets. For most cases, compressing 'both' -directions will be the preferred option. The following to parameters configure -the codebook size by the maxium number ('codewords') and size ('strlen') of -entries. - -.Example: Accept compression if requested ----- -sgsn - compression v42bis passive ----- - -.Example: Actively promote compression ----- -sgsn - compression v42bis active direction both codewords 512 strlen 20 ----- - -.Example: Turn off compression ----- -sgsn - no compression v42bis ----- - -=== Encryption - -Encryption can be enabled if the auth-policy is set to remote and the -HLR subscriber entries contain the keys of the SIM card. See -<> on how to connect to an external HLR. - -.Example: Turn on encryption (GEA3) ----- -sgsn - encryption GEA3 ----- - -.Example: Turn off encryption (GEA0) ----- -sgsn - encryption GEA0 ----- - -=== Configure SCCP/M3UA to accept _IuPS_ links - -OsmoSGSN acts as client to contact an STP instance and establish an SCCP/M3UA -link. - -An example configuration of OsmoSGSN's SCCP link: - ----- -cs7 instance 0 - point-code 0.23.4 - asp asp-clnt-OsmoSGSN 2905 0 m3ua - remote-ip 127.0.0.1 - sctp-role client - as as-clnt-OsmoSGSN m3ua - asp asp-clnt-OsmoSGSN - routing-key 0 0.23.4 ----- - -This configuration is explained in detail in <>. diff --git a/doc/manuals/chapters/control.adoc b/doc/manuals/chapters/control.adoc deleted file mode 100644 index 0f2bfae..0000000 --- a/doc/manuals/chapters/control.adoc +++ /dev/null @@ -1,23 +0,0 @@ -[[control]] -== Control interface - -The actual protocol is described in <>, the variables -common to all programs using it are described in <>. Here we -describe variables specific to OsmoSGSN. - -.Variables available over control interface -[options="header",width="100%",cols="20%,5%,5%,50%,20%"] -|=== -|Name|Access|Trap|Value|Comment -|subscriber-list-active-v1|RO|No|","|See <> for details. -|=== - -[[subs]] -=== subscriber-list-active-v1 - -Return the list of active subscribers as a concatenated set of pairs "", -"addr" where first element of the pair is subscriber's IMSI and the second -element (which might be empty) is the subscriber's address. The address value -might be "none", "invalid" and "PPP" in addition to actual IP address. In case -of IP address it will be prefixed with "IPv4" or "IPv6" string depending on the -version of IP protocol. diff --git a/doc/manuals/chapters/counters.adoc b/doc/manuals/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/doc/manuals/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index dac46aa..e16560c 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -1,52 +1,10 @@ // autogenerated by show asciidoc counters -These counters and their description based on OsmoSGSN 1.4.0.31-05fe (OsmoSGSN). +These counters and their description are based on OsmoGbProxy UNKNOWN-dirty (OsmoGbProxy). === Rate Counters // generating tables for rate_ctr_group -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table SGSN Overall Statistics -.sgsn - SGSN Overall Statistics -[options="header"] -|=== -| Name | Reference | Description -| llc:dl_bytes | <> | Count sent LLC bytes before giving it to the bssgp layer -| llc:ul_bytes | <> | Count successful received LLC bytes (encrypt & fcs correct) -| llc:dl_packets | <> | Count successful sent LLC packets before giving it to the bssgp layer -| llc:ul_packets | <> | Count successful received LLC packets (encrypt & fcs correct) -| gprs:attach_requested | <> | Received attach requests -| gprs:attach_accepted | <> | Sent attach accepts -| gprs:attach_rejected | <> | Sent attach rejects -| gprs:detach_requested | <> | Received detach requests -| gprs:detach_acked | <> | Sent detach acks -| gprs:routing_area_requested | <> | Received routing area requests -| gprs:routing_area_requested | <> | Sent routing area acks -| gprs:routing_area_requested | <> | Sent routing area rejects -| pdp:activate_requested | <> | Received activate requests -| pdp:activate_rejected | <> | Sent activate rejects -| pdp:activate_accepted | <> | Sent activate accepts -| pdp:request_activated | <> | unused -| pdp:request_activate_rejected | <> | unused -| pdp:modify_requested | <> | unused -| pdp:modify_accepted | <> | unused -| pdp:dl_deactivate_requested | <> | Sent deactivate requests -| pdp:dl_deactivate_accepted | <> | Sent deactivate accepted -| pdp:ul_deactivate_requested | <> | Received deactivate requests -| pdp:ul_deactivate_accepted | <> | Received deactivate accepts -|=== // rate_ctr_group table NSVC Peer Statistics .ns:nsvc - NSVC Peer Statistics [options="header"] @@ -54,16 +12,46 @@ | Name | Reference | Description | packets:in | <> | Packets at NS Level ( In) | packets:out | <> | Packets at NS Level (Out) +| packets:out:drop | <> | Dropped Packets (Out) | bytes:in | <> | Bytes at NS Level ( In) | bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count +| bytes:out:drop | <> | Dropped Bytes (Out) +| blocked | <> | NS-VC Block count +| unblocked | <> | NS-VC Unblock count +| dead | <> | NS-VC gone dead count | replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count +| nsei-chg | <> | NS-VC changed NSEI count +| lost:alive | <> | ALIVE ACK missing count +| lost:reset | <> | RESET ACK missing count +|=== +// rate_ctr_group table GBProxy Peer Statistics +.gbproxy:peer - GBProxy Peer Statistics +[options="header"] +|=== +| Name | Reference | Description +| blocked | <> | BVC Block +| unblocked | <> | BVC Unblock +| dropped | <> | BVC blocked, dropped packet +| inv-nsei | <> | NSEI mismatch +| tx-err | <> | NS Transmission error +|=== +// rate_ctr_group table GBProxy Global Statistics +.gbproxy:global - GBProxy Global Statistics +[options="header"] +|=== +| Name | Reference | Description +| inv-bvci | <> | Invalid BVC Identifier +| inv-lai | <> | Invalid Location Area Identifier +| inv-rai | <> | Invalid Routing Area Identifier +| inv-nsei | <> | No BVC established for NSEI +| proto-err:bss | <> | BSSGP protocol error (BSS ) +| proto-err:sgsn | <> | BSSGP protocol error (SGSN) +| not-supp:bss | <> | Feature not supported (BSS ) +| not-supp:sgsn | <> | Feature not supported (SGSN) +| restart:sgsn | <> | Restarted RESET procedure (SGSN) +| tx-err:sgsn | <> | NS Transmission error (SGSN) +| error | <> | Other error +| mod-peer-err | <> | Patch error: no peer |=== == Osmo Stat Items @@ -76,6 +64,14 @@ | Name | Reference | Description | Unit | alive.delay | <> | ALIVE response time | ms |=== +NS Bind Statistics +// osmo_stat_item_group table NS Bind Statistics +.ns.bind - NS Bind Statistics +[options="header"] +|=== +| Name | Reference | Description | Unit +| tx_backlog_length | <> | Transmit backlog length | packets +|=== == Osmo Counters // generating tables for osmo_counters diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc deleted file mode 100644 index e2c0107..0000000 --- a/doc/manuals/chapters/overview.adoc +++ /dev/null @@ -1,109 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoSGSN - -OsmoSGSN is the Osmocom implementation of the GPRS SGSN (Serving Gprs -Support Node) element inside the GPRS network. The SGSN plays a similar -central function to the GPRS network as the MSC plays in the GSM -network. - -The SGSN is connected on the downlink side to Gb interfaces of the BSS, -specifically the PCU inside the BSS. The SGSN is further connected by -the GTP protocol to the GGSN which terminates the tunnels towards the -external packet data network (e.g. IPv4). - -OsmoSGSN supports both a PCU that is co-located with(in) the BTS, as -well as a PCU that is co-located with(in) the BSC. In combination with -OsmoNITB/OsmoBSC/OsmoBTS, the PCU is co-located within the BTS. - -[[fig-gprs-pcubts]] -.GPRS network architecture with PCU in BTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"]; - MS1 [label="MS"]; - MS0->BTS [label="Um"]; - MS1->BTS [label="Um"]; - BTS->BSC [label="Abis"]; - BSC->MSC [label="A"]; - BTS->PCU [label="pcu_sock"]; - PCU->SGSN [label="Gb"]; - SGSN->GGSN [label="GTP"]; -} ----- - -=== Software Components - -OsmoSGSN contains a variety of different software components, which -we'll quickly describe in this section. - -==== Gb Implementation - -OsmoSGSN implements the ETSI/3GPP specified Gb interface, including TS -08.16 (NS), TS 08.18 (BSSGP) and TS 08.64 (LLC) protocols. As transport -layers for NS, it supports NS/IP (NS encapsulated in UDP/IP), as well as -NS/FR/GRE/IP. The latter is provided in order to use a Router with -Ethernet and Frame Relay interface to convert to actual physical Frame -Relay medium, which is not directly supported by OsmoSGSN. - -The actual Gb Implementation is part of the libosmogb library, which is -in turn part of the libosmocore software package. This allows the same -Gb implementation to be used from osmo-pcu, osmo-gbproxy as well as -OsmoSGSN. - - -==== GTP Implementation - -OsmoSGSN uses the libgtp implementation originating from OsmoGGSN. It -supports both GTPv0 and GTPv1. - - -==== GMM Implementation - -The GPRS Mobility Management implementation is quite simplistic at this -point. It supports the GPRS ATTACH and GPRS ROUTING AREA UPDATE -procedures, as well as GPRS ATTACH and GPRS DETACH. - -==== LLC Implementation - -The LLC (Logical Link Control) implementation of OsmoSGSN only supports -non-acknowledged mode, as this is the most common use case in real-world -GPRS networks. - -It does support both TCP/IP header compression according to RFC1144 and -payload compression according to V.42bis - -The LLC implementation does support LLC encryption with ciphers GEA3 and GEA4. -For encryption to work the auth policy needs to be set to remote and the SGSN -connected to an HLR containing the subscriber data including key material. -Other auth policys will not work with encryption. - -==== Session Management Implementation - -The session management procedures ACTIVATE PDP CONTEXT and DEACTIVATE -PDP CONTEXT are supported. However, no MODIFY PDP CONTEXT and no -Network-initiated PDP context activation is possible. This is again -covering the predominant use cases and configurations in GPRS real-world -networks while skipping the more esoteric features. - -Multiple PDP contexts can be attached by a single MS. - -Multiple GGSNs can be configured and routing to a GGSN can be configured based -on APN. Dynamic lookup of GGSNs though DNS-based APN resolving is also possible. - -=== Limitations - -At the time of writing, OsmoSGSN still has a number of limitations, -which are a result of the demand-driven Open Source development model. -If you require any of those features, please consider implementing and -contributing them, or contracting the existing OsmoSGSN developers for -performing that work. - -Known Limitations include: - -* No paging coordination between SGSN and MSC -* No SMS over Ps support diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc deleted file mode 100644 index 63c2b27..0000000 --- a/doc/manuals/chapters/running.adoc +++ /dev/null @@ -1,35 +0,0 @@ -== Running OsmoSGSN - -The OsmoSGSN executable (`osmo-sgsn`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-sgsn* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-e 'LOGLEVEL'] - - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoSGSN program -*-d, --debug 'DBGMASK','DBGLEVELS'*:: - Set the log subsystems and levels for logging to stderr. This - has mostly been superseded by VTY-based logging configuration, - see <> for further information. -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo_sgsn.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. -*-e, --log-level 'LOGLEVEL'*:: - Set the global log level for logging to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. diff --git a/doc/manuals/osmogbproxy-usermanual.adoc b/doc/manuals/osmogbproxy-usermanual.adoc index d19bdd4..f4da954 100644 --- a/doc/manuals/osmogbproxy-usermanual.adoc +++ b/doc/manuals/osmogbproxy-usermanual.adoc @@ -25,7 +25,7 @@ include::./common/chapters/control_if.adoc[] -//include::{srcdir}/chapters/counters.adoc[] +include::{srcdir}/chapters/counters_generated.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/doc/manuals/osmogbproxy-vty-reference.xml b/doc/manuals/osmogbproxy-vty-reference.xml index ecf2268..5c2a16a 100644 --- a/doc/manuals/osmogbproxy-vty-reference.xml +++ b/doc/manuals/osmogbproxy-vty-reference.xml @@ -6,7 +6,7 @@ - + ]> diff --git a/doc/manuals/osmosgsn-usermanual-docinfo.xml b/doc/manuals/osmosgsn-usermanual-docinfo.xml deleted file mode 100644 index afbf109..0000000 --- a/doc/manuals/osmosgsn-usermanual-docinfo.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 1 - January 13, 2013 - HW - - Initial version. - - - - 2 - February 2016 - HW - - Conversion to asciidoc, removal of sysmoBTS specific parts. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/doc/manuals/osmosgsn-usermanual.adoc b/doc/manuals/osmosgsn-usermanual.adoc deleted file mode 100644 index 610704a..0000000 --- a/doc/manuals/osmosgsn-usermanual.adoc +++ /dev/null @@ -1,40 +0,0 @@ -:gfdl-enabled: - -OsmoSGSN User Manual -==================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/cs7-config.adoc[] - -include::./common/chapters/gb.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/oap.adoc[] - -include::./common/chapters/gsup.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/doc/manuals/osmosgsn-vty-reference.xml b/doc/manuals/osmosgsn-vty-reference.xml deleted file mode 100644 index 82b666a..0000000 --- a/doc/manuals/osmosgsn-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th January 2013 - hw - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoSGSN VTY Reference - - - 2013-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh index 847b764..e68e7e5 100755 --- a/doc/manuals/regen_doc.sh +++ b/doc/manuals/regen_doc.sh @@ -51,27 +51,24 @@ } DIR="$(cd "$(dirname "$0")"; pwd)" +echo $DIR cd "$DIR" require_osmo_interact_vty interact_vty \ "update_vty_reference" \ - "vty/sgsn_vty_reference.xml" \ - 4245 \ - osmo-sgsn -c "../examples/osmo-sgsn/osmo-sgsn.cfg" - -interact_vty \ - "update_vty_reference" \ - "vty-osmogbproxy/gbproxy_vty_reference.xml" \ + "vty/gbproxy_vty_reference.xml" \ 4246 \ osmo-gbproxy -c "../examples/osmo-gbproxy/osmo-gbproxy.cfg" +sleep 5 + interact_vty \ "update_counters" \ "chapters/counters_generated.adoc" \ - 4245 \ - osmo-sgsn -c "../examples/osmo-sgsn/osmo-sgsn.cfg" + 4246 \ + osmo-gbproxy -c "../examples/osmo-gbproxy/osmo-gbproxy.cfg" echo "Done with all" diff --git a/doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml b/doc/manuals/vty/gbproxy_vty_additions.xml similarity index 100% rename from doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml rename to doc/manuals/vty/gbproxy_vty_additions.xml diff --git a/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml b/doc/manuals/vty/gbproxy_vty_reference.xml similarity index 78% rename from doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml rename to doc/manuals/vty/gbproxy_vty_reference.xml index 1db3c0d..19b04e1 100644 --- a/doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml +++ b/doc/manuals/vty/gbproxy_vty_reference.xml @@ -7,9 +7,25 @@ - + + + + + + + + + + + + + + + + + @@ -67,9 +83,10 @@ - + + @@ -188,13 +205,13 @@ - + - + @@ -214,6 +231,8 @@ + + @@ -253,12 +272,12 @@ - + - + @@ -278,6 +297,8 @@ + + @@ -365,10 +386,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -379,43 +439,41 @@ - + - + + - + - - + + - + - - + + - + - - - - - + + + - + - - - + + @@ -587,13 +645,13 @@ - + - + @@ -613,6 +671,8 @@ + + @@ -652,12 +712,12 @@ - + - + @@ -677,6 +737,8 @@ + + @@ -764,10 +826,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -778,17 +891,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -796,75 +947,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config @@ -1052,6 +1134,20 @@ + + + + + + + + + + + + + + @@ -1089,11 +1185,11 @@ - + - + @@ -1101,9 +1197,11 @@ - + - + + + @@ -1181,13 +1279,13 @@ - + - + @@ -1207,6 +1305,8 @@ + + @@ -1246,16 +1346,6 @@ - - - - - - - - - - config-stats @@ -1325,6 +1415,12 @@ + + + + + + config-line @@ -1347,280 +1443,95 @@ - - config-ns - + + config-gbproxy + - - - - + + + - + + + + - - - - + + + - + + + + - - - - + + + + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - config-gbproxy - + + config-sgsn + - - - + + - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - + + + + - - + + + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/doc/manuals/vty/sgsn_vty_additions.xml b/doc/manuals/vty/sgsn_vty_additions.xml deleted file mode 100644 index 660b695..0000000 --- a/doc/manuals/vty/sgsn_vty_additions.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Configure the remote GGSN, access-control and other - attributes of the SGSN - - diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml deleted file mode 100644 index 8ffc607..0000000 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ /dev/null @@ -1,2677 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-bssgp - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-sgsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/osmoappdesc.py b/osmoappdesc.py index 1fccafd..7f60840 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -17,17 +17,13 @@ app_configs = { "gbproxy": ["doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"], - "sgsn": ["doc/examples/osmo-sgsn/osmo-sgsn.cfg"], - "gtphub": ["doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg"] } -apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), - (4245, "src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn"), - (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub") +apps = [(4246, "src/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), ] -vty_command = ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] +vty_command = ["./src/osmo-gbproxy", "-c", + "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"] -vty_app = apps[1] +vty_app = apps[0] diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c index 7c6f1d2..2e9ff79 100644 --- a/src/gb_proxy_main.c +++ b/src/gb_proxy_main.c @@ -131,12 +131,42 @@ printf(" -T --timestamp Prefix every log line with a timestamp\n"); printf(" -V --version. Print the version.\n"); printf(" -e --log-level number. Set a global loglevel.\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { { "help", 0, 0, 'h' }, { "debug", 1, 0, 'd' }, @@ -146,6 +176,8 @@ { "timestamp", 0, 0, 'T' }, { "version", 0, 0, 'V' }, { "log-level", 1, 0, 'e' }, + { "vty-ref-mode", 1, &long_option, 1 }, + { "vty-ref-xml", 0, &long_option, 2 }, { 0, 0, 0, 0 } }; @@ -159,6 +191,9 @@ print_usage(); print_help(); exit(0); + case 0: + handle_long_options(argv[0], long_option); + break; case 's': log_set_use_color(osmo_stderr_target, 0); break; diff --git a/tests/Makefile.am b/tests/Makefile.am index b0e2a74..48d6579 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,11 +56,11 @@ vty-transcript-test: osmo_verify_transcript_vty.py -v \ -n OsmoGbProxy -p 4246 \ - -r "$(top_builddir)/src/gbproxy/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg" \ + -r "$(top_builddir)/src/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg" \ $(U) $${T:-$(srcdir)/osmo-gbproxy_test-nodes.vty} osmo_verify_transcript_vty.py -v \ -n OsmoGbProxy -p 4246 \ - -r "$(top_builddir)/src/gbproxy/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg" \ + -r "$(top_builddir)/src/osmo-gbproxy -c $(top_srcdir)/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg" \ $(U) $${T:-$(srcdir)/osmo-gbproxy-pool_test-nodes.vty} rm -f $(builddir)/sms.db $(builddir)/gsn_restart diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 92466bb..50cf4f3 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -71,11 +71,11 @@ class TestVTYGbproxy(TestVTYBase): def vty_command(self): - return ["./src/gbproxy/osmo-gbproxy", "-c", + return ["./src/osmo-gbproxy", "-c", "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"] def vty_app(self): - return (4246, "./src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy") + return (4246, "./src/osmo-gbproxy", "OsmoGbProxy", "gbproxy") def testVtyTree(self): self.vty.enable() @@ -114,180 +114,11 @@ self.assertTrue(res.find('Deleted 0 BVC') >= 0) self.assertTrue(res.find('NSEI not found') >= 0) -class TestVTYSGSN(TestVTYBase): - - def vty_command(self): - return ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg"] - - def vty_app(self): - return (4245, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") - - def testVtyTree(self): - self.vty.enable() - self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEqual(self.vty.node(), 'config') - self.checkForEndAndExit() - self.assertTrue(self.vty.verify('ns', [''])) - self.assertEqual(self.vty.node(), 'config-ns') - self.checkForEndAndExit() - self.assertTrue(self.vty.verify('exit', [''])) - self.assertEqual(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEqual(self.vty.node(), 'config-sgsn') - self.checkForEndAndExit() - self.assertTrue(self.vty.verify('exit', [''])) - self.assertEqual(self.vty.node(), 'config') - - def testVtyShow(self): - res = self.vty.command("show ns") - self.assertTrue(res.find('0 NS-VC:') >= 0) - self.assertTrue(self.vty.verify('show bssgp', [''])) - self.assertTrue(self.vty.verify('show bssgp stats', [''])) - self.assertTrue(self.vty.verify('show bssgp nsei 123', [''])) - self.assertTrue(self.vty.verify('show bssgp nsei 123 stats', [''])) - self.assertTrue(self.vty.verify('show sgsn', [' GSN: signalling 127.0.0.1, user traffic 127.0.0.1'])) - self.assertTrue(self.vty.verify('show mm-context all', [''])) - self.assertTrue(self.vty.verify('show mm-context imsi 000001234567', ['No MM context for IMSI 000001234567'])) - self.assertTrue(self.vty.verify('show pdp-context all', [''])) - - res = self.vty.command("show sndcp") - self.assertTrue(res.find('State of SNDCP Entities') >= 0) - - res = self.vty.command("show llc") - self.assertTrue(res.find('State of LLC Entities') >= 0) - - def testVtyAuth(self): - self.vty.enable() - self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEqual(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEqual(self.vty.node(), 'config-sgsn') - self.assertTrue(self.vty.verify('auth-policy accept-all', [''])) - res = self.vty.command("show running-config") - self.assertTrue(res.find('auth-policy accept-all') > 0) - self.assertTrue(self.vty.verify('auth-policy acl-only', [''])) - res = self.vty.command("show running-config") - self.assertTrue(res.find('auth-policy acl-only') > 0) - self.assertTrue(self.vty.verify('auth-policy closed', [''])) - res = self.vty.command("show running-config") - self.assertTrue(res.find('auth-policy closed') > 0) - self.assertTrue(self.vty.verify('gsup remote-ip 127.0.0.4', [''])) - self.assertTrue(self.vty.verify('gsup remote-port 2222', [''])) - self.assertTrue(self.vty.verify('auth-policy remote', [''])) - res = self.vty.command("show running-config") - self.assertTrue(res.find('auth-policy remote') > 0) - - def testVtySubscriber(self): - self.vty.enable() - res = self.vty.command('show subscriber cache') - self.assertTrue(res.find('1234567890') < 0) - self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 create', [''])) - res = self.vty.command('show subscriber cache') - self.assertTrue(res.find('1234567890') >= 0) - self.assertTrue(res.find('Authorized: 0') >= 0) - self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 update-location-result ok', [''])) - res = self.vty.command('show subscriber cache') - self.assertTrue(res.find('1234567890') >= 0) - self.assertTrue(res.find('Authorized: 1') >= 0) - self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 cancel update-procedure', [''])) - res = self.vty.command('show subscriber cache') - self.assertTrue(res.find('1234567890') >= 0) - self.assertTrue(self.vty.verify('update-subscriber imsi 1234567890 destroy', [''])) - res = self.vty.command('show subscriber cache') - self.assertTrue(res.find('1234567890') < 0) - - def testVtyGgsn(self): - self.vty.enable() - self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEqual(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEqual(self.vty.node(), 'config-sgsn') - self.assertTrue(self.vty.verify('ggsn 0 remote-ip 127.99.99.99', [''])) - self.assertTrue(self.vty.verify('ggsn 0 gtp-version 1', [''])) - self.assertTrue(self.vty.verify('apn * ggsn 0', [''])) - self.assertTrue(self.vty.verify('apn apn1.test ggsn 0', [''])) - self.assertTrue(self.vty.verify('apn apn1.test ggsn 1', ['% a GGSN with id 1 has not been defined'])) - self.assertTrue(self.vty.verify('apn apn1.test imsi-prefix 123456 ggsn 0', [''])) - self.assertTrue(self.vty.verify('apn apn2.test imsi-prefix 123456 ggsn 0', [''])) - res = self.vty.command("show running-config") - self.assertTrue(res.find('ggsn 0 remote-ip 127.99.99.99') >= 0) - self.assertTrue(res.find('ggsn 0 gtp-version 1') >= 0) - self.assertTrue(res.find('apn * ggsn 0') >= 0) - self.assertTrue(res.find('apn apn1.test ggsn 0') >= 0) - self.assertTrue(res.find('apn apn1.test imsi-prefix 123456 ggsn 0') >= 0) - self.assertTrue(res.find('apn apn2.test imsi-prefix 123456 ggsn 0') >= 0) - - def testVtyEasyAPN(self): - self.vty.enable() - self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEqual(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEqual(self.vty.node(), 'config-sgsn') - - res = self.vty.command("show running-config") - self.assertEqual(res.find("apn internet"), -1) - - self.assertTrue(self.vty.verify("access-point-name internet.apn", [''])) - res = self.vty.command("show running-config") - self.assertTrue(res.find("apn internet.apn ggsn 0") >= 0) - - self.assertTrue(self.vty.verify("no access-point-name internet.apn", [''])) - res = self.vty.command("show running-config") - self.assertEqual(res.find("apn internet"), -1) - - def testVtyCDR(self): - self.vty.enable() - self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEqual(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEqual(self.vty.node(), 'config-sgsn') - - res = self.vty.command("show running-config") - self.assertTrue(res.find("no cdr filename") > 0) - - self.vty.command("cdr filename bla.cdr") - res = self.vty.command("show running-config") - self.assertEqual(res.find("no cdr filename"), -1) - self.assertTrue(res.find(" cdr filename bla.cdr") > 0) - - self.vty.command("no cdr filename") - res = self.vty.command("show running-config") - self.assertTrue(res.find("no cdr filename") > 0) - self.assertEqual(res.find(" cdr filename bla.cdr"), -1) - - res = self.vty.command("show running-config") - self.assertTrue(res.find(" cdr interval 600") > 0) - - self.vty.command("cdr interval 900") - res = self.vty.command("show running-config") - self.assertTrue(res.find(" cdr interval 900") > 0) - self.assertEqual(res.find(" cdr interval 600"), -1) - - def testVtyTimers(self): - self.vty.enable() - self.assertTrue(self.vty.verify('configure terminal', [''])) - self.assertEqual(self.vty.node(), 'config') - self.assertTrue(self.vty.verify('sgsn', [''])) - self.assertEqual(self.vty.node(), 'config-sgsn') - - for t in [3312, 3322, 3350, 3360, 3370, 3313, 3314, 3316, 3385, 3395, 3397]: - self.assertTrue(self.vty.verify('timer t%d 10' % t, [''])) - def add_gbproxy_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/gbproxy/osmo-gbproxy")): - print("Skipping the Gb-Proxy test") - return + assert os.path.isfile(os.path.join(workdir, "src/osmo-gbproxy")) test = unittest.TestLoader().loadTestsFromTestCase(TestVTYGbproxy) suite.addTest(test) -def add_sgsn_test(suite, workdir): - if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")): - print("Skipping the SGSN test") - return - test = unittest.TestLoader().loadTestsFromTestCase(TestVTYSGSN) - suite.addTest(test) - if __name__ == '__main__': import argparse import sys @@ -319,7 +150,6 @@ print("Running tests for specific VTY commands") suite = unittest.TestSuite() add_gbproxy_test(suite, workdir) - add_sgsn_test(suite, workdir) if args.test_name: osmoutil.pick_tests(suite, *args.test_name) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I80439ab0d21a3fb33f38da42acbfe3fbb0941b91 Gerrit-Change-Number: 22586 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:45:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 10:45:03 +0000 Subject: Change in osmo-gbproxy[master]: contrib/jenkins.sh: adjust to osmo-gbproxy split In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 ) Change subject: contrib/jenkins.sh: adjust to osmo-gbproxy split ...................................................................... contrib/jenkins.sh: adjust to osmo-gbproxy split Related: OS#4992 Change-Id: Ie82fc7a5a1166507460cf96ddbdf8ca77430ea64 --- M contrib/jenkins.sh 1 file changed, 4 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 2325897..1a58268 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash -# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# This is how we build on jenkins.osmocom.org # # environment variables: -# * IU: configure 3G support (values: "--enable-iu", "--disable-iu") # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") # @@ -32,21 +31,6 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" -osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif -osmo-build-dep.sh osmo-ggsn -osmo-build-dep.sh osmo-hlr - -enable_werror="" -if [ "x$IU" = "x--enable-iu" ]; then - osmo-build-dep.sh libosmo-sccp - osmo-build-dep.sh libasn1c - #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh - osmo-build-dep.sh osmo-iuh -else - enable_werror="--enable-werror" -fi - # Additional configure options and depends CONFIG="" if [ "$WITH_MANUALS" = "1" ]; then @@ -57,18 +41,18 @@ echo echo echo -echo " =============================== osmo-sgsn ===============================" +echo " =============================== osmo-gbproxy ===============================" echo set -x cd "$base" autoreconf --install --force -./configure --enable-sanitize $enable_werror $IU --enable-external-tests $CONFIG +./configure --enable-sanitize --enable-werror --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="$enable_werror $IU --enable-external-tests $CONFIG" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-werror --enable-external-tests $CONFIG" \ $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie82fc7a5a1166507460cf96ddbdf8ca77430ea64 Gerrit-Change-Number: 22589 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:45:04 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 10:45:04 +0000 Subject: Change in osmo-gbproxy[master]: Update README to cover osmo-gbproxy and not osmo-sgsn In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 ) Change subject: Update README to cover osmo-gbproxy and not osmo-sgsn ...................................................................... Update README to cover osmo-gbproxy and not osmo-sgsn While we're at it, also convert it to markdown. Related: OS#4992 Change-Id: Ic7e86dfed985f98ae87af9adcde6f776c5a15044 --- D README A README.md M contrib/osmo-gbproxy.spec.in M debian/copyright 4 files changed, 30 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README b/README deleted file mode 100644 index a14ba38..0000000 --- a/README +++ /dev/null @@ -1,17 +0,0 @@ -About OsmoSGSN -============== - -OsmoSGSN originated from the OpenBSC project, as a separate program within -openbsc.git. In 2017, OpenBSC was split in separate repositories, and hence -OsmoSGSN was given its own separate git repository. - -OsmoSGSN exposes -- GSUP towards OsmoHLR (or a MAP proxy); -- GTP towards a GGSN (e.g. OsmoGGSN); -- Gb towards a BSS (e.g. OsmoPCU); -- IuPS towards an RNC or HNB-GW (e.g. OsmoHNBGW) for 3G data; -- The Osmocom typical telnet VTY and CTRL interfaces. - -Find OsmoSGSN issue tracker and wiki online at -https://osmocom.org/projects/osmosgsn -https://osmocom.org/projects/osmosgsn/wiki diff --git a/README.md b/README.md new file mode 100644 index 0000000..3468736 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +About osmo-gbproxy +================== + +osmo-gbproxy is a proxy for the Gb interface within the 3GPP GERAN (GPRS/EDGE RAN) +architecture. It is part of the [Osmocom](https://osmocom.org/) Open Source +Mobile Communications projects. + +It allows you to aggregate many Gb links/connections into one. It also +has the ability to convert between different Gb interface protocol +stacking, such as from Gb-over-FrameRelay to Gb-over-IP. + +Until 2021 it used to be part of the osmo-sgsn git repository, and before that +(until 2017) part of openbsc.git + +Homepage and Issue Tracker +-------------------------- + +Find the issue tracker and wiki online at + and +, respectively. + +Documentation +------------- + +You can find the user manual at + +and the VTY reference manual at +. diff --git a/contrib/osmo-gbproxy.spec.in b/contrib/osmo-gbproxy.spec.in index 4bb071c..9392147 100644 --- a/contrib/osmo-gbproxy.spec.in +++ b/contrib/osmo-gbproxy.spec.in @@ -68,7 +68,7 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %files -%doc AUTHORS README +%doc AUTHORS README.md %dir %{_docdir}/%{name}/examples %dir %{_docdir}/%{name}/examples/osmo-sgsn %{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy.cfg diff --git a/debian/copyright b/debian/copyright index 4f4fdfb..66e36b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ .mailmap AUTHORS Makefile.am - README + README.md README.vty-tests configure.ac contrib/Makefile.am -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7e86dfed985f98ae87af9adcde6f776c5a15044 Gerrit-Change-Number: 22581 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Assignee: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:46:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:46:08 +0000 Subject: Change in osmo-bsc[master]: lchan assignment when RTP is set up: don't break on Mode Modify In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22510 ) Change subject: lchan assignment when RTP is set up: don't break on Mode Modify ...................................................................... Patch Set 1: Code-Review+1 as I already mentioned, I agree with Harald here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I06d3f35fcc71d77e1f30c2b15ab221ef7d5f7f27 Gerrit-Change-Number: 22510 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:46:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:48:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:48:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr/HLR_Tests.default: increase the VTY prompt timeout In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22549 ) Change subject: hlr/HLR_Tests.default: increase the VTY prompt timeout ...................................................................... Patch Set 1: Code-Review+1 Those big timings you mention also surprise me, specially if we are not talking about huge sqlite database. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22549 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: I5835d5f8fa8915182623b59b23b5a23816950e4f Gerrit-Change-Number: 22549 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:48:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:56:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:56:30 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI3 via PCUIF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI3 via PCUIF ...................................................................... Patch Set 1: (4 comments) Letting fixeria also comment on this. Are we changing the format of the old existing message here? If not then there's no need to increase the proto version imho. https://gerrit.osmocom.org/c/osmo-bts/+/22541/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/22541/1//COMMIT_MSG at 7 PS1, Line 7: pcu_sock: send SI1, SI3 and SI3 via PCUIF SI13, not SI3 twice https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/pcu_sock.c at 752 PS1, Line 752: int rc = This indentation looks rather weird, better inline int rc = pcu-tx_data_ind(..., and split its params into several lines. https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/rsl.c at 397 PS1, Line 397: if (SYSINFO_TYPE_13 == osmo_si) switch (osmo_si) And this should in any case be part of the "else if" structure above). https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/rsl.c at 417 PS1, Line 417: if (SYSINFO_TYPE_13 == osmo_si) switch (osmo_si) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:56:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 10:57:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 10:57:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 ) Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 10:57:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:03:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:03:59 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 6: (3 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/gprs_bssgp_rim.c File src/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/gprs_bssgp_rim.c at 69 PS6, Line 69: app_cont->si[app_cont->num_si] = bts->si1 + 2; Add comment explaining what's this +2 about. https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/gprs_bssgp_rim.c at 266 PS6, Line 266: format_response_pdu(&resp_pdu, pdu, bts); You are passing here the "dst BTS" and you are then using then using it to gather the information to fill the response message. However, you should probably instead be looking up the BTS based on CGI-PS from "reprt_cell" from NACC application in higher layers. I agree though that in general both addresses should be the same, but I would then at least add some sanity check making sure both addresses match. https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/pcu_l1_if.cpp at 300 PS6, Line 300: if (len == 1) { switch (len) on all the possibilities in this function. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 11:03:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:05:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:05:49 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): test encoding of more than 250 septets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22542 ) Change subject: gsm_7bit_encode_n(): test encoding of more than 250 septets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I723300578d5ab0c7b94cf49c14d962b2dbf47740 Gerrit-Change-Number: 22542 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 11:05:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:05:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:05:55 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): test encoding of more than 250 septets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22542 ) Change subject: gsm_7bit_encode_n(): test encoding of more than 250 septets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I723300578d5ab0c7b94cf49c14d962b2dbf47740 Gerrit-Change-Number: 22542 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 11:05:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:07:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:07:33 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): use regular malloc() instead of calloc() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22543 ) Change subject: gsm_7bit_encode_n(): use regular malloc() instead of calloc() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22543/1/src/gsm/gsm_utils.c File src/gsm/gsm_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/22543/1/src/gsm/gsm_utils.c at 332 PS1, Line 332: uint8_t *data = malloc(septet_len + 1); What about allocating in the stack instead, since you are always freeing the data and only using it inside the function. https://man7.org/linux/man-pages/man3/alloca.3.html -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6956cbd83b2999dbcf8e2d210134b0a166c33efb Gerrit-Change-Number: 22543 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 11:07:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:21:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:21:03 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Update configs to support NACC tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22515 ) Change subject: ttcn3-pcu: Update configs to support NACC tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If027812940579a7f344a36543e85518cc096905b Gerrit-Change-Number: 22515 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 11:21:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:21:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:21:06 +0000 Subject: Change in docker-playground[master]: ttcn3-pcu: Update configs to support NACC tests In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22515 ) Change subject: ttcn3-pcu: Update configs to support NACC tests ...................................................................... ttcn3-pcu: Update configs to support NACC tests Change-Id: If027812940579a7f344a36543e85518cc096905b --- M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/osmo-pcu.cfg 3 files changed, 5 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 89ed220..43e9d88 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -14,6 +14,7 @@ [MODULE_PARAMETERS] PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts" PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10" +PCU_Tests.mp_ctrl_neigh_ip := "172.18.13.10"; SGSN_Components.mp_nsconfig := { nsei := 1234, handle_sns := false, diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index d85b405..c2ef0d5 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -33,6 +33,9 @@ sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg + + # neighbor resolution only available in osmo-pcu > 0.8.0 + sed "/neighbor resolution/d" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg fi echo Starting container with PCU diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg index 733cebe..3d60d93 100644 --- a/ttcn3-pcu-test/osmo-pcu.cfg +++ b/ttcn3-pcu-test/osmo-pcu.cfg @@ -32,6 +32,7 @@ alpha 0 gamma 0 pcu-socket /data/unix/pcu_bts + neighbor resolution 172.18.13.10 gsmtap-category dl-unknown gsmtap-category dl-dummy gsmtap-category dl-ctrl -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If027812940579a7f344a36543e85518cc096905b Gerrit-Change-Number: 22515 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:26:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:26:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_twice_nocache In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22497 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_twice_nocache ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22497 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: I64369eb02fa611f9249696ffe249b0d6d917fa70 Gerrit-Change-Number: 22497 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 11:26:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:41:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 11:41:25 +0000 Subject: Change in osmo-gbproxy[master]: contrib/osmo-gbproxy.spec.in: fix config paths References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 ) Change subject: contrib/osmo-gbproxy.spec.in: fix config paths ...................................................................... contrib/osmo-gbproxy.spec.in: fix config paths Make the spec file build (verified with own OBS namespace). Related: OS#4992 Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 --- M contrib/osmo-gbproxy.spec.in 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/90/22590/1 diff --git a/contrib/osmo-gbproxy.spec.in b/contrib/osmo-gbproxy.spec.in index 9392147..f7e7377 100644 --- a/contrib/osmo-gbproxy.spec.in +++ b/contrib/osmo-gbproxy.spec.in @@ -1,7 +1,8 @@ # -# spec file for package osmo-sgsn +# spec file for package osmo-gbproxy # # Copyright (c) 2017, Martin Hauke +# Copyright (c) 2021, sysmocom - s.f.m.c. GmbH # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -70,10 +71,10 @@ %files %doc AUTHORS README.md %dir %{_docdir}/%{name}/examples -%dir %{_docdir}/%{name}/examples/osmo-sgsn -%{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy.cfg -%{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy-legacy.cfg -%{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy-pool.cfg +%dir %{_docdir}/%{name}/examples/osmo-gbproxy +%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy.cfg +%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg +%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg %{_bindir}/osmo-gbproxy %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-gbproxy.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 Gerrit-Change-Number: 22590 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 11:46:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 11:46:37 +0000 Subject: Change in osmo-gbproxy[master]: contrib/osmo-gbproxy.spec.in: fix config paths In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 ) Change subject: contrib/osmo-gbproxy.spec.in: fix config paths ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 Gerrit-Change-Number: 22590 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 11:46:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 12:07:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 12:07:32 +0000 Subject: Change in osmo-pcu[master]: Update TS 04.60 references to new TS 44.060 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22592 ) Change subject: Update TS 04.60 references to new TS 44.060 ...................................................................... Update TS 04.60 references to new TS 44.060 Change-Id: Ib7c3a74b502b2251da2f7b9d6d711f3e32133bc3 --- M src/encoding.cpp M src/rlc.h 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/22592/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index ce38950..a5e7f8a 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -850,7 +850,7 @@ // RECEIVE_BLOCK_BITMAP for (int i = 0; i < 64; i++) { - /* Set bit at the appropriate position (see 3GPP TS 04.60 9.1.8.1) */ + /* Set bit at the appropriate position (see 3GPP TS 44.060 9.1.8.1) */ if (show_rbb[i] == 'R') rbb_byte |= 1<< (7-(i%8)); @@ -877,7 +877,7 @@ bitvec_write_field(dest, &wp, window->ssn(), 7); // STARTING_SEQUENCE_NUMBER for (int i = 0; i < 64; i++) { - /* Set bit at the appropriate position (see 3GPP TS 04.60 9.1.8.1) */ + /* Set bit at the appropriate position (see 3GPP TS 44.060 9.1.8.1) */ bool is_ack = (rbb[i] == 'R'); bitvec_write_field(dest, &wp, is_ack, 1); } @@ -1053,7 +1053,7 @@ bow ? ", BOW" : "", eow ? ", EOW" : ""); for (i = urbb_len; i > 0; i--) { - /* Set bit at the appropriate position (see 3GPP TS 04.60 12.3.1) */ + /* Set bit at the appropriate position (see 3GPP TS 44.060 12.3.1) */ bool is_ack = window->m_v_n.is_received(esn_crbb + i); bitvec_write_field(dest, &wp, is_ack, 1); } diff --git a/src/rlc.h b/src/rlc.h index 187a70e..bcc738c 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -376,7 +376,7 @@ }; extern "C" { -/* TS 04.60 10.2.2 */ +/* TS 44.060 10.2.2 */ #if OSMO_IS_LITTLE_ENDIAN struct rlc_ul_header { uint8_t r:1, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib7c3a74b502b2251da2f7b9d6d711f3e32133bc3 Gerrit-Change-Number: 22592 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 12:11:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 12:11:03 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Remove superfluous CFLAGS and LDADD In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22517 ) Change subject: gbproxy: Remove superfluous CFLAGS and LDADD ...................................................................... Abandoned These were removed in the '=== Split osmo-gbproxy from osmo-sgsn ===' commit in osmo-gbproxy.git. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I832e1b28793d1fd36966fade2525169946bfb513 Gerrit-Change-Number: 22517 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 12:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 12:13:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on c... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22437 ) Change subject: pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on correct port ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22437 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: I0457302fef24a362f0720247ea653b06af9e1c87 Gerrit-Change-Number: 22437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 12:13:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 12:28:59 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 12:28:59 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 to look at the new patch set (#2). Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... pcu_sock: send SI1, SI3 and SI13 via PCUIF The new version (0x0b, 11) of the PCUIF extends the SAPI 4 that is used to transfer SI13 only, so that it can transfer SI1 and SI3 as well. The system information SI1, SI3 and SI13 is needed by the NACC RIM application which runs inside osmo-pcu. Depends: osmo-pcu I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Related: SYS#5103 --- M include/osmo-bts/pcu_if.h M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c M src/common/rsl.c 4 files changed, 71 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22541/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:02:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 13:02:34 +0000 Subject: Change in osmo-pcu[master]: Drop comment about an already implemented TODO References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22593 ) Change subject: Drop comment about an already implemented TODO ...................................................................... Drop comment about an already implemented TODO The comment target is already implemented just above it. Change-Id: I05534bbbad24ad8ba602244b834cdbadcabcc7ec --- M src/gprs_rlcmac_sched.cpp 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/22593/1 diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 58ed1ac..a8f65de 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -205,7 +205,6 @@ else if (tbf == tbfs->nacc) { msg = ms_nacc_create_rlcmac_msg(tbf->ms(), tbf); } - /* else: if tbf/ms is pending to send tx_neigbhourData or tx_CellchangeContinue, send it */ if (!msg) { tbf = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05534bbbad24ad8ba602244b834cdbadcabcc7ec Gerrit-Change-Number: 22593 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:22:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 13:22:21 +0000 Subject: Change in docker-playground[master]: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22594 ) Change subject: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency ...................................................................... osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency Since Id35f40d05f3e081f32fddbf1fa34cb338db452ca, osmo-pcu also depends on libosmoctrl. Debian based images work just fine, because they depend on libosmocore-dev, while for CentOS we need to specify all sub-libraries explicitly. Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 --- M osmo-pcu-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/22594/1 diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index 6a0a55d..0d07522 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -39,6 +39,7 @@ "pkgconfig(libosmogb)" \ "pkgconfig(libosmogsm)" \ "pkgconfig(libosmovty)" \ + "pkgconfig(libosmoctrl)" \ ;; \ esac -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 Gerrit-Change-Number: 22594 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:29:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 13:29:41 +0000 Subject: Change in osmo-pcu[master]: Move src/tbf.txt to doc/ References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22595 ) Change subject: Move src/tbf.txt to doc/ ...................................................................... Move src/tbf.txt to doc/ At least there it will pass less unnoticed, I just discovered this file by chance. Change-Id: I65a443ae498ae4c5e837e5a069fd87863f259152 --- R doc/tbf.txt 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/22595/1 diff --git a/src/tbf.txt b/doc/tbf.txt similarity index 100% rename from src/tbf.txt rename to doc/tbf.txt -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I65a443ae498ae4c5e837e5a069fd87863f259152 Gerrit-Change-Number: 22595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:31:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 13:31:11 +0000 Subject: Change in docker-playground[master]: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22594 ) Change subject: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 Gerrit-Change-Number: 22594 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 13:31:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:41:36 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 13:41:36 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 01 Feb 2021 13:41:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:42:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 13:42:52 +0000 Subject: Change in docker-playground[master]: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22594 ) Change subject: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 Gerrit-Change-Number: 22594 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 13:42:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:43:04 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 13:43:04 +0000 Subject: Change in docker-playground[master]: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22594 ) Change subject: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 Gerrit-Change-Number: 22594 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 13:43:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:43:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 13:43:07 +0000 Subject: Change in docker-playground[master]: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22594 ) Change subject: osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency ...................................................................... osmo-pcu-master/Dockerfile: add missing libosmoctrl dependency Since Id35f40d05f3e081f32fddbf1fa34cb338db452ca, osmo-pcu also depends on libosmoctrl. Debian based images work just fine, because they depend on libosmocore-dev, while for CentOS we need to specify all sub-libraries explicitly. Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 --- M osmo-pcu-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified osmith: Looks good to me, approved diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index 6a0a55d..0d07522 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -39,6 +39,7 @@ "pkgconfig(libosmogb)" \ "pkgconfig(libosmogsm)" \ "pkgconfig(libosmovty)" \ + "pkgconfig(libosmoctrl)" \ ;; \ esac -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6cccb77432b2b8fcb9f90c5205f7f1fb9dc41910 Gerrit-Change-Number: 22594 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 13:45:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 13:45:27 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: regen: put args in own lines References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/22596 ) Change subject: gen_makefile.py: regen: put args in own lines ...................................................................... gen_makefile.py: regen: put args in own lines Make it easier to adjust opts before running 'make regen'. Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e --- M gen_makefile.py 1 file changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/96/22596/1 diff --git a/gen_makefile.py b/gen_makefile.py index f76ebb0..ad42978 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -276,22 +276,29 @@ # regenerate this Makefile, in case the deps or opts changed .PHONY: regen regen: - {script} {projects_and_deps} {configure_opts} -m {make_dir} -o {makefile} -s {src_dir} -b {build_dir} -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check} + {script} \ + {projects_and_deps} \ + {configure_opts} \ + -m {make_dir} \ + -o {makefile} \ + -s {src_dir} \ + -b {build_dir} \ + -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check} '''.format( script=os.path.relpath(sys.argv[0], make_dir), projects_and_deps=os.path.relpath(args.projects_and_deps_file, make_dir), - configure_opts=' '.join([os.path.relpath(f, make_dir) for f in configure_opts_files]), + configure_opts=' \\\n\t\t'.join([os.path.relpath(f, make_dir) for f in configure_opts_files]), make_dir='.', makefile=args.output, src_dir=os.path.relpath(args.src_dir, make_dir), build_dir=os.path.relpath(build_dir, make_dir), url=args.url, - push_url=(" -p '%s'"%args.push_url) if args.push_url else '', - sudo_make_install=' -I' if args.sudo_make_install else '', - no_ldconfig=' -L' if args.no_ldconfig else '', - ldconfig_without_sudo=' --ldconfig-without-sudo' if args.ldconfig_without_sudo else '', - make_check='' if args.make_check else " --no-make-check", + push_url=(" \\\n\t\t-p '%s'"%args.push_url) if args.push_url else '', + sudo_make_install=' \\\n\t\t-I' if args.sudo_make_install else '', + no_ldconfig=' \\\n\t\t-L' if args.no_ldconfig else '', + ldconfig_without_sudo=' \\\n\t\t--ldconfig-without-sudo' if args.ldconfig_without_sudo else '', + make_check='' if args.make_check else " \\\n\t\t--no-make-check", )) # convenience target: clone all repositories first -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/22596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e Gerrit-Change-Number: 22596 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:14:29 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 1 Feb 2021 14:14:29 +0000 Subject: Change in osmo-gsm-tester[master]: enb: add abstract method stop() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 to look at the new patch set (#4). Change subject: enb: add abstract method stop() ...................................................................... enb: add abstract method stop() implement as noop for Amarisoft eNB, srsENB will send q+Enter to stdin, which is implemented in class srslte_common() Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 4 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/54/22054/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181 Gerrit-Change-Number: 22054 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:14:30 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 1 Feb 2021 14:14:30 +0000 Subject: Change in osmo-gsm-tester[master]: srsepc.conf.tmpl: double value of T3413 (paging timer) References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22597 ) Change subject: srsepc.conf.tmpl: double value of T3413 (paging timer) ...................................................................... srsepc.conf.tmpl: double value of T3413 (paging timer) we've already incrased the t3413 value in 9c7fd618d226dc532b9408c329cfc2380de4850a but realized it may still be too low in some cases. we set it to 12s now. Change-Id: I9c3c59c0ff8f539a44b420f8ba31eea016c211ce --- M src/osmo_gsm_tester/templates/srsepc.conf.tmpl M sysmocom/suites/4g/rrc_idle_mt_ping.py 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/22597/1 diff --git a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl index 62f9977..d6ecaec 100644 --- a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl @@ -31,7 +31,7 @@ dns_addr = 8.8.8.8 encryption_algo = EEA0 integrity_algo = EIA1 -paging_timer = 6 +paging_timer = 12 ##################################################################### # HSS configuration diff --git a/sysmocom/suites/4g/rrc_idle_mt_ping.py b/sysmocom/suites/4g/rrc_idle_mt_ping.py index bdebb26..3360dba 100755 --- a/sysmocom/suites/4g/rrc_idle_mt_ping.py +++ b/sysmocom/suites/4g/rrc_idle_mt_ping.py @@ -26,8 +26,8 @@ # Wait a bit sleep(5) -# Generate MT traffic, send single ping -proc = epc.prepare_process('ping', ('ping', '-c', '1', ue.get_assigned_addr())) +# Generate MT traffic, send single ping (10s timeout) +proc = epc.prepare_process('ping', ('ping', '-w', '10', '-c', '1', ue.get_assigned_addr())) proc.launch_sync() output = proc.get_stdout() -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9c3c59c0ff8f539a44b420f8ba31eea016c211ce Gerrit-Change-Number: 22597 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:14:31 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 1 Feb 2021 14:14:31 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22598 ) Change subject: srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ ...................................................................... srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ we've detected a possible race condition during the Msg3 transmission that caused the thread that sets the Msg3 grant to be delayed. The PHY worker that executed TTI+2 finished by that time already and didn't even see the pending UL grant. This is issue is more likely to happen on loaded system, for example when running parallel ZMQ jobs. We therefore decided to reduce the number of parallel PHY workers to 2 so the issue is circumvented. Change-Id: Ibdb42a1705d87b6d343201458c8fe397398802bc --- M src/osmo_gsm_tester/templates/srsue.conf.tmpl 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/98/22598/1 diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index a50f91e..0939823 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -336,7 +336,9 @@ #snr_ema_coeff = 0.1 #snr_estim_alg = refs #pdsch_max_its = 8 # These are half iterations -#nof_phy_threads = 3 +% if ue.rf_dev_type == 'zmq': +nof_phy_threads = 2 +% endif #equalizer_mode = mmse #sfo_ema = 0.1 #sfo_correct_period = 10 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibdb42a1705d87b6d343201458c8fe397398802bc Gerrit-Change-Number: 22598 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:14:31 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 1 Feb 2021 14:14:31 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME ...................................................................... amarisoft_mme: use/expose count paramter from MS config for MME the UEs count param, if specified, is mapped into the config values of the EPC so it can be used for template rendering. Since we only have one count parameter, its added to the first subscriber. 1 is the default value and its used when no count param is specified. this allows to run the Amarisoft UE simulator with the Amarisoft EPC without having to create subscriber entries for each simulated UE. Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f --- M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/99/22599/1 diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py index 1291891..87015d3 100644 --- a/src/osmo_gsm_tester/obj/epc_amarisoft.py +++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py @@ -150,6 +150,10 @@ config.overlay(values, dict(epc=dict(log_filename=logfile, ifup_filename=ifupfile))) + # Retrieve and overlay UE count parameter to first subscriber + sub_count = self.testenv.suite().config().get('modem', None) + sub_count = sub_count['count'] if sub_count is not None and 'count' in sub_count else 1 + self.subscriber_list[0]['count'] = sub_count config.overlay(values, dict(epc=dict(hss=dict(subscribers=self.subscriber_list)))) self.dbg('SRSEPC CONFIG:\n' + pprint.pformat(values)) diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index 3c83bed..b2df9ca 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -161,6 +161,7 @@ with test SIM cards). They are distinguished with their IMEI. default = false. */ multi_sim: false, + count: ${sub.count}, }, %endfor /* Add new entries for each IMSI/K */ -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:14:31 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 1 Feb 2021 14:14:31 +0000 Subject: Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs ...................................................................... srslte_common: add helper method to only get stdout KPIs similar to the helper that only returns KPIs derived from log files, this returns the ones from stdout Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 --- M src/osmo_gsm_tester/obj/srslte_common.py 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/00/22600/1 diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py index 21001b7..080e6df 100644 --- a/src/osmo_gsm_tester/obj/srslte_common.py +++ b/src/osmo_gsm_tester/obj/srslte_common.py @@ -47,6 +47,22 @@ self.extract_kpis() return self.kpis + def get_stdout_kpis(self): + ''' Return KPIs extracted from stdout only ''' + if self.kpis is None: + self.extract_kpis() + + # Use stdout KPIs if they exist for this node + if "stdout_" + self.name() in self.kpis: + stdout_kpi = self.kpis["stdout_" + self.name()] + else: + stdout_kpi = {} + + # Make sure we have the ue_added counter in the dict + if 'ue_added' not in stdout_kpi: + stdout_kpi['total_errors'] = 0 + return stdout_kpi + def get_log_kpis(self): ''' Return KPIs extracted from log ''' if self.kpis is None: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:14:32 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 1 Feb 2021 14:14:32 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class References: Message-ID: srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... enb,epc: implement stdout/log KPI getter in eNB/EPC base class add implementation of get_stdout_kpi/get_log_kpi to base class of EPC/eNB. The base implementation return empty KPIs by default. The methods can be overwritten if more advanced KPI analysis is available. But the base implementation makes sure testcases don't fail if this isn't the case. Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/epc.py 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/01/22601/1 diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index a5bca24..43182d5 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -355,5 +355,18 @@ @abstractmethod def get_counter(self, counter_name): raise log.Error('get_counter() not implemented!') + + # Helper methods for testcases to retrieve eNB KPIs, can be overwritten by specific classes + def get_stdout_kpis(self): + # No KPI on stdout by default + return {} + + def get_log_kpis(self): + # Make sure we have the errors and warnings counter in the dict + return {'total_errors': 0, 'total_warnings': 0} + + def get_num_phy_errors(self, kpi): + # Assume zero PHY errors + return 0 # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/obj/epc.py b/src/osmo_gsm_tester/obj/epc.py index 6f056fc..fb32b9e 100644 --- a/src/osmo_gsm_tester/obj/epc.py +++ b/src/osmo_gsm_tester/obj/epc.py @@ -116,4 +116,11 @@ def run_node(self): return self._run_node + def get_stdout_kpis(self): + return {} + + def get_log_kpis(self): + # Make sure we have the errors and warnings counter in the dict + return {'total_errors': 0, 'total_warnings': 0} + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:26:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:26:35 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 2: the git commit log mesage should at least mention the name / URL of the new repository, even if it's obvious to you and me where it might be. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 14:26:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:13 +0000 Subject: Change in osmo-pcu[master]: Move src/tbf.txt to doc/ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22595 ) Change subject: Move src/tbf.txt to doc/ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I65a443ae498ae4c5e837e5a069fd87863f259152 Gerrit-Change-Number: 22595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 14:27:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:26 +0000 Subject: Change in osmo-pcu[master]: Update TS 04.60 references to new TS 44.060 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22592 ) Change subject: Update TS 04.60 references to new TS 44.060 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib7c3a74b502b2251da2f7b9d6d711f3e32133bc3 Gerrit-Change-Number: 22592 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 14:27:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:33 +0000 Subject: Change in osmo-pcu[master]: Drop comment about an already implemented TODO In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22593 ) Change subject: Drop comment about an already implemented TODO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05534bbbad24ad8ba602244b834cdbadcabcc7ec Gerrit-Change-Number: 22593 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 14:27:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:35 +0000 Subject: Change in osmo-pcu[master]: Move src/tbf.txt to doc/ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22595 ) Change subject: Move src/tbf.txt to doc/ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I65a443ae498ae4c5e837e5a069fd87863f259152 Gerrit-Change-Number: 22595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 14:27:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:37 +0000 Subject: Change in osmo-pcu[master]: Update TS 04.60 references to new TS 44.060 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22592 ) Change subject: Update TS 04.60 references to new TS 44.060 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib7c3a74b502b2251da2f7b9d6d711f3e32133bc3 Gerrit-Change-Number: 22592 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 14:27:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:40 +0000 Subject: Change in osmo-pcu[master]: Update TS 04.60 references to new TS 44.060 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22592 ) Change subject: Update TS 04.60 references to new TS 44.060 ...................................................................... Update TS 04.60 references to new TS 44.060 Change-Id: Ib7c3a74b502b2251da2f7b9d6d711f3e32133bc3 --- M src/encoding.cpp M src/rlc.h 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index ce38950..a5e7f8a 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -850,7 +850,7 @@ // RECEIVE_BLOCK_BITMAP for (int i = 0; i < 64; i++) { - /* Set bit at the appropriate position (see 3GPP TS 04.60 9.1.8.1) */ + /* Set bit at the appropriate position (see 3GPP TS 44.060 9.1.8.1) */ if (show_rbb[i] == 'R') rbb_byte |= 1<< (7-(i%8)); @@ -877,7 +877,7 @@ bitvec_write_field(dest, &wp, window->ssn(), 7); // STARTING_SEQUENCE_NUMBER for (int i = 0; i < 64; i++) { - /* Set bit at the appropriate position (see 3GPP TS 04.60 9.1.8.1) */ + /* Set bit at the appropriate position (see 3GPP TS 44.060 9.1.8.1) */ bool is_ack = (rbb[i] == 'R'); bitvec_write_field(dest, &wp, is_ack, 1); } @@ -1053,7 +1053,7 @@ bow ? ", BOW" : "", eow ? ", EOW" : ""); for (i = urbb_len; i > 0; i--) { - /* Set bit at the appropriate position (see 3GPP TS 04.60 12.3.1) */ + /* Set bit at the appropriate position (see 3GPP TS 44.060 12.3.1) */ bool is_ack = window->m_v_n.is_received(esn_crbb + i); bitvec_write_field(dest, &wp, is_ack, 1); } diff --git a/src/rlc.h b/src/rlc.h index 187a70e..bcc738c 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -376,7 +376,7 @@ }; extern "C" { -/* TS 04.60 10.2.2 */ +/* TS 44.060 10.2.2 */ #if OSMO_IS_LITTLE_ENDIAN struct rlc_ul_header { uint8_t r:1, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib7c3a74b502b2251da2f7b9d6d711f3e32133bc3 Gerrit-Change-Number: 22592 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:40 +0000 Subject: Change in osmo-pcu[master]: Drop comment about an already implemented TODO In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22593 ) Change subject: Drop comment about an already implemented TODO ...................................................................... Drop comment about an already implemented TODO The comment target is already implemented just above it. Change-Id: I05534bbbad24ad8ba602244b834cdbadcabcc7ec --- M src/gprs_rlcmac_sched.cpp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 58ed1ac..a8f65de 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -205,7 +205,6 @@ else if (tbf == tbfs->nacc) { msg = ms_nacc_create_rlcmac_msg(tbf->ms(), tbf); } - /* else: if tbf/ms is pending to send tx_neigbhourData or tx_CellchangeContinue, send it */ if (!msg) { tbf = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05534bbbad24ad8ba602244b834cdbadcabcc7ec Gerrit-Change-Number: 22593 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:27:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:27:41 +0000 Subject: Change in osmo-pcu[master]: Move src/tbf.txt to doc/ In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22595 ) Change subject: Move src/tbf.txt to doc/ ...................................................................... Move src/tbf.txt to doc/ At least there it will pass less unnoticed, I just discovered this file by chance. Change-Id: I65a443ae498ae4c5e837e5a069fd87863f259152 --- R doc/tbf.txt 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/tbf.txt b/doc/tbf.txt similarity index 100% rename from src/tbf.txt rename to doc/tbf.txt -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I65a443ae498ae4c5e837e5a069fd87863f259152 Gerrit-Change-Number: 22595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:28:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:28:43 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:28:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:30:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:30:45 +0000 Subject: Change in libosmocore[master]: frame_relay: Send "Fuil Status" ENQUIRY after link recovers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22573 ) Change subject: frame_relay: Send "Fuil Status" ENQUIRY after link recovers ...................................................................... Patch Set 2: > In theory it should be also appended to link integrity verification. not sure what you're referring to? Including the DLC status in the STATUS (type: link integrity)? I thought it's not permitted, but after reading Q.933 again, indeed, it would be permitted. I can look at a follow-up patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f905a18a7d130a3c02b4a3e7a2a2dc24afc0ea1 Gerrit-Change-Number: 22573 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 14:30:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:30:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:30:47 +0000 Subject: Change in libosmocore[master]: frame_relay: Send "Fuil Status" ENQUIRY after link recovers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22573 ) Change subject: frame_relay: Send "Fuil Status" ENQUIRY after link recovers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f905a18a7d130a3c02b4a3e7a2a2dc24afc0ea1 Gerrit-Change-Number: 22573 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 14:30:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:30:53 +0000 Subject: Change in libosmocore[master]: frame_relay: Send "Fuil Status" ENQUIRY after link recovers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22573 ) Change subject: frame_relay: Send "Fuil Status" ENQUIRY after link recovers ...................................................................... frame_relay: Send "Fuil Status" ENQUIRY after link recovers If we are the 'user' side of FR and a link has just recovered, we should ensure the next STATUS is for "full status". This way we learn about the present DLCs as quickly as possible, saving up to 10 seconds of further delay in link recovery. Related: OS#4999 Change-Id: I6f905a18a7d130a3c02b4a3e7a2a2dc24afc0ea1 --- M src/gb/frame_relay.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 3a51700..03b847a 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -430,8 +430,12 @@ LOGPFRL(link, LOGL_NOTICE, "Link recovered\n"); link->state = true; - if (link->role == FR_ROLE_USER_EQUIPMENT) + if (link->role == FR_ROLE_USER_EQUIPMENT) { + /* make sure the next STATUS ENQUIRY is for a full + * status report to get the configred DLCs ASAP */ + link->polling_count = 0; return; + } llist_for_each_entry(dlc, &link->dlc_list, list) { if (!dlc->add && !dlc->del) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f905a18a7d130a3c02b4a3e7a2a2dc24afc0ea1 Gerrit-Change-Number: 22573 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:30:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 14:30:56 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 to look at the new patch set (#3). Change subject: gbproxy: remove (moved to own repository) ...................................................................... gbproxy: remove (moved to own repository) New repository: https://git.osmocom.org/osmo-gbproxy/ Related: OS#4992 Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a --- M .gitignore M configure.ac D contrib/gprs/gb-proxy-unblock-bug.py M contrib/osmo-sgsn.spec.in M contrib/systemd/Makefile.am D contrib/systemd/osmo-gbproxy.service M debian/control M debian/copyright D debian/osmo-gbproxy.init D debian/osmo-gbproxy.install M debian/rules M doc/examples/Makefile.am D doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg D doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg D doc/examples/osmo-gbproxy/osmo-gbproxy.cfg M doc/manuals/Makefile.am D doc/manuals/chapters/gbproxy-configuration.adoc D doc/manuals/chapters/gbproxy-control.adoc D doc/manuals/chapters/gbproxy-details.adoc D doc/manuals/chapters/gbproxy-overview.adoc D doc/manuals/chapters/gbproxy-running.adoc D doc/manuals/chapters/gbproxy-sgsnpool.adoc D doc/manuals/osmogbproxy-usermanual-docinfo.xml D doc/manuals/osmogbproxy-usermanual.adoc D doc/manuals/osmogbproxy-vty-reference.xml M doc/manuals/regen_doc.sh D doc/manuals/vty-osmogbproxy/gbproxy_vty_additions.xml D doc/manuals/vty-osmogbproxy/gbproxy_vty_reference.xml M include/osmocom/sgsn/Makefile.am D include/osmocom/sgsn/gb_proxy.h M osmoappdesc.py M src/Makefile.am D src/gbproxy/Makefile.am D src/gbproxy/gb_proxy.c D src/gbproxy/gb_proxy_ctrl.c D src/gbproxy/gb_proxy_main.c D src/gbproxy/gb_proxy_peer.c D src/gbproxy/gb_proxy_vty.c M tests/Makefile.am D tests/osmo-gbproxy-pool_test-nodes.vty D tests/osmo-gbproxy_test-nodes.vty M tests/vty_test_runner.py 42 files changed, 5 insertions(+), 6,710 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/91/22591/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:31:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:31:41 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22575/3/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22575/3/src/gb/frame_relay.c at a437 PS3, Line 437: return; > You Acked lynxis issue, but still remove this line? I didn't even edit this patch yet, I just re-ordered all of them so I can get those without negative review merged. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 14:31:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:42:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:42:04 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22572 ) Change subject: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22572/1/utils/osmo-ns-dummy.c File utils/osmo-ns-dummy.c: https://gerrit.osmocom.org/c/libosmocore/+/22572/1/utils/osmo-ns-dummy.c at 291 PS1, Line 291: gprs_ns2_free(g_nsi); > wihtout g_nsi() I assume you meant this comment for nsdummy_vty_init() above? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda Gerrit-Change-Number: 22572 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 14:42:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:43:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:43:03 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22575 to look at the new patch set (#4). Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... frame_relay: Add status call-backs for link + DLC status changes Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Related: Os#4999 --- M include/osmocom/gprs/frame_relay.h M src/gb/frame_relay.c M src/gb/gprs_ns2_fr.c 3 files changed, 40 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/22575/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:43:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:43:03 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22579 to look at the new patch set (#4). Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... ns2: Stop test procedure when going into unconfigured state When we're unconfigured and not yet started, we should not transmit NS-ALIVE. Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Related: OS#4999 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/22579/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:43:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:43:03 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22572 to look at the new patch set (#3). Change subject: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets ...................................................................... osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda --- M utils/osmo-ns-dummy-vty.c M utils/osmo-ns-dummy.c 2 files changed, 44 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22572/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda Gerrit-Change-Number: 22572 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:43:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 14:43:10 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22579 ) Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22579/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22579/2/src/gb/gprs_ns2_vc_fsm.c at 636 PS2, Line 636: stop_test_procedure(priv); > ack Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 14:43:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:46:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:46:59 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: regen: put args in own lines In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/22596 ) Change subject: gen_makefile.py: regen: put args in own lines ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/22596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e Gerrit-Change-Number: 22596 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:46:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:47:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:47:41 +0000 Subject: Change in osmo-gsm-tester[master]: enb: add abstract method stop() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 ) Change subject: enb: add abstract method stop() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181 Gerrit-Change-Number: 22054 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:47:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:48:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:48:18 +0000 Subject: Change in osmo-gsm-tester[master]: srsepc.conf.tmpl: double value of T3413 (paging timer) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22597 ) Change subject: srsepc.conf.tmpl: double value of T3413 (paging timer) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9c3c59c0ff8f539a44b420f8ba31eea016c211ce Gerrit-Change-Number: 22597 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:48:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:48:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:48:36 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22598 ) Change subject: srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibdb42a1705d87b6d343201458c8fe397398802bc Gerrit-Change-Number: 22598 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:48:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:52:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:52:34 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599/1/src/osmo_gsm_tester/obj/epc_amarisoft.py File src/osmo_gsm_tester/obj/epc_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599/1/src/osmo_gsm_tester/obj/epc_amarisoft.py at 154 PS1, Line 154: sub_count = self.testenv.suite().config().get('modem', None) how do you fill this information in 'modem'? Can you show me an example? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:52:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:55:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:55:38 +0000 Subject: Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/1/src/osmo_gsm_tester/obj/srslte_common.py File src/osmo_gsm_tester/obj/srslte_common.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/1/src/osmo_gsm_tester/obj/srslte_common.py at 62 PS1, Line 62: if 'ue_added' not in stdout_kpi: Why this stuff here? What's the rationale behind this specialties here? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:55:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:57:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 14:57:15 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: WIP RIM support In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22314 ) Change subject: gbproxy: WIP RIM support ...................................................................... Abandoned osmo-gbproxy was split to its own repository. Please submit the patch against the new repo. Looks like Daniel rebased here already: https://git.osmocom.org/osmo-gbproxy/log/?h=daniel/rim -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22314 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 14:58:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 14:58:20 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... Patch Set 1: (5 comments) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 358 PS1, Line 358: Remove this whitespace https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 364 PS1, Line 364: def get_log_kpis(self): I'm not sure what's the point in splitting between log and kpi, is there some rationale behind this? https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 368 PS1, Line 368: def get_num_phy_errors(self, kpi): What about this function? looks not related to this patch? https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 370 PS1, Line 370: return 0 remove trailing whistepace https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/epc.py File src/osmo_gsm_tester/obj/epc.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/epc.py at 124 PS1, Line 124: return {'total_errors': 0, 'total_warnings': 0} remove trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 14:58:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:00:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 15:00:15 +0000 Subject: Change in osmo-gbproxy[master]: debian: fix installing pdfs for -doc package References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 ) Change subject: debian: fix installing pdfs for -doc package ...................................................................... debian: fix installing pdfs for -doc package Don't comment out the pdf glob, it works as intended when building the package on OBS. I had disabled it, because with dpkg-buildpackage, override_dh_auto_configure from debian/ruls gets ignored, leading to --enable-manuals missing in ./configure, and to the pdf file not being present. But apparently, dpkg-buildpackage just always ignores this, it's the same with other Osmocom repositories. Related: OS#4992 Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f --- M debian/osmo-gbproxy-doc.install 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/02/22602/1 diff --git a/debian/osmo-gbproxy-doc.install b/debian/osmo-gbproxy-doc.install index d934088..cb5b384 100644 --- a/debian/osmo-gbproxy-doc.install +++ b/debian/osmo-gbproxy-doc.install @@ -1,2 +1 @@ -# FIXME: debian package doesn't generate manuals yet, see OS#4992 -# usr/share/doc/osmo-gbproxy-doc/*.pdf +usr/share/doc/osmo-gbproxy-doc/*.pdf -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f Gerrit-Change-Number: 22602 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:00:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:00:59 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:00:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:01:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 15:01:15 +0000 Subject: Change in osmo-gbproxy[master]: debian: fix installing pdfs for -doc package In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 ) Change subject: debian: fix installing pdfs for -doc package ...................................................................... Patch Set 1: Works in OBS: https://build.opensuse.org/package/live_build_log/home:osmith42/osmo-gbproxy/Debian_9.0/i586 > [ 185s] dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f Gerrit-Change-Number: 22602 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 01 Feb 2021 15:01:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:01:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:01:20 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 15:01:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:02:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:02:44 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22572 ) Change subject: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda Gerrit-Change-Number: 22572 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:02:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:03:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:03:25 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22579 ) Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:03:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:04:52 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 1 Feb 2021 15:04:52 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... OBS: nightly: add osmo-gbproxy Depends: osmo-sgsn I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Related: OS#4992 Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/03/22603/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 44f4a6e..eeeecfb 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -240,6 +240,7 @@ checkout osmo-e1d checkout osmo-smlc checkout osmo-cbc + checkout osmo-gbproxy cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -283,6 +284,7 @@ build osmo-e1d build osmo-smlc build osmo-cbc + build osmo-gbproxy download_bumpversion -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:17:25 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 15:17:25 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 to look at the new patch set (#7). Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... gprs_bssgp_rim: add serving BSS NACC application Answer an incoming RAN INFORMATION REQUEST RIM PDU with RAN INFORMATION PDU that contains system information type 1, 3 and 13 Depends: osmo-bts I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Related: SYS#5103 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/gprs_bssgp_rim.c M src/pcu_l1_if.cpp 4 files changed, 127 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/22368/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:27:18 +0000 Subject: Change in osmo-pcu[master]: ms: Free tbf after scheduling Tx Pkt Cell Change Continue References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: ms: Free tbf after scheduling Tx Pkt Cell Change Continue ...................................................................... ms: Free tbf after scheduling Tx Pkt Cell Change Continue The TBF should be gone since upon reception of the message the MS continues to cell reselection on the target cell. 3GPP TS 44.060: """ When the mobile station receives the PACKET CELL CHANGE ORDER or the PACKET CELL CHANGE CONTINUE message the mobile station shall transmit a PACKET CONTROL ACKNOWLEDGMENT message in the specified uplink radio block if a valid RRBP field is received as part of the message; the mobile station may then switch to a new cell. """ Related: SYS#4909 Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f --- M src/gprs_ms.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/04/22604/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 8078b10..f85b035 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -962,6 +962,7 @@ { int rc; struct nacc_ev_create_rlcmac_msg_ctx data_ctx; + bool finish_tbf = ms->nacc->fi->state == NACC_ST_TX_CELL_CHG_CONTINUE; data_ctx.tbf = tbf; data_ctx.msg = NULL; @@ -969,5 +970,7 @@ rc = osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_CREATE_RLCMAC_MSG, &data_ctx); if (rc != 0 || !data_ctx.msg) return NULL; + if (finish_tbf) + tbf_free(tbf); return data_ctx.msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:27:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:27:19 +0000 Subject: Change in osmo-pcu[master]: encoding: Fix comment description of S/P field References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22605 ) Change subject: encoding: Fix comment description of S/P field ...................................................................... encoding: Fix comment description of S/P field Those fields were ment to be 0 (non-valid), just the comments were copied over from somewhere else, and they are misleading. Change-Id: Ic95853e115f60c65f7f11187d49d6e870d08c7bb --- M src/encoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/22605/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index a5e7f8a..38bc175 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -1739,7 +1739,7 @@ block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0; // 0: N+13 - block->SP = 0; // RRBP field is valid + block->SP = 0; // RRBP field is not valid block->USF = 0x0; // Uplink state flag block->u.Packet_Neighbour_Cell_Data.MESSAGE_TYPE = MT_PACKET_NEIGHBOUR_CELL_DATA; @@ -1764,7 +1764,7 @@ block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0; // 0: N+13 - block->SP = 0; // RRBP field is valid + block->SP = 0; // RRBP field is not valid block->USF = 0x0; // Uplink state flag block->u.Packet_Cell_Change_Continue.MESSAGE_TYPE = MT_PACKET_CELL_CHANGE_CONTINUE; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic95853e115f60c65f7f11187d49d6e870d08c7bb Gerrit-Change-Number: 22605 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:32:22 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 15:32:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 6: (1 comment) > Patch Set 6: > > (1 comment) > > > Patch Set 6: > > > > I hope I have found a better way now to transfer the sysinfo to the PCU. Actually there is a SAPI 4 in the PCUIF protocol through which we already send SI13. This can be extended to transfer SI1 and SI3 as well. > > Nice! Would be funny it we discovered this after merging your initial approach ;) If you remove the first (redundant?) octet in DATA.ind messages, there would be no need to bump PCUIF version at all. There would be still the problem that we would have to have a way to tell that the SI should be deleted. Basically I understand you suggestion as follows: - Remove osmo-si type at the beginning and use RSL IEI type. 01 06 [SI 13 octets] ==> New SI, store in struct, set si13_is_set to true 01 ==> set si13_is_set to false. Maybe also: (nothing) ==> set si13_is_set to false. Sure, we can have that, but I do not see a big advantage over the now existing approach. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369/6/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369/6/pcu/PCU_Tests.ttcn at 3589 PS6, Line 3589: '01'O > What is the purpose of this octet? I guess to indicate the type of SI? [?] I guess this is the IEI that is used on RSL level. All SI are prefixed with this pseudo header. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 15:32:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:33:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 15:33:28 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:33:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:35:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 15:35:18 +0000 Subject: Change in osmo-pcu[master]: ms: Free tbf after scheduling Tx Pkt Cell Change Continue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: ms: Free tbf after scheduling Tx Pkt Cell Change Continue ...................................................................... Patch Set 1: the way how I read the spec this means that the PCU may still need to re-transmit those downlink RLC/MAC messages containing the cell change continue, until the MS finally confirms receipt with a corresponding ack. Is this reflected in the code (I'm not very familiar with it, sorry)? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 15:35:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:35:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 1 Feb 2021 15:35:35 +0000 Subject: Change in osmo-pcu[master]: encoding: Fix comment description of S/P field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22605 ) Change subject: encoding: Fix comment description of S/P field ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic95853e115f60c65f7f11187d49d6e870d08c7bb Gerrit-Change-Number: 22605 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 01 Feb 2021 15:35:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:35:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:35:55 +0000 Subject: Change in osmo-pcu[master]: tbf: Reuse stored result in variable in check_polling() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22606 ) Change subject: tbf: Reuse stored result in variable in check_polling() ...................................................................... tbf: Reuse stored result in variable in check_polling() Change-Id: Ie6fbe3699bcb4f63f7b617243c769e60881d8aac --- M src/tbf.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/22606/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 54ae4fa..74c790c 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -558,7 +558,7 @@ LOGPTBF(this, LOGL_DEBUG, "Polling is already scheduled\n"); return -EBUSY; } - if (bts_sba(bts)->find(trx->trx_no, ts, next_fn(fn, 13))) { + if (bts_sba(bts)->find(trx->trx_no, ts, new_poll_fn)) { LOGPTBF(this, LOGL_DEBUG, "Polling is already scheduled " "for single block allocation at FN %d TS %d ...\n", new_poll_fn, ts); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie6fbe3699bcb4f63f7b617243c769e60881d8aac Gerrit-Change-Number: 22606 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:37:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:37:12 +0000 Subject: Change in osmo-pcu[master]: ms: Free tbf after scheduling Tx Pkt Cell Change Continue In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: ms: Free tbf after scheduling Tx Pkt Cell Change Continue ...................................................................... Patch Set 1: > Patch Set 1: > > the way how I read the spec this means that the PCU may still need to re-transmit those downlink RLC/MAC messages containing the cell change continue, until the MS finally confirms receipt with a corresponding ack. Is this reflected in the code (I'm not very familiar with it, sorry)? Hi, indeed, I was working on that right now, I pushed this one without noticing ;) I mark it as WIP. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 15:37:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:37:53 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 15:37:53 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22572 ) Change subject: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda Gerrit-Change-Number: 22572 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:37:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:39:30 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 15:39:30 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22579 ) Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:44:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:44:12 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22368/7/src/gprs_bssgp_rim.c File src/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/7/src/gprs_bssgp_rim.c at 271 PS7, Line 271: if (rc != 0) { I think you mixed here the log message with the answer... see when you call the pdu_err() and the pdu() functions, and how are they related to the the logging messages... Also, I'd favour moving this to a new function being called below, like I did for BSSGP_IE_RI_RIM_CONTAINER, to better split the different layers, otherwise it becomes a bit confusing. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:44:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:44:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 15:44:32 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 15:44:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 15:45:17 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 1 Feb 2021 15:45:17 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22575/3/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22575/3/src/gb/frame_relay.c at a437 PS3, Line 437: return; > I didn't even edit this patch yet, I just re-ordered all of them so I can get those without negative [?] Yeah, I realized afterwards this was the most likely explanation -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 15:45:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 16:14:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 16:14:55 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): test encoding of more than 250 septets In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22542 ) Change subject: gsm_7bit_encode_n(): test encoding of more than 250 septets ...................................................................... gsm_7bit_encode_n(): test encoding of more than 250 septets As can be seen, this unit test reveals problems with encoding of more than 250 septets using gsm_7bit_encode_n(). The problem is that some API functions use type 'uint8_t' for the length, so we basically suffer from integer overflows. Change-Id: I723300578d5ab0c7b94cf49c14d962b2dbf47740 --- M tests/sms/sms_test.c M tests/sms/sms_test.ok 2 files changed, 70 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/sms/sms_test.c b/tests/sms/sms_test.c index 0615396..c7f47e2 100644 --- a/tests/sms/sms_test.c +++ b/tests/sms/sms_test.c @@ -268,6 +268,54 @@ printf("Result: len(%d) data(%s)\n", len, osmo_hexdump(oa, len)); } +static void test_enc_large_msg(void) +{ + uint8_t enc_buf[2048 * 7 / 8]; + char large_msg[2048 + 1]; + int i, j, nsep, noct = 0; + + printf("\nRunning %s\n", __func__); + + /* Expected chunks (repeated) in the output buffer */ + const uint8_t exp_chunk[] = { 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83 }; + + /* Length variants to be tested */ + static const size_t nlen[] = { 2048, 1024, 555, 512, 260, 255, 250 }; + + memset(&large_msg[0], (int) 'A', sizeof(large_msg) - 1); + + for (i = 0; i < ARRAY_SIZE(nlen); i++) { + /* Clear the output buffer first */ + memset(&enc_buf[0], 0x00, sizeof(enc_buf)); + /* Limit length of the input string */ + large_msg[nlen[i]] = '\0'; + + /* How many octets we expect to be used? */ + int noct_exp = nlen[i] * 7 / 8; + if (nlen[i] % 8 != 0) + noct_exp++; + + /* Encode a sequence of 'A' repeated nlen[i] times */ + nsep = gsm_7bit_encode_n(&enc_buf[0], sizeof(enc_buf), large_msg, &noct); + printf("gsm_7bit_encode_n(len=%zu) processed %d septets (expected %zu): %s\n", + nlen[i], nsep, nlen[i], nsep == nlen[i] ? "OK" : "FAIL"); + printf("gsm_7bit_encode_n(len=%zu) used %d octets in the buffer (expected %d): %s\n", + nlen[i], noct, noct_exp, noct == noct_exp ? "OK" : "FAIL"); + + /* The encoding result is expected to consist of repeated chunks */ + for (j = 0; j < noct_exp; j += sizeof(exp_chunk)) { + size_t len = OSMO_MIN(noct_exp - j, sizeof(exp_chunk)); + if (nlen[i] % 8 != 0) /* skip incomplete octets */ + len--; + if (memcmp(&enc_buf[j], exp_chunk, len) != 0) { + printf("\tUnexpected chunk at enc_buf[%d:%zu]: %s\n", + j, len, osmo_hexdump(&enc_buf[j], len)); + break; /* No need to show them all */ + } + } + } +} + int main(int argc, char** argv) { printf("SMS testing\n"); @@ -396,6 +444,7 @@ test_octet_return(); test_gen_oa(); + test_enc_large_msg(); printf("OK\n"); return 0; diff --git a/tests/sms/sms_test.ok b/tests/sms/sms_test.ok index a71567d..724c166 100644 --- a/tests/sms/sms_test.ok +++ b/tests/sms/sms_test.ok @@ -18,4 +18,25 @@ Result: len(2) data(00 91 ) Result: len(9) data(0e d0 4f 78 d9 2d 9c 0e 01 ) Result: len(12) data(14 d0 4f 78 d9 2d 9c 0e c3 e2 31 19 ) + +Running test_enc_large_msg +gsm_7bit_encode_n(len=2048) processed 2048 septets (expected 2048): OK +gsm_7bit_encode_n(len=2048) used 0 octets in the buffer (expected 1792): FAIL + Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=1024) processed 1024 septets (expected 1024): OK +gsm_7bit_encode_n(len=1024) used 0 octets in the buffer (expected 896): FAIL + Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=555) processed 555 septets (expected 555): OK +gsm_7bit_encode_n(len=555) used 38 octets in the buffer (expected 486): FAIL + Unexpected chunk at enc_buf[35:6]: c1 60 10 00 00 00 +gsm_7bit_encode_n(len=512) processed 512 septets (expected 512): OK +gsm_7bit_encode_n(len=512) used 0 octets in the buffer (expected 448): FAIL + Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=260) processed 260 septets (expected 260): OK +gsm_7bit_encode_n(len=260) used 4 octets in the buffer (expected 228): FAIL + Unexpected chunk at enc_buf[0:6]: c1 60 30 08 00 00 +gsm_7bit_encode_n(len=255) processed 255 septets (expected 255): OK +gsm_7bit_encode_n(len=255) used 224 octets in the buffer (expected 224): OK +gsm_7bit_encode_n(len=250) processed 250 septets (expected 250): OK +gsm_7bit_encode_n(len=250) used 219 octets in the buffer (expected 219): OK OK -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I723300578d5ab0c7b94cf49c14d962b2dbf47740 Gerrit-Change-Number: 22542 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 16:37:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 16:37:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 to look at the new patch set (#7). Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si Perform a full RAN information request (single report) against the PCU and check the results. Also test what happens when the request is issued at a time where osmo-bts has no system information available. Depends: osmo-pcu Id72118120c14984d2fb1b918b41fac4868150d41 Change-Id: I9054ab0e969c0fbfdc671c92d44cc61360959adc Related: SYS#5103 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn M pcu/PCU_Tests_SNS.cfg M pcu/PCU_Tests_SNSv6.cfg 4 files changed, 164 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/22369/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 16:37:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 16:37:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 to look at the new patch set (#2). Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF Whenever the BSC is updating SI1, SI3 or SI13 via RSL, the PCU should be informed about the change via PCUIF as well. For SI13 this is already the case and a testcase exists. The version 11 of the PCUIF protocol is now capable to update SI1 and SI3 as well. - Update BTS_Tests.TC_pcu_ver_si13 so that it works with the current protocol version - Add BTS_Tests.TC_pcu_ver_si3 and BTS_Tests.TC_pcu_ver_si1 that test SI1 and SI3 as well. Depends: osmo-bts Ib7aeb41e634ad6fcab3766a4667b0267c749436a Change-Id: I5138ab183793e7eee4dc494318d984e9f1f56932 Related: SYS#5103 --- M bts/BTS_Tests.default M bts/BTS_Tests.ttcn 2 files changed, 25 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/22540/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:16:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 17:16:25 +0000 Subject: Change in osmo-pcu[master]: tbf: Constify some methods References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22607 ) Change subject: tbf: Constify some methods ...................................................................... tbf: Constify some methods Change-Id: I2681a98583f4fb26a274c75d0279084239f76a68 --- M src/tbf.cpp M src/tbf.h 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/07/22607/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 74c790c..35bd81d 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -544,7 +544,7 @@ } int gprs_rlcmac_tbf::check_polling(uint32_t fn, uint8_t ts, - uint32_t *poll_fn_, unsigned int *rrbp_) + uint32_t *poll_fn_, unsigned int *rrbp_) const { uint32_t new_poll_fn = next_fn(fn, 13); @@ -1066,7 +1066,7 @@ return 0; } -const char *tbf_name(gprs_rlcmac_tbf *tbf) +const char *tbf_name(const gprs_rlcmac_tbf *tbf) { return tbf ? tbf->name() : "(no TBF)"; } diff --git a/src/tbf.h b/src/tbf.h index a2c4747..1d28afb 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -190,7 +190,7 @@ extern "C" { #endif struct gprs_rlcmac_tbf; -const char *tbf_name(struct gprs_rlcmac_tbf *tbf); +const char *tbf_name(const struct gprs_rlcmac_tbf *tbf); enum gprs_rlcmac_tbf_state tbf_state(const struct gprs_rlcmac_tbf *tbf); enum gprs_rlcmac_tbf_direction tbf_direction(const struct gprs_rlcmac_tbf *tbf); void tbf_set_ms(struct gprs_rlcmac_tbf *tbf, struct GprsMs *ms); @@ -262,7 +262,7 @@ int establish_dl_tbf_on_pacch(); int check_polling(uint32_t fn, uint8_t ts, - uint32_t *poll_fn, unsigned int *rrbp); + uint32_t *poll_fn, unsigned int *rrbp) const; void set_polling(uint32_t poll_fn, uint8_t ts, enum gprs_rlcmac_tbf_poll_type t); void poll_timeout(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2681a98583f4fb26a274c75d0279084239f76a68 Gerrit-Change-Number: 22607 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:33:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 17:33:07 +0000 Subject: Change in osmo-pcu[master]: encoding: Fix comment description of S/P field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22605 ) Change subject: encoding: Fix comment description of S/P field ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic95853e115f60c65f7f11187d49d6e870d08c7bb Gerrit-Change-Number: 22605 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 17:33:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:39:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 17:39:57 +0000 Subject: Change in osmo-pcu[master]: tbf: Reuse stored result in variable in check_polling() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22606 ) Change subject: tbf: Reuse stored result in variable in check_polling() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie6fbe3699bcb4f63f7b617243c769e60881d8aac Gerrit-Change-Number: 22606 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 01 Feb 2021 17:39:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:41:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 17:41:20 +0000 Subject: Change in osmo-pcu[master]: tbf: Constify some methods In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22607 ) Change subject: tbf: Constify some methods ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2681a98583f4fb26a274c75d0279084239f76a68 Gerrit-Change-Number: 22607 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 01 Feb 2021 17:41:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:49:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 17:49:13 +0000 Subject: Change in osmo-pcu[master]: encoding: Fix comment description of S/P field In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22605 ) Change subject: encoding: Fix comment description of S/P field ...................................................................... encoding: Fix comment description of S/P field Those fields were ment to be 0 (non-valid), just the comments were copied over from somewhere else, and they are misleading. Change-Id: Ic95853e115f60c65f7f11187d49d6e870d08c7bb --- M src/encoding.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index a5e7f8a..38bc175 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -1739,7 +1739,7 @@ block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0; // 0: N+13 - block->SP = 0; // RRBP field is valid + block->SP = 0; // RRBP field is not valid block->USF = 0x0; // Uplink state flag block->u.Packet_Neighbour_Cell_Data.MESSAGE_TYPE = MT_PACKET_NEIGHBOUR_CELL_DATA; @@ -1764,7 +1764,7 @@ block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0; // 0: N+13 - block->SP = 0; // RRBP field is valid + block->SP = 0; // RRBP field is not valid block->USF = 0x0; // Uplink state flag block->u.Packet_Cell_Change_Continue.MESSAGE_TYPE = MT_PACKET_CELL_CHANGE_CONTINUE; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic95853e115f60c65f7f11187d49d6e870d08c7bb Gerrit-Change-Number: 22605 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:49:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 17:49:14 +0000 Subject: Change in osmo-pcu[master]: tbf: Reuse stored result in variable in check_polling() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22606 ) Change subject: tbf: Reuse stored result in variable in check_polling() ...................................................................... tbf: Reuse stored result in variable in check_polling() Change-Id: Ie6fbe3699bcb4f63f7b617243c769e60881d8aac --- M src/tbf.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 54ae4fa..74c790c 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -558,7 +558,7 @@ LOGPTBF(this, LOGL_DEBUG, "Polling is already scheduled\n"); return -EBUSY; } - if (bts_sba(bts)->find(trx->trx_no, ts, next_fn(fn, 13))) { + if (bts_sba(bts)->find(trx->trx_no, ts, new_poll_fn)) { LOGPTBF(this, LOGL_DEBUG, "Polling is already scheduled " "for single block allocation at FN %d TS %d ...\n", new_poll_fn, ts); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie6fbe3699bcb4f63f7b617243c769e60881d8aac Gerrit-Change-Number: 22606 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:49:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 17:49:15 +0000 Subject: Change in osmo-pcu[master]: tbf: Constify some methods In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22607 ) Change subject: tbf: Constify some methods ...................................................................... tbf: Constify some methods Change-Id: I2681a98583f4fb26a274c75d0279084239f76a68 --- M src/tbf.cpp M src/tbf.h 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 74c790c..35bd81d 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -544,7 +544,7 @@ } int gprs_rlcmac_tbf::check_polling(uint32_t fn, uint8_t ts, - uint32_t *poll_fn_, unsigned int *rrbp_) + uint32_t *poll_fn_, unsigned int *rrbp_) const { uint32_t new_poll_fn = next_fn(fn, 13); @@ -1066,7 +1066,7 @@ return 0; } -const char *tbf_name(gprs_rlcmac_tbf *tbf) +const char *tbf_name(const gprs_rlcmac_tbf *tbf) { return tbf ? tbf->name() : "(no TBF)"; } diff --git a/src/tbf.h b/src/tbf.h index a2c4747..1d28afb 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -190,7 +190,7 @@ extern "C" { #endif struct gprs_rlcmac_tbf; -const char *tbf_name(struct gprs_rlcmac_tbf *tbf); +const char *tbf_name(const struct gprs_rlcmac_tbf *tbf); enum gprs_rlcmac_tbf_state tbf_state(const struct gprs_rlcmac_tbf *tbf); enum gprs_rlcmac_tbf_direction tbf_direction(const struct gprs_rlcmac_tbf *tbf); void tbf_set_ms(struct gprs_rlcmac_tbf *tbf, struct GprsMs *ms); @@ -262,7 +262,7 @@ int establish_dl_tbf_on_pacch(); int check_polling(uint32_t fn, uint8_t ts, - uint32_t *poll_fn, unsigned int *rrbp); + uint32_t *poll_fn, unsigned int *rrbp) const; void set_polling(uint32_t poll_fn, uint8_t ts, enum gprs_rlcmac_tbf_poll_type t); void poll_timeout(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2681a98583f4fb26a274c75d0279084239f76a68 Gerrit-Change-Number: 22607 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 17:52:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 17:52:54 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22544 ) Change subject: gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() ...................................................................... gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() Using 'uint8_t' for the length argument is definitely a bad idea. Because of this, packing more than 255 septets would not work as expected. Deprecate the old function and use 'size_t' instead. Change-Id: Ib1aac538afeb0a5c76a1df472d555139a496e12e --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map M tests/sms/sms_test.c M tests/sms/sms_test.ok 5 files changed, 20 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index de63434..0909006 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -110,7 +110,10 @@ int gsm_7bit_encode_n_ussd(uint8_t *result, size_t n, const char *data, int *octets_written); /* the four functions below are helper functions and here for the unit test */ -int gsm_septets2octets(uint8_t *result, const uint8_t *rdata, uint8_t septet_len, uint8_t padding); +int gsm_septets2octets(uint8_t *result, const uint8_t *rdata, uint8_t septet_len, uint8_t padding) + OSMO_DEPRECATED("This function is unable to handle more than 255 septets, " + "use gsm_septet_pack() instead."); +int gsm_septet_pack(uint8_t *result, const uint8_t *rdata, size_t septet_len, uint8_t padding); int gsm_septet_encode(uint8_t *result, const char *data); uint8_t gsm_get_octet_len(const uint8_t sept_len); int gsm_7bit_decode_n_hdr(char *decoded, size_t n, const uint8_t *user_data, uint8_t length, uint8_t ud_hdr_ind); diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index ae77a9d..07e082d 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -324,7 +324,7 @@ * \param[in] septet_len Length of \a rdata * \param[in] padding padding bits at start * \returns number of bytes used in \a result */ -int gsm_septets2octets(uint8_t *result, const uint8_t *rdata, uint8_t septet_len, uint8_t padding) +int gsm_septet_pack(uint8_t *result, const uint8_t *rdata, size_t septet_len, uint8_t padding) { int i = 0, z = 0; uint8_t cb, nb; @@ -369,6 +369,12 @@ return z; } +/*! Backwards compatibility wrapper for gsm_septets_pack(), deprecated. */ +int gsm_septets2octets(uint8_t *result, const uint8_t *rdata, uint8_t septet_len, uint8_t padding) +{ + return gsm_septet_pack(result, rdata, septet_len, padding); +} + /*! GSM 7-bit alphabet TS 03.38 6.2.1 Character packing * \param[out] result Caller-provided output buffer * \param[in] n Maximum length of \a result in bytes @@ -393,7 +399,7 @@ y = max_septets; } - o = gsm_septets2octets(result, rdata, y, 0); + o = gsm_septet_pack(result, rdata, y, 0); if (octets) *octets = o; diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index c314c20..584d761 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -478,6 +478,7 @@ gsm_milenage; gsm_septet_encode; +gsm_septet_pack; gsm_septets2octets; lapd_dl_exit; diff --git a/tests/sms/sms_test.c b/tests/sms/sms_test.c index c7f47e2..3e14529 100644 --- a/tests/sms/sms_test.c +++ b/tests/sms/sms_test.c @@ -384,7 +384,7 @@ memcpy(tmp, septet_data, concatenated_part1_septet_length); /* In our case: test_multiple_decode[0].ud_hdr_ind equals number of padding bits*/ - octet_length = gsm_septets2octets(coded, tmp, concatenated_part1_septet_length, test_multiple_encode[0].ud_hdr_ind); + octet_length = gsm_septet_pack(coded, tmp, concatenated_part1_septet_length, test_multiple_encode[0].ud_hdr_ind); /* copy header */ memset(tmp, 0x42, sizeof(tmp)); @@ -402,7 +402,7 @@ memcpy(tmp, septet_data + concatenated_part1_septet_length, concatenated_part2_septet_length); /* In our case: test_multiple_decode[1].ud_hdr_ind equals number of padding bits*/ - octet_length = gsm_septets2octets(coded, tmp, concatenated_part2_septet_length, test_multiple_encode[1].ud_hdr_ind); + octet_length = gsm_septet_pack(coded, tmp, concatenated_part2_septet_length, test_multiple_encode[1].ud_hdr_ind); /* copy header */ memset(tmp, 0x42, sizeof(tmp)); diff --git a/tests/sms/sms_test.ok b/tests/sms/sms_test.ok index 724c166..de1fce3 100644 --- a/tests/sms/sms_test.ok +++ b/tests/sms/sms_test.ok @@ -21,20 +21,15 @@ Running test_enc_large_msg gsm_7bit_encode_n(len=2048) processed 2048 septets (expected 2048): OK -gsm_7bit_encode_n(len=2048) used 0 octets in the buffer (expected 1792): FAIL - Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=2048) used 1792 octets in the buffer (expected 1792): OK gsm_7bit_encode_n(len=1024) processed 1024 septets (expected 1024): OK -gsm_7bit_encode_n(len=1024) used 0 octets in the buffer (expected 896): FAIL - Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=1024) used 896 octets in the buffer (expected 896): OK gsm_7bit_encode_n(len=555) processed 555 septets (expected 555): OK -gsm_7bit_encode_n(len=555) used 38 octets in the buffer (expected 486): FAIL - Unexpected chunk at enc_buf[35:6]: c1 60 10 00 00 00 +gsm_7bit_encode_n(len=555) used 486 octets in the buffer (expected 486): OK gsm_7bit_encode_n(len=512) processed 512 septets (expected 512): OK -gsm_7bit_encode_n(len=512) used 0 octets in the buffer (expected 448): FAIL - Unexpected chunk at enc_buf[0:7]: 00 00 00 00 00 00 00 +gsm_7bit_encode_n(len=512) used 448 octets in the buffer (expected 448): OK gsm_7bit_encode_n(len=260) processed 260 septets (expected 260): OK -gsm_7bit_encode_n(len=260) used 4 octets in the buffer (expected 228): FAIL - Unexpected chunk at enc_buf[0:6]: c1 60 30 08 00 00 +gsm_7bit_encode_n(len=260) used 228 octets in the buffer (expected 228): OK gsm_7bit_encode_n(len=255) processed 255 septets (expected 255): OK gsm_7bit_encode_n(len=255) used 224 octets in the buffer (expected 224): OK gsm_7bit_encode_n(len=250) processed 250 septets (expected 250): OK -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib1aac538afeb0a5c76a1df472d555139a496e12e Gerrit-Change-Number: 22544 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 18:10:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 18:10:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr/HLR_Tests.default: increase the VTY prompt timeout In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22549 ) Change subject: hlr/HLR_Tests.default: increase the VTY prompt timeout ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > really, it takes more than 2s for the VTY to respond to a subscriber command? That seems a bit long to me. But if you have seen that this fixes it... On my laptop (still using HDD) subscriber related commands may sometimes freeze osmo-hlr for ~half of a second. Never experienced longer delays so far. I guess Jenkins was under a high load when this happened. Let's keep this patch WIP for now, and get back to it if we see the timeout related failures again. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22549 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: I5835d5f8fa8915182623b59b23b5a23816950e4f Gerrit-Change-Number: 22549 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 18:10:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 18:13:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 18:13:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 7: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 01 Feb 2021 18:13:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 18:19:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 18:19:21 +0000 Subject: Change in libosmocore[master]: gsm_7bit_encode_n(): use regular malloc() instead of calloc() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22543 ) Change subject: gsm_7bit_encode_n(): use regular malloc() instead of calloc() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22543/1/src/gsm/gsm_utils.c File src/gsm/gsm_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/22543/1/src/gsm/gsm_utils.c at 332 PS1, Line 332: uint8_t *data = malloc(septet_len + 1); > What about allocating in the stack instead, since you are always freeing the data and only using it [?] I was thinking about alloca() too, we already use it in src/conv.c. Ideally, there should be some way to avoid copying stuff between buffers. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6956cbd83b2999dbcf8e2d210134b0a166c33efb Gerrit-Change-Number: 22543 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 18:19:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 18:35:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 18:35:20 +0000 Subject: Change in osmo-pcu[master]: nacc: Fix typo in function name References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22608 ) Change subject: nacc: Fix typo in function name ...................................................................... nacc: Fix typo in function name Change-Id: I74857eacf4664508dce70eb0c6dd2acd7bfb72e4 --- M src/nacc_fsm.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/22608/1 diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 510b3d8..d160404 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -444,13 +444,13 @@ } } -/* st_cell_cgh_continue_on_enter: +/* st_cell_chg_continue_on_enter: * At this point, we already sent all Pkt Cell Neighbour Change rlcmac * blocks, and we only need to wait to be scheduled again to send PKT * CELL CHANGE NOTIFICATION and then we are done */ -static void st_cell_cgh_continue(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void st_cell_chg_continue(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; struct nacc_ev_create_rlcmac_msg_ctx *data_ctx; @@ -545,7 +545,7 @@ .out_state_mask = X(NACC_ST_DONE), .name = "TX_CELL_CHG_CONTINUE", - .action = st_cell_cgh_continue, + .action = st_cell_chg_continue, }, [NACC_ST_DONE] = { .in_event_mask = 0, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I74857eacf4664508dce70eb0c6dd2acd7bfb72e4 Gerrit-Change-Number: 22608 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:18:11 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 19:18:11 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 to look at the new patch set (#8). Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... gprs_bssgp_rim: add serving BSS NACC application Answer an incoming RAN INFORMATION REQUEST RIM PDU with RAN INFORMATION PDU that contains system information type 1, 3 and 13 Depends: osmo-bts I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Related: SYS#5103 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/gprs_bssgp_rim.c M src/pcu_l1_if.cpp 4 files changed, 127 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/22368/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:26:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 19:26:41 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22368/8/src/gprs_bssgp_rim.c File src/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/8/src/gprs_bssgp_rim.c at 275 PS8, Line 275: LOGPRIM(nsei, LOGL_NOTICE, "Responding to RAN INFORMATION REQUEST ...\n"); NOTICE is too much here, should be INFO. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 19:26:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:26:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 19:26:51 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 19:26:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:31:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 1 Feb 2021 19:31:31 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 to look at the new patch set (#9). Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... gprs_bssgp_rim: add serving BSS NACC application Answer an incoming RAN INFORMATION REQUEST RIM PDU with RAN INFORMATION PDU that contains system information type 1, 3 and 13 Depends: osmo-bts I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Related: SYS#5103 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/gprs_bssgp_rim.c M src/pcu_l1_if.cpp 4 files changed, 127 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/22368/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:32:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 19:32:12 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 01 Feb 2021 19:32:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:55 +0000 Subject: Change in osmo-gsm-manuals[master]: glossary.adoc: add breif definitions of AQPSK and VAMOS References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 ) Change subject: glossary.adoc: add breif definitions of AQPSK and VAMOS ...................................................................... glossary.adoc: add breif definitions of AQPSK and VAMOS Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Related: SYS#4895, OS#4941 --- M common/chapters/glossary.adoc 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/09/22609/1 diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index d6a6c2d..23c7273 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -30,6 +30,8 @@ channel in response to RACH request AGPL:: GNU Affero General Public License, a copyleft-style Free Software License +AQPSK:: + Adaptive QPSK, a modulation scheme used by VAMOS channels on Downlink ARFCN:: Absolute Radio Frequency Channel Number; specifies a tuple of uplink and downlink frequencies @@ -377,6 +379,11 @@ USSD:: Unstructured Supplementary Service Data; textual dialog between subscriber and core network, e.g. '*#100#' -> 'Your extension is 1234' +VAMOS:: + Voice services over Adaptive Multi-user channels on One Slot; an optional + extension for GSM specified in Release 9 of 3GPP GERAN specifications + (_3GPP TS 48.018_ <<3gpp-ts-48-018>>) allowing two independent UEs to + transmit and receive simultaneously on traffic channels VCTCXO:: Voltage Controlled, Temperature Compensated Crystal Oscillator; a precision oscillator, superior to a classic crystal oscillator, but -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Gerrit-Change-Number: 22609 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:55 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... TRXC: add missing description of the 'SETTSC' command Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/10/22610/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index f15ed7b..9e3e4e9 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -127,6 +127,20 @@ RSP TXTUNE ---- +==== Training Sequence configuration + +The usual way to configure all timeslots at once involves sending of the 'SETTSC' +command with a desired Training Sequence Code ``: +---- +CMD SETTSC +CMD SETTSC +---- + +This command instructs the transceiver to use the given Training Sequence Code +from the TSC set 1 (see 3GPP TS 45.002, table 5.2.3a) for Normal Burst detection +on the receive path. It does not affect the transmit path because bursts coming +from the BTS do contain the Training Sequence bits. + ==== Timeslot Control `SETSLOT` sets the format of a given uplink timeslot in the ARFCN. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:56 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... TRXC: add proposal for multiple Training Sequences Change-Id: I621e46edac5d748472fd645f81876116904e260c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/11/22611/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 9e3e4e9..644511b 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -174,6 +174,32 @@ |13| PDTCH+PACCH+PTCCH |=== +===== Multiple Training Sequences (optional) + +For some setups it's insufficient to have a single Training Sequence Code assigned +to all timeslots of a transceiver. It may be required to use different TSCs for +some (or even all) timeslots. This can be achieved by sending 'SETSLOT' command +with additional arguments: +---- +CMD SETSLOT [ C/S ] +RSP SETSLOT [ C/S ] +---- + +where `` is a Training Sequence Code from TSC set ``. + +NOTE: The numbering of both Training Sequence code and set shall be the same as in +3GPP TS 45.002, e.g. `C0S1` corresponds to the first sequence in the first TSC set +for a chosen modulation type. Set number 0 (`S0`) does not exist in the specs. + +.Example: configuring timeslot 4 to use TCH/F and TSC 7 from set 1 +---- +CMD SETSLOT 4 1 C7/S1 +RSP SETSLOT 0 4 1 C7/S1 +---- + +Unless explicitly configured as described above, all timeslots will be using the +default Training Sequence Code and set configured with the 'SETTSC' command. + ==== TRXD header version negotiation Messages on DATA interface may have different header formats, defined by a -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:56 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... TRXC: introduce VAMOS enabled channel combinations Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 99 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/12/22612/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 644511b..17d819a 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -200,6 +200,105 @@ Unless explicitly configured as described above, all timeslots will be using the default Training Sequence Code and set configured with the 'SETTSC' command. +===== VAMOS enabled channel combinations (optional) + +The BTS may at any time re-configure channel combination of a timeslot (primarily +during channel activation) to activate or deactivate VAMOS mode in the transceiver. +For this purpose, the following additional channel combinations shall be used: + +.List of VAMOS enabled channel combinations and related values +[options="header"] +|=== +| value | Channel Combination +|VFF| V0(TCH/F) & V1(TCH/F), 2 channels total +|VHH| V0(TCH/H0) & V1(TCH/H0) + V0(TCH/H1) & V1(TCH/H1), 4 channels total +|VFH| V0(TCH/F) & V1(TCH/H0) + V0(TCH/F) & V1(TCH/H1), 3 channels total +|HVHH| TCH/H0 + V0(TCH/H1) & V1(TCH/H1), 3 channels total (mixed) +|=== + +where both `V0` and `V1` define a _VAMOS pair_. Symbols `&` and `+` indicate +simultaneous and sequential transmission in the TDMA domain respectively. +Therefore a combination `V0(a) & V1(b)` indicates that both channels `a` +and `b` are simultaneously active during a timeslot period. + +.Example: `VFF` in time domain (2 channels) +---- + MS1: | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | ... + -----+-----------+-----------+-----------+-----------+------------> TDMA frames + MS2: | V1(TCH/F) | V1(TCH/F) | V1(TCH/F) | V1(TCH/F) | ... +---- + +.Example: `VHH` in time domain (4 channels) +---- + MS1: | V0(TCH/H0) | | V0(TCH/H0) | | ... + MS2: | | V0(TCH/H1) | | V0(TCH/H1) | ... + -----+------------+------------+------------+------------+--------> TDMA frames + MS3: | V1(TCH/H0) | | V1(TCH/H0) | | ... + MS4: | | V1(TCH/H1) | | V1(TCH/H1) | ... +---- + +.Example: `VFH` in time domain (3 channels) +---- + MS1: | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | ... + -----+------------+------------+------------+------------+--------> TDMA frames + MS2: | V1(TCH/H0) | | V1(TCH/H0) | | ... + MS3: | | V1(TCH/H1) | | V1(TCH/H1) | ... +---- + +.Example: `HVHH` in time domain (3 channels) +---- + MS1: | TCH/H0 | | TCH/H0 | | ... + MS2: | | V0(TCH/H1) | | V0(TCH/H1) | ... + -----+------------+------------+------------+------------+--------> TDMA frames + MS3: | | V1(TCH/H1) | | V1(TCH/H1) | ... +---- + +NOTE: Combination `HVHH` is special, because it allows the network to multiplex +a legacy user device (`MS1`) with a pair of VAMOS capable devices (`MS2` and `MS3`) +on the same timeslot, so the former (`MS1`) is not required to support the new +orthogonal training sequences nor AQPSK modulation on Downlink. + +For all VAMOS specific channel combinations, it's *required* to specify Training +Sequence codes and the corresponding TSC sets (see 3GPP TS 45.002, table 5.2.3e +for more details on TSC set selection): + +.Example: configuring a timeslot to use `VFF` combination +---- +CMD SETSLOT VFF C0/S1 <1> C0/S2 <2> +RSP SETSLOT VFF C0/S1 C0/S2 +---- +<1> V0(TCH/F) is configured to use TSC 0 from set 1 (table 5.2.3a) +<2> V1(TCH/F) is configured to use TSC 0 from set 2 (table 5.2.3b) + +.Example: configuring a timeslot to use `VHH` combination +---- +CMD SETSLOT VHH C1/S3 <1> C1/S4 <2> +RSP SETSLOT VHH C1/S3 C1/S4 +---- +<1> V0(TCH/H0) and V0(TCH/H1) are configured to use TSC 1 from set 3 (table 5.2.3c) +<2> V1(TCH/H0) and V1(TCH/H1) are configured to use TSC 1 from set 4 (table 5.2.3d) + +.Example: configuring a timeslot to use `VFH` combination +---- +CMD SETSLOT VFH C2/S1 <1> C2/S4 <2> +RSP SETSLOT VFH C2/S1 C2/S4 +---- +<1> V0(TCH/F) is configured to use TSC 2 from set 1 (table 5.2.3a) +<2> V1(TCH/H0) and V1(TCH/H1) are configured to use TSC 2 from set 4 (table 5.2.3d) + +.Example: configuring a timeslot to use `HVHH` combination +---- +CMD SETSLOT HVHH C0/S1 <1> C0/S1 <2> C0/S2 <3> +RSP SETSLOT HVHH C0/S1 C0/S1 C0/S2 +---- +<1> Legacy TCH/H0 is configured to use TSC 0 from set 1 (table 5.2.3a) +<2> V0(TCH/H1) is configured to use TSC 0 from set 1 (table 5.2.3a) +<3> V1(TCH/H1) is configured to use TSC 0 from set 2 (table 5.2.3b) + +NOTE: Using Training Sequences from the same set for a _VAMOS pair_ is not permitted! +In the example for `HVHH`, legacy TCH/H0 does not belong to a _VAMOS pair_, so it can +be configured to use any sequence from any set. + ==== TRXD header version negotiation Messages on DATA interface may have different header formats, defined by a -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:56 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes ...................................................................... TRXD: fix optional padding length: bits vs bytes Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/13/22613/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 17d819a..fed8378 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -363,7 +363,7 @@ 40-47: RSSI 48-63: TOA256 64-95: ...Payload... - 96-97: PAD + 96-111: PAD } ---- @@ -426,7 +426,7 @@ * 0 -> definite "0" * 255 -> definite "1". -PAD: 2 bits (optional):: +PAD: 2 bytes (optional):: Padding at the end, historical reasons (OpenBTS inheritance). Bits can take any value, but 0 is preferred. Only expected on TRXDv0 headers. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:57 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 ) Change subject: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams ...................................................................... TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/14/22614/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index fed8378..02633ab 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -362,7 +362,7 @@ 8-39: FN 40-47: RSSI 48-63: TOA256 - 64-95: ...Payload... + 64-95: Soft-bits 96-111: PAD } ---- @@ -382,7 +382,7 @@ 48-63: TOA256 64-71: MTS 72-87: C/I - 88-127: ...Payload... + 88-127: Soft-bits } ---- @@ -415,7 +415,7 @@ training sequence is compared to the actual training sequence and the result expressed in centiBels. -Payload: 148 bytes for GSM, 444 bytes for EDGE:: +Soft-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the uplink burst. Unlike the downlink bursts, the uplink bursts are designated using the soft-bits notation, so the receiver can indicate its assurance from 0 to -127 that a given bit is 1, and from 0 to +127 that a given @@ -498,7 +498,7 @@ 5-7: TN 8-39: FN 40-47: PWR - 48-95: ...Payload... + 48-95: Hard-bits } ---- @@ -519,6 +519,6 @@ Contains the relative (to the full-scale amplitude) transmit power level in dB. The absolute value is set on the control interface. -Payload: 148 bytes for GSM, 444 bytes for EDGE:: +Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented using one byte (0x01 or 0x00 respectively). -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Gerrit-Change-Number: 22614 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:57 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages ...................................................................... TRXD: clarify the meaning of field 'PWR' in Downlink messages Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/15/22615/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 02633ab..cf2687d 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -516,8 +516,9 @@ GSM frame number, big endian. PWR: 8 bits (1 byte):: -Contains the relative (to the full-scale amplitude) transmit power level in dB. -The absolute value is set on the control interface. +Contains the relative (to the full-scale amplitude) transmit power *reduction* +in dB. The absolute value is set on the control interface, so the resulting +power is calculated as follows: `full_scale - (absolute_red + relative_red)`. Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:57 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field ...................................................................... TRXD: use different coding for AQPSK in the 'MTC' field AQPSK is used exclusively on Downlink in VAMOS mode. An AQPSK burst is basically a combination of two Normal Bursts. Each of these two bursts has the same length as defined for GMSK, while both must be using Training Sequences from different sets. Four different sets are defined in 3GPP 45.002, section 5.2.3.1. Therefore we need *two* bits to encode all possible values. Let's rearrange the existing combinations and use '11XX'B for AQPSK. The old combination '011X'B becomes reserved and can be re-purposed. This change is considered to be safe, given that no implementations are known to support AQPSK at the moment of making this change. Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/16/22616/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index cf2687d..8bc510e 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -470,13 +470,13 @@ +-----------------+---------------------------------------+ | . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) | +-----------------+---------------------------------------+ -| . 0 1 1 X . . . | AQPSK, 2 TS sets (0..1) | +| . 0 1 1 X . . . | RFU (Reserved for Future Use) | +-----------------+---------------------------------------+ | . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) | +-----------------+---------------------------------------+ | . 1 0 1 X . . . | 32QAM, 2 TS sets (0..1) | +-----------------+---------------------------------------+ -| . 1 1 X X . . . | RESERVED (0) | +| . 1 1 X X . . . | AQPSK (Downlink), 4 TS sets (0..3) | +-----------------+---------------------------------------+ ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:58 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH ...................................................................... TRXD: reserve a combination for Access Bursts on PACCH Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/17/22617/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 8bc510e..26e1168 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -470,7 +470,9 @@ +-----------------+---------------------------------------+ | . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) | +-----------------+---------------------------------------+ -| . 0 1 1 X . . . | RFU (Reserved for Future Use) | +| . 0 1 1 0 . . . | GMSK, Access Burst (see note) | ++-----------------+---------------------------------------+ +| . 0 1 1 1 . . . | RFU (Reserved for Future Use) | +-----------------+---------------------------------------+ | . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) | +-----------------+---------------------------------------+ @@ -480,6 +482,11 @@ +-----------------+---------------------------------------+ ---- +NOTE: A radio block on PDCH is carried by the sequence of four Normal Bursts. +The one exception is a special radio block occasionally used on the Uplink +consisting of a sequence of four Access Bursts (see 3GPP TS 44.060). The +transceiver shall use `0110` as the modulation type to indicate that. + Training Sequence Code:: The Training Sequence Code used to decode an Access or a Synchronization burst. This field hence doesn't apply for Normal bursts. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:58:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:58:59 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... TRXD: rework description of the 'Training Sequence Code' field The way how the indicated Training Sequence Code is supposed to be used by the BTS is behind the scope of this protocol specification. Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/18/22618/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 26e1168..efbfd1b 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -488,8 +488,10 @@ transceiver shall use `0110` as the modulation type to indicate that. Training Sequence Code:: -The Training Sequence Code used to decode an Access or a Synchronization burst. -This field hence doesn't apply for Normal bursts. +The Training Sequence Code identifies the Training Sequence of a received +burst. The value of this field corresponds to one of the sequences defined +in 3GPP TS 45.002, section 5.2, and depends on the actual modulation and +a TS set indicated by the preceding bits. ==== Downlink Data Burst -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:59:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:59:00 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify description of NOPE / IDLE indications References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 ) Change subject: TRXD: clarify description of NOPE / IDLE indications ...................................................................... TRXD: clarify description of NOPE / IDLE indications Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/19/22619/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index efbfd1b..c86e75e 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -386,6 +386,24 @@ } ---- +.TRXDv1 NOPE / IDLE indication message structure +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER(1) + 4: RES + 5-7: TN + 8-39: FN + 40-47: RSSI + 48-63: TOA256 + 64-71: MTS (NOPE.ind) + 72-87: C/I +} +---- + VER: 4 bits:: TRXD header version, v0 and v1 are specified so far. @@ -451,10 +469,10 @@ ---- IDLE / nope frame indication:: -The bit number 7 (MSB) is set to high when either nothing has been detected, or -during IDLE frames, so noise levels can be delivered, and avoid clock gaps on -the BTS side. Other bits are ignored, and should be set to low (`0`) in this -case. +The bit number 7 (MSB) is set to high when either nothing has been detected, so +the BTS scheduler keeps processing bursts without gaps, or during IDLE frames, +so the current noise levels can be delivered. Other bits are ignored, and should +be set to low (`0`) in this case. The field "Soft-bits" is omited. Modulation and TS set number:: GMSK has 4 sets of training sequences (see tables 5.2.3a-d), while 8-PSK (see -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95 Gerrit-Change-Number: 22619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:59:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:59:00 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: describe general message format, reduce duplication References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 ) Change subject: TRXD: describe general message format, reduce duplication ...................................................................... TRXD: describe general message format, reduce duplication Change-Id: If3bd16fdf5abfd67b3822c7199003d6f7cbaff92 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 44 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/20/22620/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index c86e75e..703904f 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -341,7 +341,50 @@ === TRXD protocol -Messages on the data interface carry one radio burst per UDP message. +Messages on the data interface carry one radio burst per UDP message. Two +kinds of such messages exist: + +* `TRX -> L1` (from transceiver to the L1): Uplink messages received from the MS, +* `L1 -> TRX` (from the L1 to transceiver): Downlink messages sent to the MS. + +Regardless of the origin, all PDUs have the following common structure: + +.General message format +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER + 4: RFU [rotate = 270] + 5-7: TN + 8-63: ... Specific fields ... + 64-95: Burst bits [colheight = 3] +} +---- + +VER: 4 bits:: +TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. + +TN: 3 bits:: +TDMA timeslot number. + +RFU: 1 bit:: +Reserved, shall be 0. It can be used in the future to extend the TDMA TN range +to (0..15), in case anybody would need to transfer UMTS bursts. + +FN: 32 bits (4 bytes):: +TDMA frame number, big endian. + +Specific fields: variable length:: +This part depends on the origin of a message and the header version. See below. + +Burst bits: variable length:: +The actual bit sequence of a burst, where each bit takes one octet. Depending on +the origin, all bits in the sequence are either _soft-bits_ (from demodulator) or +_hard-bits_ (to the modulator). Length of the sequence depends on modulation +type of the burst. ==== Uplink Data Burst @@ -404,19 +447,6 @@ } ---- -VER: 4 bits:: -TRXD header version, v0 and v1 are specified so far. - -TN: 3 bits:: -Timeslot number. - -RES: 1 bit:: -Reserved, shall be 0. It can be used in the future to extend the TDMA TN range -to (0..15), in case anybody would need to transfer UMTS bursts. - -FN: 32 bits (4 bytes):: -GSM frame number, big endian. - RSSI: 8 bits (1 byte):: Received Signal Strength Indication in -dBm, encoded without the negative sign. @@ -529,19 +559,6 @@ } ---- -VER: 4 bits:: -TRXD header version, v0 and v1 are specified so far. - -TN: 3 bits:: -Timeslot number. - -RES: 1 bit:: -Reserved, shall be 0. It can be used in the future to extend the TDMA TN range -to (0..15), in case anybody would need to transfer UMTS bursts. - -FN: 32 bits (4 bytes):: -GSM frame number, big endian. - PWR: 8 bits (1 byte):: Contains the relative (to the full-scale amplitude) transmit power *reduction* in dB. The absolute value is set on the control interface, so the resulting -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If3bd16fdf5abfd67b3822c7199003d6f7cbaff92 Gerrit-Change-Number: 22620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:59:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:59:01 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 ) Change subject: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields ...................................................................... TRXD: cosmetic: use attribute 'rotate' for 1 bit fields Change-Id: I604cd85f79a8c21ef536840e017e8af399e935c7 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/21/22621/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 703904f..5989258 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -400,7 +400,7 @@ node_height = 40 0-3: VER(0) - 4: RES + 4: RES [rotate = 270] 5-7: TN 8-39: FN 40-47: RSSI @@ -418,7 +418,7 @@ node_height = 40 0-3: VER(1) - 4: RES + 4: RES [rotate = 270] 5-7: TN 8-39: FN 40-47: RSSI @@ -437,7 +437,7 @@ node_height = 40 0-3: VER(1) - 4: RES + 4: RES [rotate = 270] 5-7: TN 8-39: FN 40-47: RSSI @@ -551,7 +551,7 @@ node_height = 40 0-3: VER - 4: RES + 4: RES [rotate = 270] 5-7: TN 8-39: FN 40-47: PWR -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I604cd85f79a8c21ef536840e017e8af399e935c7 Gerrit-Change-Number: 22621 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 19:59:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 19:59:01 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights ...................................................................... TRXD: more information on PDU versioning and some highlights Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 32 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/22/22622/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 5989258..222e434 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -299,15 +299,16 @@ In the example for `HVHH`, legacy TCH/H0 does not belong to a _VAMOS pair_, so it can be configured to use any sequence from any set. +[[trx_if_pdu_version_nego]] ==== TRXD header version negotiation -Messages on DATA interface may have different header formats, defined by a -version number, which can be negotiated on the control interface. By default, -the Transceiver will use the legacy header version (0). +Messages on DATA interface may have different formats, defined by a version number, +which can be negotiated on the control interface. By default, the Transceiver will +use the legacy header version (0). See <>. -The header format negotiation can be initiated by the BTS using 'SETFORMAT' -command. If the requested version is not supported by the transceiver, status -code of the response message should indicate a preferred (basically, the latest) +The format negotiation can be initiated by the BTS using 'SETFORMAT' command. +If the requested version is not supported by the transceiver, status code of +the response message should indicate a preferred (basically, the latest) version. The format of this message is the following: ---- CMD SETFORMAT @@ -386,6 +387,31 @@ _hard-bits_ (to the modulator). Length of the sequence depends on modulation type of the burst. +[[trx_if_pdu_versioning]] +==== PDU versioning + +The format of a PDU, i.e. presence and ordering of certain fields, is determined by +the version number indicated in the first octet. This is usually referred as +`TRXDvN`, where `N` is the version number (e.g. TRXDv0 or TRXDv1). A version number +indicates the message format to be used for both directions: `TRX -> L1` and +`L1 -> TRX`. The same version shall be used for all messages in both directions, +mixing in any way is not permitted. + +The version negotiation is optionally initiated by the `L1` on the control interface, +and expected to be performed before starting the transceiver (i.e. sending 'POWERON' +command). See <>. + +The current header allows to distinguish up to 16 different versions. +The following versions are defined so far: + +* TRXDv0 - initial version of TRXD protocol, inherited as-is from OpenBTS project. +* TRXDv1 (proposed in July 2019): +** Introduced the concept of protocol versioning; +** Introduced NOPE / IDLE indications; +** New field: MTS (Modulation and Training Sequence); +** New field: C/I (Carrier-to-interface) ratio; +** Downlink messages mostly unchanged. + ==== Uplink Data Burst Uplink data burst message structure differs from version 0 to 1. Basically, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 22:22:45 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 22:22:45 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c File src/gb/frame_relay.c: https://gerrit.osmocom.org/c/libosmocore/+/22575/2/src/gb/frame_relay.c at a421 PS2, Line 421: return > if the link has failed, I would argue that by definition you have lost all DLCs. [?] ok. Ack on this. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 22:22:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 22:24:32 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 22:24:32 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 01 Feb 2021 22:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 22:55:50 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 22:55:50 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: install nwdiag using pip3 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22623 ) Change subject: debian-stretch-jenkins: install nwdiag using pip3 ...................................................................... debian-stretch-jenkins: install nwdiag using pip3 Debian stable provides quite old nwdiag version (1.0.4, Jan 1 2015), which appears to work unstable and produce sporadic build failures. More recent version 2.0.0 is available in the upstream since Jan 26 2020 and can be installed using pip3. Change-Id: I5f7d7a343ff773b2c936cb7e650f166fed69671d Related: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Related: SYS#4895 --- M debian-stretch-jenkins/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/22623/1 diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index fcd093b..250da45 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -97,7 +97,6 @@ python3 \ python3-gi \ python3-mako \ - python3-nwdiag \ python3-pip \ python3-pyflakes \ python3-setuptools \ @@ -125,7 +124,8 @@ git+https://github.com/podshumok/python-smpplib.git \ git+https://github.com/eriwen/lcov-to-cobertura-xml.git \ pydbus \ - pysispm + pysispm \ + nwdiag # match the outside user RUN useradd --uid=1000 build -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5f7d7a343ff773b2c936cb7e650f166fed69671d Gerrit-Change-Number: 22623 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 23:01:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 23:01:54 +0000 Subject: Change in osmo-gsm-manuals[master]: diag-filter.conf: drop version from nwdiag / packetdiag commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 ) Change subject: diag-filter.conf: drop version from nwdiag / packetdiag commands ...................................................................... diag-filter.conf: drop version from nwdiag / packetdiag commands Debian stable provides quite old nwdiag version (1.0.4, Jan 1 2015), which appears to work unstable and produce sporadic build failures. More recent version 2.0.0 is available in the upstream since Jan 26 2020 and can be installed using pip. Executables installed using pip3 do not contain version number. Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Related: I5f7d7a343ff773b2c936cb7e650f166fed69671d Related: SYS#4895 --- M build/diag-filter.conf M check-depends.sh 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/24/22624/1 diff --git a/build/diag-filter.conf b/build/diag-filter.conf index 0c30db7..4f6005e 100644 --- a/build/diag-filter.conf +++ b/build/diag-filter.conf @@ -49,7 +49,7 @@ [nwdiag-filter-style] -nwdiag-style=template="nwdiag-block",subs=(),posattrs=("style","target"),filter='nwdiag3 -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' +nwdiag-style=template="nwdiag-block",subs=(),posattrs=("style","target"),filter='nwdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' [blockdef-listing] template::[nwdiag-filter-style] @@ -62,7 +62,7 @@ [packetdiag-filter-style] -packetdiag-style=template="packetdiag-block",subs=(),posattrs=("style","target"),filter='packetdiag3 -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' +packetdiag-style=template="packetdiag-block",subs=(),posattrs=("style","target"),filter='packetdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' [blockdef-listing] template::[packetdiag-filter-style] diff --git a/check-depends.sh b/check-depends.sh index f072fd8..b4d6672 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -13,7 +13,7 @@ check_dep_bin a2x asciidoc check_dep_bin asciidoc asciidoc check_dep_bin dblatex dblatex -check_dep_bin packetdiag3 python3-nwdiag +check_dep_bin packetdiag python3-nwdiag check_dep_bin dot graphviz check_dep_bin inkscape inkscape -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Gerrit-Change-Number: 22624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 23:07:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 23:07:42 +0000 Subject: Change in osmo-gsm-manuals[master]: diag-filter.conf: drop version from nwdiag / packetdiag commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 ) Change subject: diag-filter.conf: drop version from nwdiag / packetdiag commands ...................................................................... Patch Set 1: Needs to be merged after https://gerrit.osmocom.org/c/docker-playground/+/22623. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Gerrit-Change-Number: 22624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 01 Feb 2021 23:07:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 23:13:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 1 Feb 2021 23:13:18 +0000 Subject: Change in osmo-pcu[master]: nacc: Fix typo in function name In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22608 ) Change subject: nacc: Fix typo in function name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I74857eacf4664508dce70eb0c6dd2acd7bfb72e4 Gerrit-Change-Number: 22608 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 01 Feb 2021 23:13:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 23:15:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 1 Feb 2021 23:15:34 +0000 Subject: Change in osmo-pcu[master]: nacc: Fix typo in function name In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22608 ) Change subject: nacc: Fix typo in function name ...................................................................... nacc: Fix typo in function name Change-Id: I74857eacf4664508dce70eb0c6dd2acd7bfb72e4 --- M src/nacc_fsm.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 510b3d8..d160404 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -444,13 +444,13 @@ } } -/* st_cell_cgh_continue_on_enter: +/* st_cell_chg_continue_on_enter: * At this point, we already sent all Pkt Cell Neighbour Change rlcmac * blocks, and we only need to wait to be scheduled again to send PKT * CELL CHANGE NOTIFICATION and then we are done */ -static void st_cell_cgh_continue(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void st_cell_chg_continue(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; struct nacc_ev_create_rlcmac_msg_ctx *data_ctx; @@ -545,7 +545,7 @@ .out_state_mask = X(NACC_ST_DONE), .name = "TX_CELL_CHG_CONTINUE", - .action = st_cell_cgh_continue, + .action = st_cell_chg_continue, }, [NACC_ST_DONE] = { .in_event_mask = 0, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I74857eacf4664508dce70eb0c6dd2acd7bfb72e4 Gerrit-Change-Number: 22608 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 1 23:24:38 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 1 Feb 2021 23:24:38 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework logging of Rx and Tx NS PDU In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22294 to look at the new patch set (#13). Change subject: gprs_ns2: rework logging of Rx and Tx NS PDU ...................................................................... gprs_ns2: rework logging of Rx and Tx NS PDU Introduce 2 new logging sub systems for signal and unit data. Unify log messages so all log messages look similiar. Log also Rx PDUs. Ensure dropped Tx packets (BLOCK/RESET on SNS) contain *Tx*. Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d --- M include/osmocom/core/logging.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_vc_fsm.c M src/logging.c 6 files changed, 50 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/22294/13 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 2 01:49:46 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 02 Feb 2021 01:49:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6018afcdf0310_32fe2b11e4bbc5f820171e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bts failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 195s] CC vty.o [ 196s] CC paging.o [ 196s] CC measurement.o [ 197s] measurement.c:33:1: error: initializer element is not constant [ 197s] }; [ 197s] ^ [ 197s] Makefile:470: recipe for target 'measurement.o' failed [ 197s] make[4]: *** [measurement.o] Error 1 [ 197s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/common' [ 197s] Makefile:373: recipe for target 'all-recursive' failed [ 197s] make[3]: *** [all-recursive] Error 1 [ 197s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 197s] Makefile:426: recipe for target 'all-recursive' failed [ 197s] make[2]: *** [all-recursive] Error 1 [ 197s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 197s] Makefile:357: recipe for target 'all' failed [ 197s] make[1]: *** [all] Error 2 [ 197s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 197s] dh_auto_build: make -j1 returned exit code 2 [ 197s] debian/rules:12: recipe for target 'build' failed [ 197s] make: *** [build] Error 2 [ 197s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 197s] ### VM INTERACTION START ### [ 198s] Powering off. [ 198s] [ 188.110214] reboot: Power down [ 198s] ### VM INTERACTION END ### [ 198s] [ 198s] lamb09 failed "build osmo-bts_1.2.0.410.1027.dsc" at Tue Feb 2 01:49:41 UTC 2021. [ 198s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 2 01:52:20 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 02 Feb 2021 01:52:20 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6018b0614b3c4_32fe2b11e4bbc5f820173e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_8.0/i586 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 151s] ../../include/osmocom/sigtran/xua_msg.h:25:39: error: (near initialization for 'sccp2sua_testcases[0].sua.hdr') [ 151s] #define XUA_HDR(class, type) ((struct xua_common_hdr) { .spare = 0, .msg_class = (class), .msg_type = (type) }) [ 151s] ^ [ 151s] xua_test.c:387:11: note: in expansion of macro 'XUA_HDR' [ 151s] .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), [ 151s] ^ [ 151s] Makefile:381: recipe for target 'xua_test.o' failed [ 151s] make[4]: *** [xua_test.o] Error 1 [ 151s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/xua' [ 151s] Makefile:366: recipe for target 'all-recursive' failed [ 151s] make[3]: *** [all-recursive] Error 1 [ 151s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 151s] Makefile:495: recipe for target 'all-recursive' failed [ 151s] make[2]: *** [all-recursive] Error 1 [ 151s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 151s] Makefile:389: recipe for target 'all' failed [ 151s] make[1]: *** [all] Error 2 [ 151s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 151s] dh_auto_build: make -j1 returned exit code 2 [ 151s] debian/rules:12: recipe for target 'build' failed [ 151s] make: *** [build] Error 2 [ 151s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 151s] ### VM INTERACTION START ### [ 153s] Powering off. [ 153s] [ 144.596670] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] sheep88 failed "build libosmo-sccp_1.3.0.27.ed11.dsc" at Tue Feb 2 01:52:16 UTC 2021. [ 153s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 2 02:10:20 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 02 Feb 2021 02:10:20 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6018b499e36c0_32fe2b11e4bbc5f82019559@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 108s] [COMPILING apps/dfu/main.c] [ 108s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 109s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 109s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 109s] Memory region Used Size Region Size %age Used [ 109s] rom: 16580 B 16 KB 101.20% [ 109s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 109s] collect2: error: ld returned 1 exit status [ 109s] % [ 109s] make[2]: *** [Makefile:234: flash] Error 1 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 109s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] dh_auto_build: error: make -j1 returned exit code 2 [ 109s] make: *** [debian/rules:16: build] Error 25 [ 109s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] ### VM INTERACTION START ### [ 112s] [ 101.968401] sysrq: Power Off [ 112s] [ 101.970314] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] hci-cnode2-m1 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 2 02:10:06 UTC 2021. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 2 02:16:37 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 02 Feb 2021 02:16:37 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6018b61fe89d9_32fe2b11e4bbc5f820203a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 166s] CC vty.o [ 166s] CC paging.o [ 167s] CC measurement.o [ 167s] measurement.c:33:1: error: initializer element is not constant [ 167s] }; [ 167s] ^ [ 167s] Makefile:470: recipe for target 'measurement.o' failed [ 167s] make[4]: *** [measurement.o] Error 1 [ 167s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/common' [ 167s] Makefile:373: recipe for target 'all-recursive' failed [ 167s] make[3]: *** [all-recursive] Error 1 [ 167s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 167s] Makefile:426: recipe for target 'all-recursive' failed [ 167s] make[2]: *** [all-recursive] Error 1 [ 167s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 167s] Makefile:357: recipe for target 'all' failed [ 167s] make[1]: *** [all] Error 2 [ 167s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 167s] dh_auto_build: make -j1 returned exit code 2 [ 167s] debian/rules:12: recipe for target 'build' failed [ 167s] make: *** [build] Error 2 [ 167s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 167s] ### VM INTERACTION START ### [ 168s] Powering off. [ 168s] [ 157.856976] reboot: Power down [ 168s] ### VM INTERACTION END ### [ 168s] [ 168s] lamb58 failed "build osmo-bts_1.2.0.410.1027.dsc" at Tue Feb 2 02:16:28 UTC 2021. [ 168s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 2 02:23:50 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 02 Feb 2021 02:23:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6018b7c3b963d_32fe2b11e4bbc5f82021938@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 173s] ../../include/osmocom/sigtran/xua_msg.h:25:39: error: (near initialization for 'sccp2sua_testcases[0].sua.hdr') [ 173s] #define XUA_HDR(class, type) ((struct xua_common_hdr) { .spare = 0, .msg_class = (class), .msg_type = (type) }) [ 173s] ^ [ 173s] xua_test.c:387:11: note: in expansion of macro 'XUA_HDR' [ 173s] .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), [ 173s] ^ [ 173s] Makefile:381: recipe for target 'xua_test.o' failed [ 173s] make[4]: *** [xua_test.o] Error 1 [ 173s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests/xua' [ 173s] Makefile:366: recipe for target 'all-recursive' failed [ 173s] make[3]: *** [all-recursive] Error 1 [ 173s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 173s] Makefile:495: recipe for target 'all-recursive' failed [ 173s] make[2]: *** [all-recursive] Error 1 [ 173s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 173s] Makefile:389: recipe for target 'all' failed [ 173s] make[1]: *** [all] Error 2 [ 173s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 173s] dh_auto_build: make -j1 returned exit code 2 [ 173s] debian/rules:12: recipe for target 'build' failed [ 173s] make: *** [build] Error 2 [ 173s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 173s] ### VM INTERACTION START ### [ 175s] Powering off. [ 175s] [ 164.262621] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb58 failed "build libosmo-sccp_1.3.0.27.ed11.dsc" at Tue Feb 2 02:23:40 UTC 2021. [ 175s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 2 02:23:50 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 02 Feb 2021 02:23:50 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6018b7c42ed32_32fe2b11e4bbc5f820220e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 117s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 117s] [COMPILING libboard/qmod/source/card_pres.c] [ 117s] [COMPILING libboard/qmod/source/wwan_led.c] [ 117s] [COMPILING libboard/qmod/source/i2c.c] [ 117s] [COMPILING libboard/qmod/source/board_qmod.c] [ 117s] [COMPILING apps/dfu/main.c] [ 118s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 118s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 118s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 118s] Memory region Used Size Region Size %age Used [ 118s] rom: 16588 B 16 KB 101.25% [ 118s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 118s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 118s] collect2: error: ld returned 1 exit status [ 118s] % [ 118s] make[2]: *** [Makefile:234: flash] Error 1 [ 118s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 118s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] dh_auto_build: error: make -j1 returned exit code 2 [ 118s] make: *** [debian/rules:16: build] Error 25 [ 118s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 118s] ### VM INTERACTION START ### [ 121s] [ 110.876508] sysrq: Power Off [ 121s] [ 110.880443] reboot: Power down [ 121s] ### VM INTERACTION END ### [ 121s] [ 121s] sheep88 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 2 02:23:41 UTC 2021. [ 121s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 2 07:46:44 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 07:46:44 +0000 Subject: Change in osmo-gsm-manuals[master]: diag-filter.conf: drop version from nwdiag / packetdiag commands In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 ) Change subject: diag-filter.conf: drop version from nwdiag / packetdiag commands ...................................................................... Patch Set 1: Code-Review-1 Unfortunately this won't work. It would use the pip3 version in gerrit-verifications and master-builds jenkins jobs, but then the debian packages would break. https://git.osmocom.org/osmo-gsm-manuals/tree/debian/control?id=ee37483661e1792ec0d2cee2a85f69ff7a1d136a#n18 Apparently even debian 10 (buster) ships that old version: https://packages.debian.org/search?keywords=python3%2Dnwdiag How do the build failures look like? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Gerrit-Change-Number: 22624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 02 Feb 2021 07:46:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 07:47:18 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 07:47:18 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: install nwdiag using pip3 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22623 ) Change subject: debian-stretch-jenkins: install nwdiag using pip3 ...................................................................... Patch Set 1: Verified-1 See other comment: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624/1#message-ce3342327356839c9751e9fd7f103f80ededa229 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5f7d7a343ff773b2c936cb7e650f166fed69671d Gerrit-Change-Number: 22623 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 02 Feb 2021 07:47:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 10:27:46 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 2 Feb 2021 10:27:46 +0000 Subject: Change in libosmocore[master]: gprs_ns2: prevent division by zero in load_sharing References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22625 ) Change subject: gprs_ns2: prevent division by zero in load_sharing ...................................................................... gprs_ns2: prevent division by zero in load_sharing Check if the NSE is alive before passing UNITDATA to the load sharing. Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 --- M src/gb/gprs_ns2.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/22625/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 7093a9d..aa5df91 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -365,9 +365,13 @@ uint32_t load_selector) { struct gprs_ns2_vc *tmp; - uint32_t mod = (bvci + load_selector) % nse->nsvc_count; + uint32_t mod; uint32_t i = 0; + if (nse->nsvc_count == 0) + return NULL; + + mod = (bvci + load_selector) % nse->nsvc_count; llist_for_each_entry(tmp, &nse->nsvc, list) { if (!ns2_vc_is_unblocked(tmp)) continue; @@ -457,6 +461,9 @@ if (!nse) return -EINVAL; + if (!nse->alive) + return 0; + nsvc = ns2_load_sharing(nse, bvci, nsp->u.unitdata.link_selector); /* TODO: send a status primitive back */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Gerrit-Change-Number: 22625 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 10:27:47 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 2 Feb 2021 10:27:47 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add bind vty exclude-sns-configuration References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22626 ) Change subject: gprs_ns2: add bind vty exclude-sns-configuration ...................................................................... gprs_ns2: add bind vty exclude-sns-configuration Allow to exclude a udp bind from SNS configuration when connecting to a SGSN. Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 --- M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 3 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/22626/1 diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 2584a03..fb91395 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -253,6 +253,8 @@ bool accept_ipaccess; bool accept_sns; + /*! if true, this bind will *not* be used when connecting to a SGSN with dynamic configurating IP-SNS */ + bool exclude_ip_sns_configuration; /*! transfer capability in mbit */ int transfer_capability; diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 427a153..2a934d7 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -279,6 +279,9 @@ llist_for_each_entry(bind, &nsi->binding, list) { if (bind->ll != GPRS_NS2_LL_UDP) continue; + + if (!bind->exclude_ip_sns_configuration) + continue; /* ignore failed connection */ nsvc = gprs_ns2_ip_connect_inactive(bind, remote, diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 5d0f5c0..af93f44 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -66,6 +66,7 @@ int dscp; bool accept_ipaccess; bool accept_sns; + bool exclude_ip_sns_configuration; }; /* TODO: this should into osmo timer */ @@ -325,6 +326,8 @@ } if (vbind->accept_ipaccess) vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); + if (vbind->exclude_ip_sns_configuration) + vty_out(vty, " exclude-sns-configuration%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); break; @@ -587,6 +590,51 @@ return CMD_SUCCESS; } +DEFUN(cfg_ns_bind_sns_configuration, cfg_ns_bind_sns_configuration_cmd, + "exclude-sns-configuration", + "Exclude this bind from SNS configuration when connecting to a SGSN\n" + ) +{ + struct vty_bind *vbind = vty->index; + struct gprs_ns2_vc_bind *bind; + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "exclude-sns-configuration can be only used with UDP binds%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + vbind->exclude_ip_sns_configuration = true; + bind = gprs_ns2_bind_by_name(vty_nsi, vbind->name); + if (bind) + bind->exclude_ip_sns_configuration = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_ns_bind_sns_configuration, cfg_no_ns_bind_sns_configuration_cmd, + "no exclude-sns-configuration", + NO_STR + "Include this bind from SNS configuration when connecting to a SGSN\n" + ) +{ + struct vty_bind *vbind = vty->index; + struct gprs_ns2_vc_bind *bind; + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "exclude-sns-configuration can be only used with UDP binds%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + vbind->exclude_ip_sns_configuration = false; + bind = gprs_ns2_bind_by_name(vty_nsi, vbind->name); + if (bind) + bind->exclude_ip_sns_configuration = false; + + return CMD_SUCCESS; +} + DEFUN(cfg_no_ns_bind_ipaccess, cfg_no_ns_bind_ipaccess_cmd, "no accept-ipaccess", NO_STR @@ -1688,6 +1736,8 @@ install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_ipaccess_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_fr_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_fr_cmd); + install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_sns_configuration_cmd); + install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_sns_configuration_cmd); /* TODO: accept-ip-sns when SGSN SNS has been implemented */ install_node(&ns_nse_node, NULL); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 Gerrit-Change-Number: 22626 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 10:49:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 10:49:48 +0000 Subject: Change in libosmocore[master]: gprs_ns2: prevent division by zero in load_sharing In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22625 ) Change subject: gprs_ns2: prevent division by zero in load_sharing ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Gerrit-Change-Number: 22625 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 10:49:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 10:50:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 10:50:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add bind vty exclude-sns-configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22626 ) Change subject: gprs_ns2: add bind vty exclude-sns-configuration ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22626/2/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22626/2/src/gb/gprs_ns2_sns.c at 283 PS2, Line 283: if (!bind->exclude_ip_sns_configuration) Shouldn't this condition be the opposite? if exclude, then continue (aka don't use it). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 Gerrit-Change-Number: 22626 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 10:50:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 10:55:26 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 2 Feb 2021 10:55:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add bind vty exclude-sns-configuration In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22626 ) Change subject: gprs_ns2: add bind vty exclude-sns-configuration ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22626/2/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22626/2/src/gb/gprs_ns2_sns.c at 283 PS2, Line 283: if (!bind->exclude_ip_sns_configuration) > Shouldn't this condition be the opposite? if exclude, then continue (aka don't use it). Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 Gerrit-Change-Number: 22626 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 10:55:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 10:55:38 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 2 Feb 2021 10:55:38 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add bind vty exclude-sns-configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22626 to look at the new patch set (#3). Change subject: gprs_ns2: add bind vty exclude-sns-configuration ...................................................................... gprs_ns2: add bind vty exclude-sns-configuration Allow to exclude a udp bind from SNS configuration when connecting to a SGSN. Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 --- M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 3 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/22626/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 Gerrit-Change-Number: 22626 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:17:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 11:17:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: pcu: ACK Pkt Cell Change Continue References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 ) Change subject: WIP: pcu: ACK Pkt Cell Change Continue ...................................................................... WIP: pcu: ACK Pkt Cell Change Continue Related: OS#4909 Change-Id: I73aaa80e73b2abb06fd0084433122337dc9c4e3f --- M pcu/PCU_Tests.ttcn 1 file changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/22627/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index e44e204..1d4e129 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3597,10 +3597,9 @@ f_shutdown(__BFILE__, __LINE__, final := true); } -private function f_skip_dummy(integer max_num_iter) +private function f_skip_dummy(integer max_num_iter, out uint32_t sched_fn) runs on RAW_PCU_Test_CT return RlcmacDlBlock { var RlcmacDlBlock dl_block; - var uint32_t sched_fn; var integer i := 0; while (true) { f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -3628,7 +3627,7 @@ var octetstring exp_si_chunk; var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; - dl_block := f_skip_dummy(50); + dl_block := f_skip_dummy(50, sched_fn); while (true) { var template RlcmacDlCtrlMsg exp_msg; exp_msg := @@ -3745,7 +3744,11 @@ setverdict(fail, "Rx unexpected DL block: ", dl_block); f_shutdown(__BFILE__, __LINE__); } - + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } } /* Verify PCU handles outbound Network Assisted Cell Change Cell Change (NACC, TS 44.060 sec 8.8). */ @@ -3936,11 +3939,16 @@ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } @@ -4000,11 +4008,16 @@ f_ctrl_exp_get(IPA_CTRL, ctrl_var, omit); /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } @@ -4064,11 +4077,16 @@ f_ctrl_exp_get(IPA_CTRL, ctrl_var, "foobar-error"); /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } @@ -4143,11 +4161,16 @@ /* We never answer the RIM procude -> PCU timeouts and should send Pkt Cell Chg continue */ /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 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: I73aaa80e73b2abb06fd0084433122337dc9c4e3f Gerrit-Change-Number: 22627 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:17:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 11:17:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack ...................................................................... pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack Related: OS#4909 Change-Id: I371033604db8ae845e7c3fb03aef1821520064d9 --- M pcu/PCU_Tests.ttcn 1 file changed, 59 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/22628/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 1d4e129..5f44e57 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3685,7 +3685,8 @@ /* Start NACC from MS side */ private function f_outbound_nacc_success(inout GprsMS ms, PCUIF_info_ind info_ind, - boolean exp_rac_ci_query := true, boolean exp_si_query := true) + boolean exp_rac_ci_query := true, boolean exp_si_query := true, + boolean skip_final_ctrl_ack := false) runs on RAW_PCU_Test_CT { var template (value) RlcmacUlCtrlMsg cell_chf_notif; var RlcmacDlBlock dl_block; @@ -3745,7 +3746,7 @@ f_shutdown(__BFILE__, __LINE__); } /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ - if (dl_block.ctrl.mac_hdr.rrbp_valid) { + if (not skip_final_ctrl_ack and dl_block.ctrl.mac_hdr.rrbp_valid) { sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); } @@ -3792,6 +3793,61 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Verify Pkt Cell Change Continue is retransmitted if not CTRL ACKed */ +testcase TC_nacc_outbound_success_no_ctrl_ack() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var MultislotCap_GPRS mscap_gprs := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B + }; + var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side, avoid sending final CTRL ACK */ + f_outbound_nacc_success(ms, info_ind, skip_final_ctrl_ack := true); + + /* Wait until we receive something non-dummy */ + dl_block := f_skip_dummy(0, sched_fn); + /* Make sure it is a Pkt Cell Chg Continue (retransmitted)*/ + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Verify PCU handles outbound Network Assisted Cell Change Cell Change (NACC, TS 44.060 sec 8.8) twice, the second time using the caches */ testcase TC_nacc_outbound_success_twice() runs on RAW_PCU_Test_CT { var PollFnCtx pollctx; @@ -4249,6 +4305,7 @@ execute( TC_pcuif_info_ind_subsequent() ); execute( TC_nacc_outbound_success() ); + execute( TC_nacc_outbound_success_no_ctrl_ack() ); execute( TC_nacc_outbound_success_twice() ); execute( TC_nacc_outbound_success_twice_nocache() ); execute( TC_nacc_outbound_rac_ci_resolve_conn_refused() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 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: I371033604db8ae845e7c3fb03aef1821520064d9 Gerrit-Change-Number: 22628 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:18:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 11:18:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: ACK Pkt Cell Change Continue In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 ) Change subject: pcu: ACK Pkt Cell Change Continue ...................................................................... pcu: ACK Pkt Cell Change Continue Related: OS#4909 Change-Id: I73aaa80e73b2abb06fd0084433122337dc9c4e3f --- M pcu/PCU_Tests.ttcn 1 file changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/22627/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 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: I73aaa80e73b2abb06fd0084433122337dc9c4e3f Gerrit-Change-Number: 22627 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:18:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 11:18:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack ...................................................................... pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack Related: OS#4909 Change-Id: I371033604db8ae845e7c3fb03aef1821520064d9 --- M pcu/PCU_Tests.ttcn 1 file changed, 59 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/22628/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 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: I371033604db8ae845e7c3fb03aef1821520064d9 Gerrit-Change-Number: 22628 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:22:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 11:22:32 +0000 Subject: Change in osmo-pcu[master]: nacc: Implement Pkt Cell Change Continue retransmission In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: nacc: Implement Pkt Cell Change Continue retransmission ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 11:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:30:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:30:52 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 9: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22368/9/include/osmocom/pcu/pcuif_proto.h File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/9/include/osmocom/pcu/pcuif_proto.h at 9 PS9, Line 9: #defi did we want to increase the PCU_IF_VERSION despite not introducing any incompatible changes? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:30:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:33:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:33:29 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:33:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:33:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:33:38 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:33:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:34:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:34:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 ) Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:34:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:35:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:35:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:35:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:36:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:36:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:36:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:48 +0000 Subject: Change in libosmocore[master]: frame_relay: Add status call-backs for link + DLC status changes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22575 ) Change subject: frame_relay: Add status call-backs for link + DLC status changes ...................................................................... frame_relay: Add status call-backs for link + DLC status changes Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Related: Os#4999 --- M include/osmocom/gprs/frame_relay.h M src/gb/frame_relay.c M src/gb/gprs_ns2_fr.c 3 files changed, 40 insertions(+), 16 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/frame_relay.h b/include/osmocom/gprs/frame_relay.h index 2860c6b..1be37ee 100644 --- a/include/osmocom/gprs/frame_relay.h +++ b/include/osmocom/gprs/frame_relay.h @@ -87,11 +87,15 @@ /* list of data link connections at this link */ struct llist_head dlc_list; + /* optional call-back to be called for each PDU received on an unknown DLC */ int (*unknown_dlc_rx_cb)(void *cb_data, struct msgb *msg); void *unknown_dlc_rx_cb_data; + /* call-back to be called for transmitting on the underlying hardware */ int (*tx_cb)(void *data, struct msgb *msg); - void *tx_cb_data; + /* optional call-back to be called each time the status changes active/inactive */ + void (*status_cb)(struct osmo_fr_link *link, void *cb_data, bool active); + void *cb_data; }; /* Frame Relay Data Link Connection */ @@ -113,8 +117,11 @@ * NET must wait until USER confirms it implicitly by a seq number check */ bool state_send; + /* call-back to be called for each PDU received on this DLC */ int (*rx_cb)(void *cb_data, struct msgb *msg); - void *rx_cb_data; + /* optional call-back to be called each time the status changes active/inactive */ + void (*status_cb)(struct osmo_fr_dlc *dlc, void *cb_data, bool active); + void *cb_data; }; /* allocate a frame relay network */ diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 03b847a..a7e1da8 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -189,6 +189,18 @@ hdr[1] = ((dlci << 4) & 0xF0) | 0x01; } +static void dlc_set_active(struct osmo_fr_dlc *dlc, bool active) +{ + if (active == dlc->active) + return; + + dlc->active = active; + + LOGPFRL(dlc->link, LOGL_NOTICE, "DLCI %u became %s\n", dlc->dlci, active ? "active" : "inactive"); + if (dlc->status_cb) + dlc->status_cb(dlc, dlc->cb_data, active); +} + /* allocate a message buffer and put Q.933 Annex A headers (L2 + L3) */ static struct msgb *q933_msgb_alloc(uint16_t dlci, uint8_t prot_disc, uint8_t msg_type) { @@ -285,7 +297,7 @@ msgb_tlv_put(resp, Q933_IEI_REPORT_TYPE, 1, &rep_type); msgb_put_link_int_verif(resp, link); - return link->tx_cb(link->tx_cb_data, resp); + return link->tx_cb(link->cb_data, resp); } /* Send a Q.933 STATUS of given type over given link */ @@ -327,7 +339,7 @@ break; } - return link->tx_cb(link->tx_cb_data, resp); + return link->tx_cb(link->cb_data, resp); } @@ -369,7 +381,7 @@ continue; if (dlc->add) { - dlc->active = link->state; + dlc_set_active(dlc, link->state); dlc->add = false; } @@ -417,11 +429,11 @@ LOGPFRL(link, LOGL_NOTICE, "Link failed\n"); link->state = false; - if (link->role == FR_ROLE_USER_EQUIPMENT) - return; + if (link->status_cb) + link->status_cb(link, link->cb_data, link->state); llist_for_each_entry(dlc, &link->dlc_list, list) { - dlc->active = false; + dlc_set_active(dlc, false); } } else { /* good link */ @@ -430,16 +442,21 @@ LOGPFRL(link, LOGL_NOTICE, "Link recovered\n"); link->state = true; + if (link->status_cb) + link->status_cb(link, link->cb_data, link->state); + if (link->role == FR_ROLE_USER_EQUIPMENT) { /* make sure the next STATUS ENQUIRY is for a full * status report to get the configred DLCs ASAP */ link->polling_count = 0; + /* we must not proceed further below if we're in user role, + * as otherwise link recovery would set all DLCs as active */ return; } llist_for_each_entry(dlc, &link->dlc_list, list) { if (!dlc->add && !dlc->del) - dlc->active = true; + dlc_set_active(dlc, true); } } } @@ -508,7 +525,7 @@ * using the optional single PVC asynchronous status report. * Ignoring the delete. */ dlc->add = pvc->new; - dlc->active = pvc->active; + dlc_set_active(dlc, pvc->active); dlc->del = 0; } @@ -523,7 +540,7 @@ } if (!found) { - dlc->active = false; + dlc_set_active(dlc, false); dlc->del = true; } } @@ -575,7 +592,7 @@ dlc->del = 1; } else { dlc->add = pvc->new; - dlc->active = pvc->active; + dlc_set_active(dlc, pvc->active); dlc->del = 0; } } @@ -771,7 +788,7 @@ if (dlc->dlci == dlci) { /* dispatch to handler of respective DLC */ msg->dst = dlc; - return dlc->rx_cb(dlc->rx_cb_data, msg); + return dlc->rx_cb(dlc->cb_data, msg); } } @@ -816,7 +833,7 @@ dlci_to_q922(frh, dlc->dlci); msg->dst = link; - return link->tx_cb(link->tx_cb_data, msg); + return link->tx_cb(link->cb_data, msg); } /* Every T391 seconds, the user equipment sends a STATUS ENQUIRY diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 49e92ae..b5ddf7e 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -198,7 +198,7 @@ return NULL; } - priv->dlc->rx_cb_data = nsvc; + priv->dlc->cb_data = nsvc; priv->dlc->rx_cb = fr_dlci_rx_cb; return priv; @@ -756,7 +756,7 @@ } fr_link->tx_cb = fr_tx_cb; - fr_link->tx_cb_data = bind; + fr_link->cb_data = bind; priv->link = fr_link; priv->ifindex = rc = devname2ifindex(netif); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a Gerrit-Change-Number: 22575 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:49 +0000 Subject: Change in libosmocore[master]: frame_relay: Discard received messages for DLC not yet active In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22576 ) Change subject: frame_relay: Discard received messages for DLC not yet active ...................................................................... frame_relay: Discard received messages for DLC not yet active If we receive messages for a DLC which has not yet reported as being available by Q.933 LMI, drop the incoming message. Otherwise we would dispatch it to the user, and the user wants to respond - but then we reject the transmission due to the inactive DLC. Change-Id: Ia4a045fdf165b526f429f4617e0fdc76036480bd Related: OS#4999 --- M src/gb/frame_relay.c 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index a7e1da8..e9436fe 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -784,19 +784,22 @@ goto out; } - llist_for_each_entry(dlc, &link->dlc_list, list) { - if (dlc->dlci == dlci) { + dlc = osmo_fr_dlc_by_dlci(link, dlci); + if (dlc) { + if (dlc->active) { /* dispatch to handler of respective DLC */ msg->dst = dlc; return dlc->rx_cb(dlc->cb_data, msg); + } else { + LOGPFRL(link, LOGL_NOTICE, "DLCI %u not yet active, discarding\n", dlci); } + } else { + if (link->unknown_dlc_rx_cb) + return link->unknown_dlc_rx_cb(link->unknown_dlc_rx_cb_data, msg); + else + LOGPFRL(link, LOGL_NOTICE, "DLCI %u doesn't exist, discarding\n", dlci); } - if (link->unknown_dlc_rx_cb) - return link->unknown_dlc_rx_cb(link->unknown_dlc_rx_cb_data, msg); - else - LOGPFRL(link, LOGL_NOTICE, "DLCI %u doesn't exist, discarding\n", dlci); - out: msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia4a045fdf165b526f429f4617e0fdc76036480bd Gerrit-Change-Number: 22576 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:49 +0000 Subject: Change in libosmocore[master]: frame_relay: cosmetic: Unify log syntax when discarding Rx packets In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22577 ) Change subject: frame_relay: cosmetic: Unify log syntax when discarding Rx packets ...................................................................... frame_relay: cosmetic: Unify log syntax when discarding Rx packets Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 --- M src/gb/frame_relay.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index e9436fe..ff97a17 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -791,13 +791,13 @@ msg->dst = dlc; return dlc->rx_cb(dlc->cb_data, msg); } else { - LOGPFRL(link, LOGL_NOTICE, "DLCI %u not yet active, discarding\n", dlci); + LOGPFRL(link, LOGL_NOTICE, "DLCI %u not yet active. Discarding Rx PDU\n", dlci); } } else { if (link->unknown_dlc_rx_cb) return link->unknown_dlc_rx_cb(link->unknown_dlc_rx_cb_data, msg); else - LOGPFRL(link, LOGL_NOTICE, "DLCI %u doesn't exist, discarding\n", dlci); + LOGPFRL(link, LOGL_NOTICE, "DLCI %u doesn't exist. Discarding Rx PDU\n", dlci); } out: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09d035e38b41be9d6ac5e16da7fb113286c77d29 Gerrit-Change-Number: 22577 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:50 +0000 Subject: Change in libosmocore[master]: ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22578 ) Change subject: ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED ...................................................................... ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED There are use cases in which the NS-VC FSM should go back to unconfigured _without_ being re-started immediately. Let's permit the caller to do that. Change-Id: I31fe695a83d38ea1f10f5444e840633d7fa68442 --- M src/gb/gprs_ns2_vc_fsm.c M src/gb/gprs_ns2_vty.c 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index a6e49e6..c77bc4d 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -634,7 +634,6 @@ if (fi->state != GPRS_NS2_ST_UNCONFIGURED) { /* Force the NSVC back to its initial state */ osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNCONFIGURED, 0, 0); - osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_REQ_START, NULL); return; } break; diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 5d0f5c0..a3aa6ee 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1484,6 +1484,7 @@ static int nsvc_force_unconf_cb(struct gprs_ns2_vc *nsvc, void *ctx) { ns2_vc_force_unconfigured(nsvc); + ns2_vc_fsm_start(nsvc); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31fe695a83d38ea1f10f5444e840633d7fa68442 Gerrit-Change-Number: 22578 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:51 +0000 Subject: Change in libosmocore[master]: ns2: Stop test procedure when going into unconfigured state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22579 ) Change subject: ns2: Stop test procedure when going into unconfigured state ...................................................................... ns2: Stop test procedure when going into unconfigured state When we're unconfigured and not yet started, we should not transmit NS-ALIVE. Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Related: OS#4999 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index c77bc4d..f4c4e46 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -225,6 +225,12 @@ } } + +static void ns2_st_unconfigured_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + stop_test_procedure(fi->priv); +} + static void ns2_st_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gprs_ns2_vc_priv *priv = fi->priv; @@ -433,6 +439,7 @@ .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE), .name = "UNCONFIGURED", .action = ns2_st_unconfigured, + .onenter = ns2_st_unconfigured_onenter, }, [GPRS_NS2_ST_RESET] = { .in_event_mask = S(GPRS_NS2_EV_RX_RESET_ACK) | S(GPRS_NS2_EV_RX_RESET), -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida3685e42a753899f1bf177eefcc23352ec7440d Gerrit-Change-Number: 22579 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:51 +0000 Subject: Change in libosmocore[master]: ns2: Don't start sending NS-RESET until FR DLC is available In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22580 ) Change subject: ns2: Don't start sending NS-RESET until FR DLC is available ...................................................................... ns2: Don't start sending NS-RESET until FR DLC is available There's no point in sending NS-RESET (or any other) messages to the underlying FR layer if the FR DLC has not been marked as available/active yet. Change-Id: Id4e7565ba166ca1d12f8800c643d9f2bc4d66873 Closes: OS#4999 --- M src/gb/gprs_ns2_fr.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index b5ddf7e..fc6a5c4 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -179,6 +179,17 @@ talloc_free(priv); } +static void fr_dlci_status_cb(struct osmo_fr_dlc *dlc, void *cb_data, bool active) +{ + struct gprs_ns2_vc *nsvc = cb_data; + + if (active) { + ns2_vc_fsm_start(nsvc); + } else { + ns2_vc_force_unconfigured(nsvc); + } +} + static struct priv_vc *fr_alloc_vc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_vc *nsvc, uint16_t dlci) @@ -200,6 +211,7 @@ priv->dlc->cb_data = nsvc; priv->dlc->rx_cb = fr_dlci_rx_cb; + priv->dlc->status_cb = fr_dlci_status_cb; return priv; } @@ -899,8 +911,6 @@ nsvc->nsvci = nsvci; nsvc->nsvci_is_valid = true; - ns2_vc_fsm_start(nsvc); - return nsvc; err: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id4e7565ba166ca1d12f8800c643d9f2bc4d66873 Gerrit-Change-Number: 22580 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:37:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:37:52 +0000 Subject: Change in libosmocore[master]: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22572 ) Change subject: osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets ...................................................................... osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda --- M utils/osmo-ns-dummy-vty.c M utils/osmo-ns-dummy.c 2 files changed, 44 insertions(+), 10 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/utils/osmo-ns-dummy-vty.c b/utils/osmo-ns-dummy-vty.c index 1b7ce1c..f4a270c 100644 --- a/utils/osmo-ns-dummy-vty.c +++ b/utils/osmo-ns-dummy-vty.c @@ -46,8 +46,9 @@ #include #include -static struct gprs_ns2_inst *g_nsi; +extern struct gprs_ns2_inst *g_nsi; static struct llist_head g_ns_traf_gens = LLIST_HEAD_INIT(g_ns_traf_gens); +int g_mirror_mode; /* one NS traffic generator instance. You can have as many of these as you want, * just as long as they have unique names */ @@ -167,6 +168,7 @@ vty_out(vty, " lsp %u%s", ntg->cfg.lsp, VTY_NEWLINE); vty_out(vty, " lsp-mode %s%s", ntg->cfg.lsp_randomize ? "randomized" : "fixed", VTY_NEWLINE); } + vty_out(vty, "mirror-mode %s%s", g_mirror_mode ? "enable" : "disable", VTY_NEWLINE); return 0; } @@ -288,12 +290,26 @@ return CMD_SUCCESS; } -int nsdummy_vty_init(struct gprs_ns2_inst *nsi) +DEFUN(mirror_mode, mirror_mode_cmd, + "mirror-mode (enable|disable)", + "Configure mirroring of incoming NS-UNITDATA\n" + "Enable mirroring of incoming NS-UNITDATA\n" + "Disable mirroring of incoming NS-UNITDATA\n") { - g_nsi = nsi; + if (!strcmp(argv[0], "enable")) + g_mirror_mode = true; + else + g_mirror_mode = false; + return CMD_SUCCESS; +} + + +int nsdummy_vty_init(void) +{ /* configuration of traffic generators via CONFIG / NTG node */ install_element(CONFIG_NODE, &gen_traffic_cmd); + install_element(CONFIG_NODE, &mirror_mode_cmd); install_node(&ntg_node, config_write_ntg); install_element(NTG_NODE, &ntg_nsei_cmd); install_element(NTG_NODE, &ntg_bvci_cmd); diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c index 4b93788..ee7f591 100644 --- a/utils/osmo-ns-dummy.c +++ b/utils/osmo-ns-dummy.c @@ -28,6 +28,7 @@ static bool daemonize = false; static int vty_port = 0; static char *config_file = NULL; +struct gprs_ns2_inst *g_nsi; static const char vty_copyright[] = "Copyright (C) 2020 by by sysmocom - s.f.m.c. GmbH\r\n" @@ -185,9 +186,27 @@ } } +extern int g_mirror_mode; + /* called by the ns layer */ int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { + struct osmo_gprs_ns2_prim *nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph); + + switch (oph->primitive) { + case GPRS_NS2_PRIM_UNIT_DATA: + if (g_mirror_mode) { + /* simply switch indication->request and resubmit */ + oph->operation = PRIM_OP_REQUEST; + msgb_pull_to_l3(oph->msg); + nsp->u.unitdata.link_selector = rand(); /* ensure random distribution */ + return gprs_ns2_recv_prim(g_nsi, oph); + } + break; + default: + break; + } + if (oph->msg) msgb_free(oph->msg); @@ -199,12 +218,11 @@ return 0; } -extern int nsdummy_vty_init(struct gprs_ns2_inst *nsi); +extern int nsdummy_vty_init(void); int main (int argc, char *argv[]) { void *ctx = tall_nsdummy_ctx = talloc_named_const(NULL, 0, "osmo-ns-dummy"); - struct gprs_ns2_inst *nsi; int rc = 0; osmo_init_logging2(ctx, &log_info); @@ -224,14 +242,14 @@ handle_options(argc, argv); - nsi = gprs_ns2_instantiate(ctx, gprs_ns_prim_cb, NULL); - if (!nsi) { + g_nsi = gprs_ns2_instantiate(ctx, gprs_ns_prim_cb, NULL); + if (!g_nsi) { LOGP(DLNS, LOGL_ERROR, "Failed to create NS instance\n"); exit(1); } - gprs_ns2_vty_init(nsi); - nsdummy_vty_init(nsi); + gprs_ns2_vty_init(g_nsi); + nsdummy_vty_init(); rc = vty_read_config_file(config_file, NULL); if (rc < 0 && config_given) { fprintf(stderr, "Failed to parse the config file: '%s'\n", @@ -270,7 +288,7 @@ } telnet_exit(); - gprs_ns2_free(nsi); + gprs_ns2_free(g_nsi); talloc_report_full(tall_nsdummy_ctx, stderr); talloc_free(tall_nsdummy_ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If57bfdeb390d88d1ea058f7a9ce0403e64a5beda Gerrit-Change-Number: 22572 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:39:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:39:06 +0000 Subject: Change in libosmocore[master]: gprs_ns2: prevent division by zero in load_sharing In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#3) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/22625 ) Change subject: gprs_ns2: prevent division by zero in load_sharing ...................................................................... gprs_ns2: prevent division by zero in load_sharing Check if the NSE is alive before passing UNITDATA to the load sharing. Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Fixes: OS#4996 --- M src/gb/gprs_ns2.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/22625/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Gerrit-Change-Number: 22625 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:39:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:39:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2: prevent division by zero in load_sharing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22625 ) Change subject: gprs_ns2: prevent division by zero in load_sharing ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Gerrit-Change-Number: 22625 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 11:39:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:39:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:39:30 +0000 Subject: Change in libosmocore[master]: gprs_ns2: prevent division by zero in load_sharing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22625 ) Change subject: gprs_ns2: prevent division by zero in load_sharing ...................................................................... gprs_ns2: prevent division by zero in load_sharing Check if the NSE is alive before passing UNITDATA to the load sharing. Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Fixes: OS#4996 --- M src/gb/gprs_ns2.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 1cf2335..de27fb4 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -365,9 +365,13 @@ uint32_t load_selector) { struct gprs_ns2_vc *tmp; - uint32_t mod = (bvci + load_selector) % nse->nsvc_count; + uint32_t mod; uint32_t i = 0; + if (nse->nsvc_count == 0) + return NULL; + + mod = (bvci + load_selector) % nse->nsvc_count; llist_for_each_entry(tmp, &nse->nsvc, list) { if (!ns2_vc_is_unblocked(tmp)) continue; @@ -457,6 +461,9 @@ if (!nse) return -EINVAL; + if (!nse->alive) + return 0; + nsvc = ns2_load_sharing(nse, bvci, nsp->u.unitdata.link_selector); /* TODO: send a status primitive back */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e2a59bec9b72f74eb64510a2e1ad60486694a55 Gerrit-Change-Number: 22625 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:40:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:40:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_twice_nocache In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22497 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_twice_nocache ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22497 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: I64369eb02fa611f9249696ffe249b0d6d917fa70 Gerrit-Change-Number: 22497 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 11:40:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:40:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:40:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: ACK Pkt Cell Change Continue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 ) Change subject: pcu: ACK Pkt Cell Change Continue ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 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: I73aaa80e73b2abb06fd0084433122337dc9c4e3f Gerrit-Change-Number: 22627 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 11:40:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:40:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:40:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 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: I371033604db8ae845e7c3fb03aef1821520064d9 Gerrit-Change-Number: 22628 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 11:40:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:42:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 11:42:23 +0000 Subject: Change in osmo-pcu[master]: nacc: Implement Pkt Cell Change Continue retransmission In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: nacc: Implement Pkt Cell Change Continue retransmission ...................................................................... Patch Set 5: Code-Review+1 conceptual question: Does this implicitly mean that any (optional) SI messages we transmitted meanwhile also are ackonwledged? All of those increment the sequence nubmer and now since we wait for an ACK on the last message (Cell Change Continue), we know it all worked out? Just curious. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 11:42:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 11:43:42 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 11:43:42 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: WIP RIM support In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22314 ) Change subject: gbproxy: WIP RIM support ...................................................................... Patch Set 2: (3 comments) Addressed outstanding issues from here in osmo-gbproxy branch daniel/rim https://gerrit.osmocom.org/c/osmo-sgsn/+/22314/2/src/gbproxy/gb_proxy.c File src/gbproxy/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/22314/2/src/gbproxy/gb_proxy.c at 953 PS2, Line 953: insure > ensure Done https://gerrit.osmocom.org/c/osmo-sgsn/+/22314/2/src/gbproxy/gb_proxy.c at 969 PS2, Line 969: } > Definitely, gbproxy should simply forward anything != GERAN to the SGSN and let the SGSN deal with i [?] Done https://gerrit.osmocom.org/c/osmo-sgsn/+/22314/2/src/gbproxy/gb_proxy.c at 1275 PS2, Line 1275: insure > "ensure". [?] ACK, copypasta from sgsn2bss -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22314 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 11:43:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:00:26 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 12:00:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add bind vty exclude-sns-configuration In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22626 ) Change subject: gprs_ns2: add bind vty exclude-sns-configuration ...................................................................... Patch Set 3: Code-Review-1 As mentioned in SYS#5354 I think this misses configurations where where we have multiple IP-SNS NSE that require different binds: * SGSNs on different networks * BSS and SGSN both using IP-SNS * BSS with IP-SNS on different networks/binds -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 Gerrit-Change-Number: 22626 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 12:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:18:23 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 12:18:23 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: fix gcc 4 + -std=gnu11 error References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_msg: fix gcc 4 + -std=gnu11 error ...................................................................... xua_msg: fix gcc 4 + -std=gnu11 error Fix 'error: initializer element is not constant' with debian 8's gcc 4.9.2, triggered by XUA_HDR. Create a new _XUA_HDR without the type cast, and use it inside of const struct definitions (xua_test.c). The new macro is needed, because removing the type cast from the original XUA_HDR would break other uses. Related: OS#5004 Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 --- M include/osmocom/sigtran/xua_msg.h M tests/xua/xua_test.c 2 files changed, 15 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/29/22629/1 diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index e912e02..749d158 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -22,7 +22,10 @@ #include #include -#define XUA_HDR(class, type) ((struct xua_common_hdr) { .spare = 0, .msg_class = (class), .msg_type = (type) }) +/* GCC-4 errors with 'initializer element is not constant' if using XUA_HDR + * inside a const struct (OS#5004) */ +#define _XUA_HDR(class, type) { .spare = 0, .msg_class = (class), .msg_type = (type) } +#define XUA_HDR(class, type) ((struct xua_common_hdr) _XUA_HDR(class, type)) struct msgb; struct osmo_sccp_addr; diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 77daa56..4f2c96c 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -384,7 +384,7 @@ .name = "BSSMAP-RESET", .sccp = PANDSIZ(bssmap_reset), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), @@ -395,7 +395,7 @@ .name = "BSSMAP-RESET-ACK", .sccp = PANDSIZ(bssmap_reset_ack), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), @@ -406,7 +406,7 @@ .name = "BSSMAP-PAGING", .sccp = PANDSIZ(bssmap_paging), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), @@ -417,7 +417,7 @@ .name = "BSSMAP-UDT", .sccp = PANDSIZ(bssmap_udt), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), @@ -428,7 +428,7 @@ .name = "BSSMAP-CR", .sccp = PANDSIZ(bssmap_cr), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc), @@ -439,7 +439,7 @@ .name = "BSSMAP-CC", .sccp = PANDSIZ(bssmap_cc), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), @@ -450,7 +450,7 @@ .name = "BSSMAP-DTAP", .sccp = PANDSIZ(bssmap_dtap), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), .parts = { PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), }, @@ -459,7 +459,7 @@ .name = "BSSMAP-CLEAR", .sccp = PANDSIZ(bssmap_clear), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), .parts = { PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), }, @@ -468,7 +468,7 @@ .name = "BSSMAP-RELEASED", .sccp = PANDSIZ(bssmap_released), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELRE), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_RELRE), .parts = { PARTU32(SUA_IEI_DEST_REF, &sua_loc_ref_msc), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc), @@ -479,7 +479,7 @@ .name = "BSSMAP-RELEASE_COMPLETE", .sccp = PANDSIZ(bssmap_release_complete), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO), .parts = { PARTU32(SUA_IEI_DEST_REF, &sua_loc_ref_bsc), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), @@ -489,7 +489,7 @@ .name = "TCAP", .sccp = PANDSIZ(tcap_global_title), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { }, }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:34:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 12:34:03 +0000 Subject: Change in osmo-bts[master]: common/measurement.c: fix gcc 4 + -std=gnu11 error References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22630 ) Change subject: common/measurement.c: fix gcc 4 + -std=gnu11 error ...................................................................... common/measurement.c: fix gcc 4 + -std=gnu11 error GCC-4 doesn't like static const struct foo bar = (struct foo)...: measurement.c:33:1: error: initializer element is not constant Related: OS#5004 Change-Id: Iec5a4006dfc90abe240fcf8b6c2fefd4f7071a70 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/30/22630/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 3813658..95d60f6 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -24,7 +24,7 @@ * the missing measurements */ #define MEASUREMENT_DUMMY_BER 10000 /* 100% BER */ #define MEASUREMENT_DUMMY_IRSSI 109 /* noise floor in -dBm */ -static const struct bts_ul_meas measurement_dummy = (struct bts_ul_meas) { +static const struct bts_ul_meas measurement_dummy = { .ber10k = MEASUREMENT_DUMMY_BER, .ta_offs_256bits = 0, .c_i = 0, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iec5a4006dfc90abe240fcf8b6c2fefd4f7071a70 Gerrit-Change-Number: 22630 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:38:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 12:38:41 +0000 Subject: Change in osmo-pcu[master]: nacc: Implement Pkt Cell Change Continue retransmission In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: nacc: Implement Pkt Cell Change Continue retransmission ...................................................................... Patch Set 5: > Patch Set 5: Code-Review+1 > > conceptual question: Does this implicitly mean that any (optional) SI messages we transmitted meanwhile also are ackonwledged? All of those increment the sequence nubmer and now since we wait for an ACK on the last message (Cell Change Continue), we know it all worked out? Just curious. There's no sequence number increment. Actually there's no BSN at all, since those are CTRL messages, not DATA messages, so the way to ACK them is to set the RRBP bit and wait to get a CTRL ACK at N+13 on the Uplink. That's what we do for the last Cell Change Continue, which is the one instructing the MS to go forward and change cell. We are NOT doing the same for the multiple Pkt Neighbor Cell Data, we are currently just sending them and hope they arrive well. If they don't arrive well, the MS may have partial information and then it will be instructed by the network (Cell Change Continue) to jump to the target cell. The MS will then do regular CS/PS attachment through the new cell. That's mostly the same scenario if we somehow fail to resolve the ARFCN+BSIC -> CGI-PS or CGI-PS -> System Information, we'll simply send the Cell Change Continue without previously sending any Pkt Neighbor Cell Data. That's OK according to specs, and it's basically "hey I noticed you want to move to that other cell because you have better signal there, and I failed to get its SI, but anyway continue and good luck with your new cell". In the other case (some Pkt Neigbhor Cell Data, SI being lost), it probably means the signal is already bad (CTRL messages are CS1), so I'd prioritize simply pushing forward quickly to tell the MS to move on. Moreover, requesting an ACK for each Pkt Neighbor Cell Data (several of them are needed to encode the 3 SI infos) would clog the uplink stealing possibilities for other MS to submit more interesting data. See TS 44.060 8.8.3 Cell Change Notification procedure: """ After receiving a PACKET CELL CHANGE NOTIFICATION message from the mobile station the network can behave in different ways as described below: 1) The network responds with a PACKET CELL CHANGE CONTINUE message. If a mobile station as response to a PACKET CELL CHANGE NOTIFICATION message receives a PACKET CELL CHANGE CONTINUE message without receiving any neighbour cell system information, the mobile station shall stop timer T3208, stop timer T3210 if still running, leave CCN mode and continue cell reselection in NC0/NC1 mode. """ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 12:38:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:41:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 12:41:02 +0000 Subject: Change in osmo-bts[master]: common/measurement.c: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22630 ) Change subject: common/measurement.c: fix gcc 4 + -std=gnu11 error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iec5a4006dfc90abe240fcf8b6c2fefd4f7071a70 Gerrit-Change-Number: 22630 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 12:41:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:43:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 12:43:43 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_msg: fix gcc 4 + -std=gnu11 error ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22629/1/include/osmocom/sigtran/xua_msg.h File include/osmocom/sigtran/xua_msg.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/22629/1/include/osmocom/sigtran/xua_msg.h at 27 PS1, Line 27: #define _XUA_HDR(class, type) { .spare = 0, .msg_class = (class), .msg_type = (type) } Sofyi, I think the difference here on whether to use the " = (type) {}" vs " = {}" is wheter you are assigning the value at the same ime you are declaring the variable, or whether you are assigning (copying) from another struct of the same type later on. I think those are really different uses, and the second one is most probably a gnu extension. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 12:43:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:47:16 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 12:47:16 +0000 Subject: Change in osmo-bts[master]: common/measurement.c: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22630 ) Change subject: common/measurement.c: fix gcc 4 + -std=gnu11 error ...................................................................... common/measurement.c: fix gcc 4 + -std=gnu11 error GCC-4 doesn't like static const struct foo bar = (struct foo)...: measurement.c:33:1: error: initializer element is not constant Related: OS#5004 Change-Id: Iec5a4006dfc90abe240fcf8b6c2fefd4f7071a70 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index 3813658..95d60f6 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -24,7 +24,7 @@ * the missing measurements */ #define MEASUREMENT_DUMMY_BER 10000 /* 100% BER */ #define MEASUREMENT_DUMMY_IRSSI 109 /* noise floor in -dBm */ -static const struct bts_ul_meas measurement_dummy = (struct bts_ul_meas) { +static const struct bts_ul_meas measurement_dummy = { .ber10k = MEASUREMENT_DUMMY_BER, .ta_offs_256bits = 0, .c_i = 0, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iec5a4006dfc90abe240fcf8b6c2fefd4f7071a70 Gerrit-Change-Number: 22630 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 12:48:43 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 12:48:43 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_msg: fix gcc 4 + -std=gnu11 error ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22629/1/include/osmocom/sigtran/xua_msg.h File include/osmocom/sigtran/xua_msg.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/22629/1/include/osmocom/sigtran/xua_msg.h at 27 PS1, Line 27: #define _XUA_HDR(class, type) { .spare = 0, .msg_class = (class), .msg_type = (type) } > Sofyi, I think the difference here on whether to use the " = (type) {}" vs " = {}" is wheter you are [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 12:48:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:08:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:08:04 +0000 Subject: Change in osmo-pcu[master]: nacc: Avoid RIM procedures targeting cells under same PCU References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22631 ) Change subject: nacc: Avoid RIM procedures targeting cells under same PCU ...................................................................... nacc: Avoid RIM procedures targeting cells under same PCU Now that we have the required System Information in osmo-pcu to craft the Packet Neigbour Cell Change packet for cells it controls, let's avoid starting a RIM procedure to gather the SI info, since the SGSN would end up routing the RIM request back at us and we'd answer back to ourselves. This same optimization cannot be done on the first step (CTRL Neighbor Resolution against BSC), because the PCU cannot know if the target ARFCN+BSIC requested by the MS is actually managed by a cell under the PCU or it's another cell managed by another external PCU, because ARFCN+BSIC keys can be resued among non-neighbor cells. Hence, it shall always ask the BSC since only it holds the information about neighboring cells. Related: OS#4909 Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b --- M doc/manuals/chapters/configuration.adoc M src/nacc_fsm.c 2 files changed, 55 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/22631/1 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 7371e72..01e4d65 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -236,9 +236,8 @@ their control, obtained through PCUIF when the BTS registers against OsmoPCU, so no specific user configuration is required here. -However, for remote neighbors (cells managed by another OsmoPCU instance), -OsmoPCU requires to gather the information from somewhere else before being able -to provide it to the MS requesting the NACC. +In general, OsmoPCU requires to gather the information from somewhere else +before being able to provide it to the MS requesting the NACC. If OsmoPCU fails to gather the System Information, it will simply answer the MS allowing the proposed changed but without previously providing the System @@ -280,13 +279,19 @@ ==== System Information Resolution Once OsmoPCU gains knowledge of the target cell's address in the Core Network, -it can query its System Information. The query is done using RIM procedures -(NACC RAN-INFO application) over the Gb interface against the SGSN that OsmoPCU -is connected to. In its turn, the SGSN will potentially forward this query to -the PCU serving the target cell, which will provide back the System Information -of that cell. +it can query its System Information. -The System Information received from remote neighbors are by default +OsmoPCU will gather the requested System Information of target cells under its +control without need for any external query, since the System Information of all +BTSs it manages are received over PCUIF and stored internally in OsmoPCU. + +For those targets cells not managed by the OsmoPCU instance, the query is +accomplished by using RIM procedures (NACC RAN-INFO application) over the Gb +interface against the SGSN that OsmoPCU is connected to. In its turn, the SGSN +will potentially forward this query to the PCU serving the target cell, which +will provide back the System Information of that cell. + +The System Information received from external PCUs over RIM are by default cached for a while in order to avoid querying the SGSN frequently and, as a result, optimizing the resolution time too. diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index b479f9c..6a92f83 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -268,6 +268,27 @@ return 0; } +#define SI_HDR_LEN 2 +static void bts_fill_si_cache_value(const struct gprs_rlcmac_bts *bts, struct si_cache_value *val) +{ + val->type_psi = false; + val->si_len = 0; + if (bts->si1_is_set) { + osmo_static_assert(sizeof(bts->si1) - SI_HDR_LEN == BSSGP_RIM_SI_LEN, _si1_header_size); + memcpy(&val->si_buf[val->si_len], bts->si1 + SI_HDR_LEN, BSSGP_RIM_SI_LEN); + val->si_len += BSSGP_RIM_SI_LEN; + } + if (bts->si3_is_set) { + osmo_static_assert(sizeof(bts->si3) - SI_HDR_LEN == BSSGP_RIM_SI_LEN, _si3_header_size); + memcpy(&val->si_buf[val->si_len], bts->si3 + SI_HDR_LEN, BSSGP_RIM_SI_LEN); + val->si_len += BSSGP_RIM_SI_LEN; + } + if (bts->si13_is_set) { + osmo_static_assert(sizeof(bts->si13) - SI_HDR_LEN == BSSGP_RIM_SI_LEN, _si13_header_size); + memcpy(&val->si_buf[val->si_len], bts->si13 + SI_HDR_LEN, BSSGP_RIM_SI_LEN); + val->si_len += BSSGP_RIM_SI_LEN; + } +} //////////////// // FSM states // @@ -382,8 +403,28 @@ struct gprs_pcu *pcu = bts->pcu; struct bssgp_ran_information_pdu pdu; const struct si_cache_value *si; + struct gprs_rlcmac_bts *bts_i; int rc; + /* First check if the CGI-PS addresses a cell managed by this PCU. If + * that's the case, we already have the info and there's no need to go + * the RIM way since we'd end up to this same PCU on the other end anyway. + */ + llist_for_each_entry(bts_i, &the_pcu->bts_list, list) { + if (bts_i == bts) /* Makes no sense targeting the same cell */ + continue; + if (osmo_cgi_ps_cmp(&ctx->cgi_ps, &bts_i->cgi_ps) != 0) + continue; + + LOGPFSML(fi, LOGL_DEBUG, "neighbor CGI-PS %s addresses local BTS %d\n", + osmo_cgi_ps_name(&ctx->cgi_ps), bts_i->nr); + bts_fill_si_cache_value(bts, &ctx->si_info); + /* Tell the PCU scheduler we are ready to go, from here one we + * are polled/driven by the scheduler */ + nacc_fsm_state_chg(fi, NACC_ST_TX_NEIGHBOUR_DATA); + return; + } + /* First check if we have SI info for the target cell in cache */ si = si_cache_lookup_value(pcu->si_cache, &ctx->cgi_ps); if (si) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b Gerrit-Change-Number: 22631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:08:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:08:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_twice_nocache In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22497 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_twice_nocache ...................................................................... pcu: Introduce test TC_nacc_outbound_success_twice_nocache Change-Id: I64369eb02fa611f9249696ffe249b0d6d917fa70 --- M pcu/PCU_Tests.ttcn 1 file changed, 54 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 6a78975..e44e204 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3836,6 +3836,59 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Verify PCU handles outbound Network Assisted Cell Change Cell Change (NACC, + * TS 44.060 sec 8.8) twice, the second time after caches timed out + */ +testcase TC_nacc_outbound_success_twice_nocache() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var MultislotCap_GPRS mscap_gprs := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B + }; + var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + /* Set timeout values for caches so that entries will be erased before the second try */ + f_pcuvty_set_neigh_caches(1, 1); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + f_outbound_nacc_success(ms, info_ind); + + /* CTRL client should have disconnected from us */ + f_ipa_ctrl_wait_link_down(); + /* wait for cache entries to time out */ + f_sleep(2.0); + /* First NACC procedure is done, let's try to start a new one now that previous queries have timed out: */ + f_outbound_nacc_success(ms, info_ind); + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Verify PCU transmits Pkt Cell Change Continue if RAC+CI resolution fails during outbound NACC procedure */ testcase TC_nacc_outbound_rac_ci_resolve_conn_refused() runs on RAW_PCU_Test_CT { var RlcmacDlBlock dl_block; @@ -4174,6 +4227,7 @@ execute( TC_pcuif_info_ind_subsequent() ); execute( TC_nacc_outbound_success() ); execute( TC_nacc_outbound_success_twice() ); + execute( TC_nacc_outbound_success_twice_nocache() ); execute( TC_nacc_outbound_rac_ci_resolve_conn_refused() ); execute( TC_nacc_outbound_rac_ci_resolve_timeout() ); execute( TC_nacc_outbound_rac_ci_resolve_fail_parse_response() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22497 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: I64369eb02fa611f9249696ffe249b0d6d917fa70 Gerrit-Change-Number: 22497 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:13:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:13:43 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610/1/common/chapters/trx_if.adoc at 142 PS1, Line 142: from the BTS do contain the Training Sequence bits. don't? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:13:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:16:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 13:16:27 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: don't download bumpversion References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22632 ) Change subject: OBS: nightly: don't download bumpversion ...................................................................... OBS: nightly: don't download bumpversion Stop downloading bumpversion related archives with each run. They were not uploaded to OBS after the download (no 'osc add' runs aftewards, and last modified of network:osmocom:nightly:bumpversion is 3 years ago). bumpversion is needed to run osmo-release.sh, and is available in debian since 9 (stretch). Related: https://build.opensuse.org/package/show/network:osmocom:nightly/bumpversion Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/22632/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 44f4a6e..58a8a52 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -162,21 +162,6 @@ osc status } -download_bumpversion() { - # bumpversion is required for debian < 9/stretch - local oscdir=$REPO/osc/$PROJ/bumpversion - local version=0.5.3 - local release=3 - - if [ ! -d "$oscdir" ] ; then - mkdir "$oscdir" - cd "$oscdir" - wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version-$release.dsc" - wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version.orig.tar.gz" - wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version-$release.debian.tar.xz" - fi -} - checkout_limesuite() { cd "$REPO" git clone https://github.com/myriadrf/LimeSuite limesuite @@ -284,8 +269,6 @@ build osmo-smlc build osmo-cbc - download_bumpversion - post } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 Gerrit-Change-Number: 22632 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:17:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:17:15 +0000 Subject: Change in osmo-gsm-manuals[master]: glossary.adoc: add breif definitions of AQPSK and VAMOS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 ) Change subject: glossary.adoc: add breif definitions of AQPSK and VAMOS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Gerrit-Change-Number: 22609 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:17:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:18:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:18:38 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:18:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:22:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:22:19 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611/1/common/chapters/trx_if.adoc at 198 PS1, Line 198: ---- why not simply sending integers "7 1" instead of "C/7/S1" ? Looks easier to parse from existing TRXC code, and it matches usual existing commands. I don't really see a real benefit from using a string. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:22:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:30:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:30:19 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 ) Change subject: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Gerrit-Change-Number: 22614 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:30:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:31:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:31:36 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615/1/common/chapters/trx_if.adoc at 521 PS1, Line 521: power is calculated as follows: `full_scale - (absolute_red + relative_red)`. it may be even clearer if you use: full_scale - absolute_red - relative_red -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:31:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:32:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:32:58 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:32:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:33:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:33:50 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:33:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:34:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:34:05 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH ...................................................................... Patch Set 1: Feels like playing tetris! -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:34:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:34:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:34:56 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:34:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:35:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:35:47 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618/1/common/chapters/trx_if.adoc at 495 PS1, Line 495: this "and a TS" shouldn't be simply "and TS" ? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:35:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:38:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:38:13 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: describe general message format, reduce duplication In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 ) Change subject: TRXD: describe general message format, reduce duplication ...................................................................... Patch Set 1: Not sure if it helps putting that together and spliting the actual message format into 2 tables, but OK. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If3bd16fdf5abfd67b3822c7199003d6f7cbaff92 Gerrit-Change-Number: 22620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:38:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:40:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:40:48 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify description of NOPE / IDLE indications In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 ) Change subject: TRXD: clarify description of NOPE / IDLE indications ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95 Gerrit-Change-Number: 22619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:40:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:41:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:41:01 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 ) Change subject: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I604cd85f79a8c21ef536840e017e8af399e935c7 Gerrit-Change-Number: 22621 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:41:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:43:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:43:22 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622/1/common/chapters/trx_if.adoc at 400 PS1, Line 400: The version negotiation is optionally initiated by the `L1` on the control interface, The version negotiation is always (optionally) initiated by -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:43:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 13:44:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 13:44:57 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: don't download bumpversion In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22632 ) Change subject: OBS: nightly: don't download bumpversion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 Gerrit-Change-Number: 22632 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 13:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:31:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:31:29 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_msg: fix gcc 4 + -std=gnu11 error ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22629/1/include/osmocom/sigtran/xua_msg.h File include/osmocom/sigtran/xua_msg.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/22629/1/include/osmocom/sigtran/xua_msg.h at 27 PS1, Line 27: #define _XUA_HDR(class, type) { .spare = 0, .msg_class = (class), .msg_type = (type) } > Ack if we only need that macro in the xua_test.c, there is no need to include it in the public, system-wide installed header file of the library. We can simply put it in the test case. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 14:31:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:32:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:32:17 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: don't download bumpversion In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22632 ) Change subject: OBS: nightly: don't download bumpversion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 Gerrit-Change-Number: 22632 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:32:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:39:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:39:57 +0000 Subject: Change in osmo-gsm-manuals[master]: glossary.adoc: add breif definitions of AQPSK and VAMOS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 ) Change subject: glossary.adoc: add breif definitions of AQPSK and VAMOS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Gerrit-Change-Number: 22609 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:39:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:42:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:42:06 +0000 Subject: Change in osmo-pcu[master]: nacc: Avoid RIM procedures targeting cells under same PCU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22631 ) Change subject: nacc: Avoid RIM procedures targeting cells under same PCU ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b Gerrit-Change-Number: 22631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 14:42:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:42:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: glossary.adoc: add brief definitions of AQPSK and VAMOS In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 ) Change subject: glossary.adoc: add brief definitions of AQPSK and VAMOS ...................................................................... glossary.adoc: add brief definitions of AQPSK and VAMOS Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Related: SYS#4895, OS#4941 --- M common/chapters/glossary.adoc 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/09/22609/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Gerrit-Change-Number: 22609 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:42:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:42:45 +0000 Subject: Change in osmo-gsm-manuals[master]: glossary.adoc: add brief definitions of AQPSK and VAMOS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 ) Change subject: glossary.adoc: add brief definitions of AQPSK and VAMOS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Gerrit-Change-Number: 22609 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:42:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:42:47 +0000 Subject: Change in osmo-gsm-manuals[master]: glossary.adoc: add brief definitions of AQPSK and VAMOS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 ) Change subject: glossary.adoc: add brief definitions of AQPSK and VAMOS ...................................................................... glossary.adoc: add brief definitions of AQPSK and VAMOS Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Related: SYS#4895, OS#4941 --- M common/chapters/glossary.adoc 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index d6a6c2d..23c7273 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -30,6 +30,8 @@ channel in response to RACH request AGPL:: GNU Affero General Public License, a copyleft-style Free Software License +AQPSK:: + Adaptive QPSK, a modulation scheme used by VAMOS channels on Downlink ARFCN:: Absolute Radio Frequency Channel Number; specifies a tuple of uplink and downlink frequencies @@ -377,6 +379,11 @@ USSD:: Unstructured Supplementary Service Data; textual dialog between subscriber and core network, e.g. '*#100#' -> 'Your extension is 1234' +VAMOS:: + Voice services over Adaptive Multi-user channels on One Slot; an optional + extension for GSM specified in Release 9 of 3GPP GERAN specifications + (_3GPP TS 48.018_ <<3gpp-ts-48-018>>) allowing two independent UEs to + transmit and receive simultaneously on traffic channels VCTCXO:: Voltage Controlled, Temperature Compensated Crystal Oscillator; a precision oscillator, superior to a classic crystal oscillator, but -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6e0b4d2baea22dc69274280719bcb24f1a0b8127 Gerrit-Change-Number: 22609 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:43:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:43:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611/1/common/chapters/trx_if.adoc at 198 PS1, Line 198: ---- > why not simply sending integers "7 1" instead of "C/7/S1" ? Looks easier to parse from existing TRXC [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:43:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:48:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:48:53 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:48:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:49:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:49:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 ) Change subject: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Gerrit-Change-Number: 22614 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:49:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:50:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:50:01 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:50:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:51:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:51:28 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:51:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:51:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:51:55 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:51:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:53:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:53:19 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618/1/common/chapters/trx_if.adoc at 495 PS1, Line 495: > this "and a TS" shouldn't be simply "and TS" ? TS normally refers to timeslot, not training sequence. So I would try to avoid overloading the acronym here and simply always say "training sequence". so ..."it depends on the actual modulation and a training sequence set indicated by the preceeding bits". -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 14:53:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:53:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:53:51 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify description of NOPE / IDLE indications In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 ) Change subject: TRXD: clarify description of NOPE / IDLE indications ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95 Gerrit-Change-Number: 22619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:53:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:56:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:56:13 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: describe general message format, reduce duplication In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 ) Change subject: TRXD: describe general message format, reduce duplication ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620/1/common/chapters/trx_if.adoc at 344 PS1, Line 344: one radio burst per UDP message actually, for VAMOS that's not true anymore, right? you would have two bursts (sequences of soft symbols) which are then merged and transmitted in the same burst period (in downlink) or have previously been recovered from the same bust period? Or do we consider those multiple "sequences of soft bits belonging to different subscribers' still as "one burst"? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If3bd16fdf5abfd67b3822c7199003d6f7cbaff92 Gerrit-Change-Number: 22620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:56:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 14:56:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 14:56:32 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 ) Change subject: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I604cd85f79a8c21ef536840e017e8af399e935c7 Gerrit-Change-Number: 22621 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 14:56:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:04:45 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 15:04:45 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 9: (5 comments) The protocol version is increased because the PCUIF protocol changes at the point where we transmit the SI13 message. We currently use the SAPI4 only for updating or revoking the SI13. The revoking of the SI13 works by sending an empty message. To extend this to a protocol where we are able to update or revoke SI1, SI3 or SI13 at the same time we need some extension. I did it the following way: As there is an osmo_si type enum I used that as a header byte. Then the normal SI13 or SI1 or SI3 message follows. The revoking works by just sending the header byte only. I wonder what we could do to get around bumping the PCUIF version. I think the only way would be to omit the header byte for SI13. Sending nothing would mean that only SI13 is revoked. Sending a pure SI13 with GSM_MACBLOCK_KEN would mean that SI13 is updated. All GSM_MACKBLOCK_LEN+1 messages would work by the new protocol. I find that this would be too ugly. https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/gprs_bssgp_rim.c File src/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/gprs_bssgp_rim.c at 69 PS6, Line 69: app_cont->si[app_cont->num_si] = bts->si1 + 2; > Add comment explaining what's this +2 about. Done https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/gprs_bssgp_rim.c at 266 PS6, Line 266: format_response_pdu(&resp_pdu, pdu, bts); > You are passing here the "dst BTS" and you are then using then using it to gather the information to [?] Done https://gerrit.osmocom.org/c/osmo-pcu/+/22368/7/src/gprs_bssgp_rim.c File src/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/7/src/gprs_bssgp_rim.c at 271 PS7, Line 271: if (rc != 0) { > I think you mixed here the log message with the answer... [?] Done https://gerrit.osmocom.org/c/osmo-pcu/+/22368/8/src/gprs_bssgp_rim.c File src/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/8/src/gprs_bssgp_rim.c at 275 PS8, Line 275: LOGPRIM(nsei, LOGL_NOTICE, "Responding to RAN INFORMATION REQUEST ...\n"); > NOTICE is too much here, should be INFO. Done https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/22368/6/src/pcu_l1_if.cpp at 300 PS6, Line 300: if (len == 1) { > switch (len) on all the possibilities in this function. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:04:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:05:29 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 15:05:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 7: The protocol version is increased because the PCUIF protocol changes at the point where we transmit the SI13 message. We currently use the SAPI4 only for updating or revoking the SI13. The revoking of the SI13 works by sending an empty message. To extend this to a protocol where we are able to update or revoke SI1, SI3 or SI13 at the same time we need some extension. I did it the following way: As there is an osmo_si type enum I used that as a header byte. Then the normal SI13 or SI1 or SI3 message follows. The revoking works by just sending the header byte only. I wonder what we could do to get around bumping the PCUIF version. I think the only way would be to omit the header byte for SI13. Sending nothing would mean that only SI13 is revoked. Sending a pure SI13 with GSM_MACBLOCK_KEN would mean that SI13 is updated. All GSM_MACKBLOCK_LEN+1 messages would work by the new protocol. I find that this would be too ugly. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:05:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:14:58 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 15:14:58 +0000 Subject: Change in osmo-pcu[master]: nacc: Avoid RIM procedures targeting cells under same PCU In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22631 ) Change subject: nacc: Avoid RIM procedures targeting cells under same PCU ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b Gerrit-Change-Number: 22631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 15:14:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:23:35 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 2 Feb 2021 15:23:35 +0000 Subject: Change in libosmo-sccp[master]: xua_test: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 to look at the new patch set (#2). Change subject: xua_test: fix gcc 4 + -std=gnu11 error ...................................................................... xua_test: fix gcc 4 + -std=gnu11 error Fix 'error: initializer element is not constant' with debian 8's gcc 4.9.2, triggered by XUA_HDR. Create a new _XUA_HDR without the type cast, and use it inside of const struct definitions in xua_test.c. The new macro is needed, because removing the type cast from the original XUA_HDR would break other uses. Related: OS#5004 Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 --- M tests/xua/xua_test.c 1 file changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/29/22629/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:25:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 15:25:25 +0000 Subject: Change in libosmo-sccp[master]: xua_test: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_test: fix gcc 4 + -std=gnu11 error ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 15:25:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:28:54 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 15:28:54 +0000 Subject: Change in osmo-gbproxy[master]: contrib/osmo-gbproxy.spec.in: fix config paths In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 ) Change subject: contrib/osmo-gbproxy.spec.in: fix config paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 Gerrit-Change-Number: 22590 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:28:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:29:40 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 15:29:40 +0000 Subject: Change in osmo-gbproxy[master]: debian: fix installing pdfs for -doc package In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 ) Change subject: debian: fix installing pdfs for -doc package ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f Gerrit-Change-Number: 22602 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 02 Feb 2021 15:29:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:29:58 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 15:29:58 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:31:06 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Tue, 2 Feb 2021 15:31:06 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:31:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:32:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 2 Feb 2021 15:32:24 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610/1/common/chapters/trx_if.adoc at 142 PS1, Line 142: from the BTS do contain the Training Sequence bits. > don't? No, I meant 'do' here. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:32:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:33:36 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 15:33:36 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 15:33:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:35:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 2 Feb 2021 15:35:03 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618/1/common/chapters/trx_if.adoc at 495 PS1, Line 495: > TS normally refers to timeslot, not training sequence. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 15:35:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:47:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 15:47:28 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Log write error code References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22633 ) Change subject: mncc: Log write error code ...................................................................... mncc: Log write error code Change-Id: If7b49bee6fec3a188c978c0606c524776a577927 --- M src/mncc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/33/22633/1 diff --git a/src/mncc.c b/src/mncc.c index abfa01b..6d42fde 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -163,7 +163,7 @@ rc = write(conn->fd.fd, &rtp, sizeof(rtp)); LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(rtp->msg_type)); if (rc != sizeof(*rtp)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", rtp->callref); + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u): %d\n", rtp->callref, rc); close_connection(conn); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If7b49bee6fec3a188c978c0606c524776a577927 Gerrit-Change-Number: 22633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:47:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 15:47:29 +0000 Subject: Change in osmo-sip-connector[master]: .gitignore: Get rid of new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22634 ) Change subject: .gitignore: Get rid of new autofoo tmp files ...................................................................... .gitignore: Get rid of new autofoo tmp files Change-Id: I5e0735c2e99e868f8cbfffc19ac005df7c289dd8 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/34/22634/1 diff --git a/.gitignore b/.gitignore index c73387f..e69f3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .deps *.sw? .version +*~ aclocal.m4 autom4te.cache -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I5e0735c2e99e868f8cbfffc19ac005df7c289dd8 Gerrit-Change-Number: 22634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:47:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 15:47:30 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix write len References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 ) Change subject: mncc: Fix write len ...................................................................... mncc: Fix write len Fixes bug introduced recently. Fixes: 0f27b1bd397f5b54fdfabf447d6fca7f30ac2580 Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 --- M src/mncc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/35/22635/1 diff --git a/src/mncc.c b/src/mncc.c index 6d42fde..9d75950 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -160,7 +160,7 @@ { int rc; - rc = write(conn->fd.fd, &rtp, sizeof(rtp)); + rc = write(conn->fd.fd, rtp, sizeof(*rtp)); LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(rtp->msg_type)); if (rc != sizeof(*rtp)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u): %d\n", rtp->callref, rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 Gerrit-Change-Number: 22635 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 15:49:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 2 Feb 2021 15:49:25 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611/1/common/chapters/trx_if.adoc at 198 PS1, Line 198: ---- > Ack Well, we're dealing with a *human readable* protocol here. I would love to go for something more convenient, so we would not need to mess with sprintf() / sscanf(), but re-designing the TRXC is out of scope so far. I just wanted this command to look a bit more readable. With timeslot and subslot it's logical that the former goes first, from the hierarchical point of view. With the training sequence and set we could assume that set goes first, but the more parameters we add, the harder it gets to grasp what corresponds to what without looking at the protocol reference. Regarding parsing complexity, it's just a longer format string for sscanf(), nothing special. If you both insist, I would change to plain numbers. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 15:49:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:32:40 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix write len In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 ) Change subject: mncc: Fix write len ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 Gerrit-Change-Number: 22635 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 02 Feb 2021 16:32:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:32:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:32:55 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix write len In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 ) Change subject: mncc: Fix write len ...................................................................... mncc: Fix write len Fixes bug introduced recently. Closes: OS#4957 Fixes: 0f27b1bd397f5b54fdfabf447d6fca7f30ac2580 Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 --- M src/mncc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/35/22635/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 Gerrit-Change-Number: 22635 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:33:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:33:15 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Log write error code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22633 ) Change subject: mncc: Log write error code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If7b49bee6fec3a188c978c0606c524776a577927 Gerrit-Change-Number: 22633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 16:33:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:33:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:33:26 +0000 Subject: Change in osmo-sip-connector[master]: .gitignore: Get rid of new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22634 ) Change subject: .gitignore: Get rid of new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I5e0735c2e99e868f8cbfffc19ac005df7c289dd8 Gerrit-Change-Number: 22634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 16:33:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:33:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:33:36 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix write len In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 ) Change subject: mncc: Fix write len ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 Gerrit-Change-Number: 22635 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 02 Feb 2021 16:33:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:33:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:33:47 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Log write error code In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22633 ) Change subject: mncc: Log write error code ...................................................................... mncc: Log write error code Change-Id: If7b49bee6fec3a188c978c0606c524776a577927 --- M src/mncc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index abfa01b..6d42fde 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -163,7 +163,7 @@ rc = write(conn->fd.fd, &rtp, sizeof(rtp)); LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(rtp->msg_type)); if (rc != sizeof(*rtp)) { - LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", rtp->callref); + LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u): %d\n", rtp->callref, rc); close_connection(conn); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: If7b49bee6fec3a188c978c0606c524776a577927 Gerrit-Change-Number: 22633 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:33:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:33:48 +0000 Subject: Change in osmo-sip-connector[master]: .gitignore: Get rid of new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22634 ) Change subject: .gitignore: Get rid of new autofoo tmp files ...................................................................... .gitignore: Get rid of new autofoo tmp files Change-Id: I5e0735c2e99e868f8cbfffc19ac005df7c289dd8 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index c73387f..e69f3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .deps *.sw? .version +*~ aclocal.m4 autom4te.cache -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I5e0735c2e99e868f8cbfffc19ac005df7c289dd8 Gerrit-Change-Number: 22634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 16:33:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 16:33:48 +0000 Subject: Change in osmo-sip-connector[master]: mncc: Fix write len In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 ) Change subject: mncc: Fix write len ...................................................................... mncc: Fix write len Fixes bug introduced recently. Closes: OS#4957 Fixes: 0f27b1bd397f5b54fdfabf447d6fca7f30ac2580 Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 --- M src/mncc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/mncc.c b/src/mncc.c index 6d42fde..9d75950 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -160,7 +160,7 @@ { int rc; - rc = write(conn->fd.fd, &rtp, sizeof(rtp)); + rc = write(conn->fd.fd, rtp, sizeof(*rtp)); LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(rtp->msg_type)); if (rc != sizeof(*rtp)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u): %d\n", rtp->callref, rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/22635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ibbff004e2b76fbfe8962d14628c916afb19f30e6 Gerrit-Change-Number: 22635 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 17:45:32 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 17:45:32 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* conatiner for osmo-gbproxy References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* conatiner for osmo-gbproxy ...................................................................... Add osmo-gbproxy-* conatiner for osmo-gbproxy Uses the new repo split off of osmo-sgsn Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 --- M make/Makefile A osmo-gbproxy-latest/Dockerfile A osmo-gbproxy-latest/Makefile A osmo-gbproxy-latest/Release.key A osmo-gbproxy-latest/osmo-gbproxy.cfg M osmo-gbproxy-master/Dockerfile A osmo-gbproxy-master/Release.key M osmo-gbproxy-master/osmo-gbproxy.cfg M ttcn3-gbproxy-test/jenkins.sh 9 files changed, 207 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/22636/1 diff --git a/make/Makefile b/make/Makefile index 7bb0345..5280bef 100644 --- a/make/Makefile +++ b/make/Makefile @@ -21,6 +21,7 @@ OSMO_BB_BRANCH?=master OSMO_BSC_BRANCH?=master OSMO_BTS_BRANCH?=master +OSMO_GBPROXY_BRANCH?=master OSMO_GGSN_BRANCH?=master OSMO_GSM_TESTER_BRANCH?=master OSMO_HLR_BRANCH?=master @@ -74,6 +75,7 @@ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ + --build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ --build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \ --build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \ diff --git a/osmo-gbproxy-latest/Dockerfile b/osmo-gbproxy-latest/Dockerfile new file mode 100644 index 0000000..c2beab7 --- /dev/null +++ b/osmo-gbproxy-latest/Dockerfile @@ -0,0 +1,36 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:stretch +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-gbproxy && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-gbproxy.cfg /data/osmo-gbproxy.cfg + +WORKDIR /data +CMD ["/bin/sh", "-c", "/usr/bin/osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"] + +EXPOSE 23000/udp 4245/tcp 4249/tcp 4246/tcp 4263/tcp diff --git a/osmo-gbproxy-latest/Makefile b/osmo-gbproxy-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-gbproxy-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-gbproxy-latest/Release.key b/osmo-gbproxy-latest/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-gbproxy-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-gbproxy-latest/osmo-gbproxy.cfg b/osmo-gbproxy-latest/osmo-gbproxy.cfg new file mode 100644 index 0000000..50ffb81 --- /dev/null +++ b/osmo-gbproxy-latest/osmo-gbproxy.cfg @@ -0,0 +1,32 @@ +! +! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging print category-hex 0 + logging timestamp 1 + logging print file 1 + logging level lns debug + logging level lbssgp debug + logging level gprs debug +line vty + no login +! +sgsn nsei 101 + name main +ns + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess + nse 101 + ip-sns 127.0.0.10 7777 + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 diff --git a/osmo-gbproxy-master/Dockerfile b/osmo-gbproxy-master/Dockerfile index 8661ec9..52ccaae 100644 --- a/osmo-gbproxy-master/Dockerfile +++ b/osmo-gbproxy-master/Dockerfile @@ -1,6 +1,82 @@ ARG USER ARG DISTRO -FROM $USER/osmo-sgsn-master +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN case "$DISTRO" in \ + debian*) \ + apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \ + ;; \ + esac + +# we need to add this to invalidate the cache once the repository is updated. +# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM +ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + libosmocore-dev \ + libosmo-abis-dev \ + libosmo-gsup-client-dev \ + libosmo-netif-dev \ + libosmo-ranap-dev \ + libosmo-sccp-dev \ + libosmo-sigtran-dev \ + libsmpp34-dev \ + libgtp-dev \ + libasn1c-dev && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + telnet \ + "pkgconfig(libasn1c)" \ + "pkgconfig(libcrypto)" \ + "pkgconfig(libgtp)" \ + "pkgconfig(libosmo-gsup-client)" \ + "pkgconfig(libosmo-netif)" \ + "pkgconfig(libosmo-ranap)" \ + "pkgconfig(libosmo-sigtran)" \ + "pkgconfig(libosmoabis)" \ + "pkgconfig(libosmocore)" \ + "pkgconfig(libosmoctrl)" \ + "pkgconfig(libosmogb)" \ + "pkgconfig(libosmogsm)" \ + "pkgconfig(libosmovty)" \ + ;; \ + esac + +WORKDIR /tmp + +ARG OSMO_GBPROXY_BRANCH="master" + +RUN git clone git://git.osmocom.org/osmo-gbproxy.git +ADD http://git.osmocom.org/osmo-gbproxy/patch?h=$OSMO_GBPROXY_BRANCH /tmp/commit + +RUN cd osmo-gbproxy && \ + git fetch && git checkout $OSMO_GBPROXY_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GBPROXY_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure --enable-iu && \ + make "-j$(nproc)" install && \ + ldconfig + +VOLUME /data COPY osmo-gbproxy.cfg /data/osmo-gbproxy.cfg diff --git a/osmo-gbproxy-master/Release.key b/osmo-gbproxy-master/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-gbproxy-master/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-gbproxy-master/osmo-gbproxy.cfg b/osmo-gbproxy-master/osmo-gbproxy.cfg index 29f698f..50ffb81 100644 --- a/osmo-gbproxy-master/osmo-gbproxy.cfg +++ b/osmo-gbproxy-master/osmo-gbproxy.cfg @@ -2,17 +2,27 @@ ! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty !! ! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging print category-hex 0 + logging timestamp 1 + logging print file 1 + logging level lns debug + logging level lbssgp debug + logging level gprs debug line vty no login ! -gbproxy - sgsn nsei 101 +sgsn nsei 101 + name main ns - nse 101 nsvci 101 - nse 101 remote-role sgsn - nse 101 encapsulation udp - nse 101 remote-ip 192.168.100.239 - nse 101 remote-port 7777 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess + nse 101 + ip-sns 127.0.0.10 7777 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 @@ -20,7 +30,3 @@ timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation framerelay-gre enabled 0 - encapsulation framerelay-gre local-ip 0.0.0.0 - encapsulation udp local-ip 127.0.0.100 - encapsulation udp local-port 23000 diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 2120f90..9605608 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "osmo-sgsn-$IMAGE_SUFFIX" \ + "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" SUBNET=24 @@ -32,7 +32,7 @@ -v $VOL_BASE_DIR/gbproxy:/data \ --name ${BUILD_TAG}-gbproxy -d \ $DOCKER_ARGS \ - $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \ + $REPO_USER/osmo-gbproxy-$IMAGE_SUFFIX \ /bin/sh -c "osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1" echo Starting container with gbproxy testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 17:49:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 2 Feb 2021 17:49:27 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* conatiner for osmo-gbproxy In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* conatiner for osmo-gbproxy ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/osmo-gbproxy.cfg File osmo-gbproxy-latest/osmo-gbproxy.cfg: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/osmo-gbproxy.cfg at 22 PS1, Line 22: listen 127.0.0.1 23000 does it make sense to listen on 127.0.0.1 on docker container? shouldn't you listen on ANY_ADDR by default? https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile File osmo-gbproxy-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile at 75 PS1, Line 75: ./configure --enable-iu && \ is there iu stuff in gbproxy? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 17:49:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 17:53:45 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 2 Feb 2021 17:53:45 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* conatiner for osmo-gbproxy In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* conatiner for osmo-gbproxy ...................................................................... Patch Set 1: (2 comments) ttcn3-gbproxy-test seems to work so far https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile File osmo-gbproxy-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile at 34 PS1, Line 34: CMD ["/bin/sh", "-c", "/usr/bin/osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"] Should probably be changed to the pipework/shell entrypoint as in osmo-gbproxy-master? https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/osmo-gbproxy.cfg File osmo-gbproxy-master/osmo-gbproxy.cfg: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/osmo-gbproxy.cfg at 22 PS1, Line 22: listen 127.0.0.1 23000 Never sure what IPs to use here. Some use localhost, some 172.x.x.x Related is the network in Makefile. This is currently just a copy from osmo-sgsn-master -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 17:53:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 17:57:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 17:57:00 +0000 Subject: Change in libosmo-sccp[master]: xua_test: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_test: fix gcc 4 + -std=gnu11 error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 17:57:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 17:57:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 17:57:02 +0000 Subject: Change in libosmo-sccp[master]: xua_test: fix gcc 4 + -std=gnu11 error In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 ) Change subject: xua_test: fix gcc 4 + -std=gnu11 error ...................................................................... xua_test: fix gcc 4 + -std=gnu11 error Fix 'error: initializer element is not constant' with debian 8's gcc 4.9.2, triggered by XUA_HDR. Create a new _XUA_HDR without the type cast, and use it inside of const struct definitions in xua_test.c. The new macro is needed, because removing the type cast from the original XUA_HDR would break other uses. Related: OS#5004 Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 --- M tests/xua/xua_test.c 1 file changed, 14 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 77daa56..6096807 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -369,6 +369,9 @@ #define PANDSIZ(x) { x, ARRAY_SIZE(x) } #define PARTU32(x, data) { .tag = x, .len = 4, .dat = (uint8_t *) data } #define PARTARR(x, data) { .tag = x, .len = ARRAY_SIZE(data), .dat = (uint8_t *) data } +/* GCC-4 errors with 'initializer element is not constant' if using XUA_HDR + * inside a const struct (OS#5004) */ +#define _XUA_HDR(class, type) { .spare = 0, .msg_class = (class), .msg_type = (type) } const uint32_t sua_proto_class0 = 0; const uint32_t sua_proto_class2 = 2; @@ -384,7 +387,7 @@ .name = "BSSMAP-RESET", .sccp = PANDSIZ(bssmap_reset), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), @@ -395,7 +398,7 @@ .name = "BSSMAP-RESET-ACK", .sccp = PANDSIZ(bssmap_reset_ack), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), @@ -406,7 +409,7 @@ .name = "BSSMAP-PAGING", .sccp = PANDSIZ(bssmap_paging), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), @@ -417,7 +420,7 @@ .name = "BSSMAP-UDT", .sccp = PANDSIZ(bssmap_udt), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), @@ -428,7 +431,7 @@ .name = "BSSMAP-CR", .sccp = PANDSIZ(bssmap_cr), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc), @@ -439,7 +442,7 @@ .name = "BSSMAP-CC", .sccp = PANDSIZ(bssmap_cc), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), @@ -450,7 +453,7 @@ .name = "BSSMAP-DTAP", .sccp = PANDSIZ(bssmap_dtap), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), .parts = { PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), }, @@ -459,7 +462,7 @@ .name = "BSSMAP-CLEAR", .sccp = PANDSIZ(bssmap_clear), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_CODT), .parts = { PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), }, @@ -468,7 +471,7 @@ .name = "BSSMAP-RELEASED", .sccp = PANDSIZ(bssmap_released), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELRE), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_RELRE), .parts = { PARTU32(SUA_IEI_DEST_REF, &sua_loc_ref_msc), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc), @@ -479,7 +482,7 @@ .name = "BSSMAP-RELEASE_COMPLETE", .sccp = PANDSIZ(bssmap_release_complete), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO), + .hdr = _XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO), .parts = { PARTU32(SUA_IEI_DEST_REF, &sua_loc_ref_bsc), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), @@ -489,7 +492,7 @@ .name = "TCAP", .sccp = PANDSIZ(tcap_global_title), .sua = { - .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), + .hdr = _XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { }, }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I890432ee976043d012b01023f7dd2cfecf79d115 Gerrit-Change-Number: 22629 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 17:58:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 17:58:12 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 17:58:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:06:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:06:42 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* conatiner for osmo-gbproxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* conatiner for osmo-gbproxy ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile File osmo-gbproxy-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile at 34 PS1, Line 34: CMD ["/bin/sh", "-c", "/usr/bin/osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"] > Should probably be changed to the pipework/shell entrypoint as in osmo-gbproxy-master? yes, but given that there's no osmo-gbproxy tag/release, that is not really relevant yet. And since todays osmo-gbproxy.git depends on tons of unreleased libosmocore.git changes, we won't have a working osmo-gbproxy tag (and hence no package, and hence no test) for quite some time. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 18:06:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:08:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:08:42 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* conatiner for osmo-gbproxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* conatiner for osmo-gbproxy ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/osmo-gbproxy.cfg File osmo-gbproxy-latest/osmo-gbproxy.cfg: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/osmo-gbproxy.cfg at 22 PS1, Line 22: listen 127.0.0.1 23000 > does it make sense to listen on 127.0.0. [?] Ack https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile File osmo-gbproxy-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile at 34 PS1, Line 34: l following dependencies not required (neither for debian nor for centos): gsup-client, libosmo-ranap, libosmo-sccp, libosmo-sigtran, libsmpp34, libgtp, libasn1c https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile at 75 PS1, Line 75: ./configure --enable-iu && \ > is there iu stuff in gbproxy? Ack -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 18:08:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:09:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:09:53 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 3: Verified-1 setting to -1 to prevent accidential merge. This should only be merged as a last step after all tests, docker containers, jenkins jobs, etc. have been updated accordingly. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 18:09:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:10:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:10:25 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 18:10:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:10:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:10:46 +0000 Subject: Change in osmo-gbproxy[master]: debian: fix installing pdfs for -doc package In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 ) Change subject: debian: fix installing pdfs for -doc package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f Gerrit-Change-Number: 22602 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 18:10:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:11:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:11:05 +0000 Subject: Change in osmo-gbproxy[master]: debian: fix installing pdfs for -doc package In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 ) Change subject: debian: fix installing pdfs for -doc package ...................................................................... debian: fix installing pdfs for -doc package Don't comment out the pdf glob, it works as intended when building the package on OBS. I had disabled it, because with dpkg-buildpackage, override_dh_auto_configure from debian/ruls gets ignored, leading to --enable-manuals missing in ./configure, and to the pdf file not being present. But apparently, dpkg-buildpackage just always ignores this, it's the same with other Osmocom repositories. Related: OS#4992 Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f --- M debian/osmo-gbproxy-doc.install 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian/osmo-gbproxy-doc.install b/debian/osmo-gbproxy-doc.install index d934088..cb5b384 100644 --- a/debian/osmo-gbproxy-doc.install +++ b/debian/osmo-gbproxy-doc.install @@ -1,2 +1 @@ -# FIXME: debian package doesn't generate manuals yet, see OS#4992 -# usr/share/doc/osmo-gbproxy-doc/*.pdf +usr/share/doc/osmo-gbproxy-doc/*.pdf -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I67c71af1406516e1262792b0d7566b3a9470e37f Gerrit-Change-Number: 22602 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:11:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:11:24 +0000 Subject: Change in osmo-gbproxy[master]: contrib/osmo-gbproxy.spec.in: fix config paths In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 ) Change subject: contrib/osmo-gbproxy.spec.in: fix config paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 Gerrit-Change-Number: 22590 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 18:11:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:11:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:11:26 +0000 Subject: Change in osmo-gbproxy[master]: contrib/osmo-gbproxy.spec.in: fix config paths In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 ) Change subject: contrib/osmo-gbproxy.spec.in: fix config paths ...................................................................... contrib/osmo-gbproxy.spec.in: fix config paths Make the spec file build (verified with own OBS namespace). Related: OS#4992 Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 --- M contrib/osmo-gbproxy.spec.in 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/osmo-gbproxy.spec.in b/contrib/osmo-gbproxy.spec.in index 9392147..f7e7377 100644 --- a/contrib/osmo-gbproxy.spec.in +++ b/contrib/osmo-gbproxy.spec.in @@ -1,7 +1,8 @@ # -# spec file for package osmo-sgsn +# spec file for package osmo-gbproxy # # Copyright (c) 2017, Martin Hauke +# Copyright (c) 2021, sysmocom - s.f.m.c. GmbH # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -70,10 +71,10 @@ %files %doc AUTHORS README.md %dir %{_docdir}/%{name}/examples -%dir %{_docdir}/%{name}/examples/osmo-sgsn -%{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy.cfg -%{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy-legacy.cfg -%{_docdir}/%{name}/examples/osmo-sgsn/osmo-gbproxy-pool.cfg +%dir %{_docdir}/%{name}/examples/osmo-gbproxy +%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy.cfg +%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg +%{_docdir}/%{name}/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg %{_bindir}/osmo-gbproxy %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-gbproxy.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b90d1e1a270963d5a053c95825c30193655e798 Gerrit-Change-Number: 22590 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:12:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:12:22 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: regen: put args in own lines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/22596 ) Change subject: gen_makefile.py: regen: put args in own lines ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/22596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e Gerrit-Change-Number: 22596 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 18:12:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 18:13:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 18:13:04 +0000 Subject: Change in osmo-bsc[master]: lchan activation: indicate whether TA is known In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22512 ) Change subject: lchan activation: indicate whether TA is known ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I986bf93e8acd6aef7eaf63ac962480b680aa894f Gerrit-Change-Number: 22512 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 02 Feb 2021 18:13:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 19:32:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 19:32:15 +0000 Subject: Change in libosmocore[master]: ns2: Don't queie Q.933 LMI messages; only store most recent ones References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queie Q.933 LMI messages; only store most recent ones ...................................................................... ns2: Don't queie Q.933 LMI messages; only store most recent ones There's not really any point in storing multiple LMI messages, and then transmitting them in inverse order, as the existing code does. Instead, we shall store only the last (failed) LMI message and try to transmit that at highest priority, before any NS messages in the actual queue. Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 --- M src/gb/gprs_ns2_fr.c 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/22637/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index fc6a5c4..24cc312 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -105,7 +105,9 @@ struct { /* file-descriptor for AF_PACKET socket */ struct osmo_fd ofd; - /* list of msgb (backlog) */ + /* LMI bucket (we only store the last LMI message, no need to queue */ + struct msgb *lmi_msg; + /* list of NS msgb (backlog) */ struct llist_head list; /* timer to trigger next attempt of AF_PACKET write */ struct osmo_timer_list timer; @@ -173,6 +175,7 @@ llist_for_each_entry_safe(msg, msg2, &priv->backlog.list, list) { msgb_free(msg); } + msgb_free(priv->backlog.lmi_msg); osmo_fr_link_free(priv->link); osmo_fd_close(&priv->backlog.ofd); @@ -357,6 +360,7 @@ /* enqueue to backlog (LMI, signaling) or drop (userdata msg) */ static int backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg) { + struct priv_bind *priv = bind->priv; uint8_t dlci = msg->data[0]; uint8_t ns_pdu_type; uint16_t bvci; @@ -367,8 +371,9 @@ /* we want to enqueue only Q.933 LMI traffic or NS signaling; NOT user traffic */ switch (dlci) { case LMI_Q933A_DLCI: - /* enqueue Q.933 LMI at head of queue */ - enqueue_at_head(bind, msg); + /* always store only the last LMI message in the lmi_msg bucket */ + msgb_free(priv->backlog.lmi_msg); + priv->backlog.lmi_msg = msg; return 0; default: if (msgb_length(msg) < 3) @@ -405,6 +410,15 @@ struct priv_bind *priv = bind->priv; int i, rc; + /* first try to get rid of the LMI message, if any */ + if (priv->backlog.lmi_msg) { + rc = fr_netif_write_one(bind, priv->backlog.lmi_msg); + if (rc < 0) + goto restart_timer; + /* fr_netif_write_one() has just free'd it */ + priv->backlog.lmi_msg = NULL; + } + /* attempt to send up to 10 messages in every timer */ for (i = 0; i < 10; i++) { struct msgb *msg = msgb_dequeue(&priv->backlog.list); @@ -420,6 +434,7 @@ osmo_stat_item_dec(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1); } +restart_timer: /* re-start timer if we still have data in the queue */ if (!llist_empty(&priv->backlog.list)) osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 19:32:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 19:32:16 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... ns2: improve backlog handling on interface up/down This patch improves the behavior of the newly-added backlog in situations where the interface goes up/down. * don't add new packets to the backlog while if_running == false * flush the backlog on both ifup and ifdown events Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 --- M src/gb/gprs_ns2_fr.c 1 file changed, 31 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/22638/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 24cc312..9125f0a 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -376,6 +376,10 @@ priv->backlog.lmi_msg = msg; return 0; default: + /* there's no point in trying to enqueue messages if the interface is down */ + if (!priv->if_running) + break; + if (msgb_length(msg) < 3) break; ns_pdu_type = msg->data[2]; @@ -559,6 +563,32 @@ return NULL; } +static void link_state_change(struct gprs_ns2_vc_bind *bind, bool if_running) +{ + struct priv_bind *bpriv = bind->priv; + struct msgb *msg, *msg2; + + LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n", + bpriv->netif, if_running ? "UP" : "DOWN"); + + /* free any backlog, both on IFUP and IFDOWN. Keep the LMI, as it makes + * sense to get one out of the door ASAP. */ + llist_for_each_entry_safe(msg, msg2, &bpriv->backlog.list, list) { + msgb_free(msg); + } + + if (if_running) { + /* interface just came up */ + if (bpriv->backlog.lmi_msg) + osmo_timer_schedule(&bpriv->backlog.timer, 0, bpriv->backlog.retry_us); + } else { + /* interface just went down; no need to retransmit */ + osmo_timer_del(&bpriv->backlog.timer); + } + + bpriv->if_running = if_running; +} + /* handle a single netlink message received via libmnl */ static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data) { @@ -590,9 +620,7 @@ struct priv_bind *bpriv = bind->priv; if (bpriv->if_running != if_running) { /* update running state */ - LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n", - ifname, if_running ? "UP" : "DOWN"); - bpriv->if_running = if_running; + link_state_change(bind, if_running); } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 19:48:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 2 Feb 2021 19:48:40 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22637 to look at the new patch set (#2). Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... ns2: Don't queue Q.933 LMI messages; only store most recent ones There's not really any point in storing multiple LMI messages, and then transmitting them in inverse order, as the existing code does. Instead, we shall store only the last (failed) LMI message and try to transmit that at highest priority, before any NS messages in the actual queue. Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 --- M src/gb/gprs_ns2_fr.c 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/22637/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 20:44:03 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 2 Feb 2021 20:44:03 +0000 Subject: Change in osmo-bsc[master]: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22527 ) Change subject: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS ...................................................................... Patch Set 1: i hate these alleged merge conflicts that aren't actually merge conflicts at all -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 Gerrit-Change-Number: 22527 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 20:44:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 20:53:30 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 20:53:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 to look at the new patch set (#3). Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF Whenever the BSC is updating SI1, SI3 or SI13 via RSL, the PCU should be informed about the change via PCUIF as well. For SI13 this is already the case and a testcase exists. The version 11 of the PCUIF protocol is now capable to update SI1 and SI3 as well. - Update BTS_Tests.TC_pcu_ver_si13 so that it works with the current protocol version - Add BTS_Tests.TC_pcu_ver_si3 and BTS_Tests.TC_pcu_ver_si1 that test SI1 and SI3 as well. Depends: osmo-bts Ib7aeb41e634ad6fcab3766a4667b0267c749436a Change-Id: I5138ab183793e7eee4dc494318d984e9f1f56932 Related: SYS#5103 --- M bts/BTS_Tests.ttcn 1 file changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/22540/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 20:53:57 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 2 Feb 2021 20:53:57 +0000 Subject: Change in osmo-bsc[master]: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22527 to look at the new patch set (#2). Change subject: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS ...................................................................... hodec2: fix intra-cell congestion balancing with source lchan on dyn TS Related: SYS#5301 Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 --- M src/osmo-bsc/handover_decision_2.c M tests/handover/test_dyn_ts_amr_tch_f_to_h_congestion_assignment_2.ho_vty M tests/handover/test_dyn_ts_amr_tch_h_to_f_congestion_assignment_2.ho_vty 3 files changed, 34 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/22527/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 Gerrit-Change-Number: 22527 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 20:54:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 20:54:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 8: I have now eleminated the PCUIF dependency, this should now work also with old versions of osmo-bts and osmo-pcu now -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 20:54:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 20:56:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 20:56:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 to look at the new patch set (#9). Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si Perform a full RAN information request (single report) against the PCU and check the results. Also test what happens when the request is issued at a time where osmo-bts has no system information available. Depends: osmo-pcu Id72118120c14984d2fb1b918b41fac4868150d41 Change-Id: I9054ab0e969c0fbfdc671c92d44cc61360959adc Related: SYS#5103 --- M pcu/PCU_Tests.ttcn 1 file changed, 155 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/22369/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 21:06:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 21:06:34 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 11: I have now removed the need for bumping the PCUIF version number. Old versions of osmo-bts should still be able to send SI13 the old fashion way, while newer versions can updata S1, S2 and SI13 the new way. Both should work. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 21:06:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 21:20:04 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 21:20:04 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 to look at the new patch set (#4). Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... pcu_sock: send SI1, SI3 and SI13 via PCUIF The new version (0x0b, 11) of the PCUIF extends the SAPI 4 that is used to transfer SI13 only, so that it can transfer SI1 and SI3 as well. The system information SI1, SI3 and SI13 is needed by the NACC RIM application which runs inside osmo-pcu. Depends: osmo-pcu I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Related: SYS#5103 --- M include/osmo-bts/pcu_if.h M src/common/pcu_sock.c M src/common/rsl.c 3 files changed, 77 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22541/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 2 21:21:04 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 2 Feb 2021 21:21:04 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 4: (4 comments) Also here, the PCUIF version does not need to get bumped. https://gerrit.osmocom.org/c/osmo-bts/+/22541/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/22541/1//COMMIT_MSG at 7 PS1, Line 7: pcu_sock: send SI1, SI3 and SI3 via PCUIF > SI13, not SI3 twice Done https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/pcu_sock.c at 752 PS1, Line 752: int rc = > This indentation looks rather weird, better inline int rc = pcu-tx_data_ind(... [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/rsl.c at 397 PS1, Line 397: if (SYSINFO_TYPE_13 == osmo_si) > switch (osmo_si) [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/22541/1/src/common/rsl.c at 417 PS1, Line 417: if (SYSINFO_TYPE_13 == osmo_si) > switch (osmo_si) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 02 Feb 2021 21:21:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 3 02:42:38 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 03 Feb 2021 02:42:38 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <601a0db8da5b2_32fe2b11e4bbc5f824107d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 173s] [COMPILING apps/dfu/main.c] [ 173s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 173s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 173s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 174s] Memory region Used Size Region Size %age Used [ 174s] rom: 16580 B 16 KB 101.20% [ 174s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 174s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 174s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 174s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 174s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 174s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 174s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 174s] collect2: error: ld returned 1 exit status [ 174s] % [ 174s] make[2]: *** [Makefile:234: flash] Error 1 [ 174s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 174s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 174s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 174s] dh_auto_build: error: make -j1 returned exit code 2 [ 174s] make: *** [debian/rules:16: build] Error 25 [ 174s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 174s] ### VM INTERACTION START ### [ 177s] [ 163.037929] sysrq: Power Off [ 177s] [ 163.042928] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] old-atreju3 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 3 02:42:22 UTC 2021. [ 177s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 3 02:47:38 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 03 Feb 2021 02:47:38 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601a0ee4a885e_32fe2b11e4bbc5f824118ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 159s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 159s] [COMPILING libboard/qmod/source/card_pres.c] [ 160s] [COMPILING libboard/qmod/source/wwan_led.c] [ 160s] [COMPILING libboard/qmod/source/i2c.c] [ 160s] [COMPILING libboard/qmod/source/board_qmod.c] [ 160s] [COMPILING apps/dfu/main.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 161s] Memory region Used Size Region Size %age Used [ 161s] rom: 16588 B 16 KB 101.25% [ 161s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 161s] collect2: error: ld returned 1 exit status [ 161s] % [ 161s] make[2]: *** [Makefile:234: flash] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 161s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: error: make -j1 returned exit code 2 [ 161s] make: *** [debian/rules:16: build] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 152.188404] sysrq: Power Off [ 164s] [ 152.202143] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb23 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 3 02:47:27 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:26:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:26:25 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#5) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... pcu_sock: send SI1, SI3 and SI13 via PCUIF This patch PCUIF extends the SAPI 4 that is used to transfer SI13 only, so that it can transfer SI1 and SI3 as well. The system information SI1, SI3 and SI13 is needed by the NACC RIM application which runs inside osmo-pcu. Depends: osmo-pcu I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Related: SYS#5103 --- M include/osmo-bts/pcu_if.h M src/common/pcu_sock.c M src/common/rsl.c 3 files changed, 77 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22541/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:26:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:26:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:26:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:27:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:27:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#5) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 ) Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF Whenever the BSC is updating SI1, SI3 or SI13 via RSL, the PCU should be informed about the change via PCUIF as well. For SI13 this is already the case and a testcase exists. The PCUIF protocol is now capable to update SI1 and SI3 as well. - Update BTS_Tests.TC_pcu_ver_si13 so that it works with the current protocol version - Add BTS_Tests.TC_pcu_ver_si3 and BTS_Tests.TC_pcu_ver_si1 that test SI1 and SI3 as well. Depends: osmo-bts Ib7aeb41e634ad6fcab3766a4667b0267c749436a Change-Id: I5138ab183793e7eee4dc494318d984e9f1f56932 Related: SYS#5103 --- M bts/BTS_Tests.ttcn 1 file changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/22540/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:28:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:28:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 ) Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:28:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:29:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:29:37 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:29:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:29:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:29:43 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application ...................................................................... gprs_bssgp_rim: add serving BSS NACC application Answer an incoming RAN INFORMATION REQUEST RIM PDU with RAN INFORMATION PDU that contains system information type 1, 3 and 13 Depends: osmo-bts I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Related: SYS#5103 --- M src/bts.h M src/gprs_bssgp_rim.c M src/pcu_l1_if.cpp 3 files changed, 131 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/bts.h b/src/bts.h index ea15caf..e67668c 100644 --- a/src/bts.h +++ b/src/bts.h @@ -219,6 +219,10 @@ uint8_t n3105; struct gprs_rlcmac_trx trx[8]; + uint8_t si1[GSM_MACBLOCK_LEN]; + bool si1_is_set; + uint8_t si3[GSM_MACBLOCK_LEN]; + bool si3_is_set; uint8_t si13[GSM_MACBLOCK_LEN]; bool si13_is_set; diff --git a/src/gprs_bssgp_rim.c b/src/gprs_bssgp_rim.c index a191fff..5f6f750 100644 --- a/src/gprs_bssgp_rim.c +++ b/src/gprs_bssgp_rim.c @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include #include "gprs_debug.h" #include "gprs_pcu.h" @@ -54,6 +57,59 @@ memcpy(&to_pdu->routing_info_src, &from_pdu->routing_info_dest, sizeof(to_pdu->routing_info_src)); } +/* Fill NACC application container with data (cell identifier, sysinfo) */ +#define SI_HDR_LEN 2 +static void fill_app_cont_nacc(struct bssgp_ran_inf_app_cont_nacc *app_cont, const struct gprs_rlcmac_bts *bts) +{ + struct bssgp_bvc_ctx *bctx = the_pcu->bssgp.bctx; + + gprs_ra_id_ci_to_cgi_ps(&app_cont->reprt_cell, &bctx->ra_id, bctx->cell_id); + app_cont->num_si = 0; + + /* Note: The BTS struct stores the system information including its pseudo header. The RIM application + * container defines the system information without pseudo header, so we need to chop it off. */ + + if (bts->si1_is_set) { + app_cont->si[app_cont->num_si] = bts->si1 + SI_HDR_LEN; + app_cont->num_si++; + } + + if (bts->si3_is_set) { + app_cont->si[app_cont->num_si] = bts->si3 + SI_HDR_LEN; + app_cont->num_si++; + } + + if (bts->si13_is_set) { + app_cont->si[app_cont->num_si] = bts->si13 + SI_HDR_LEN; + app_cont->num_si++; + } + + /* Note: It is possible that the resulting PDU will not contain any system information, even if this is + * an unlikely case since the BTS immediately updates the system information after startup. The + * specification permits to send zero system information, see also: 3GPP TS 48.018 section 11.3.63.2.1 */ +} + +/* Format a RAN INFORMATION PDU that contains the requested system information */ +static void format_response_pdu(struct bssgp_ran_information_pdu *resp_pdu, struct bssgp_ran_information_pdu *req_pdu, + const struct gprs_rlcmac_bts *bts) +{ + memset(resp_pdu, 0, sizeof(*resp_pdu)); + mirror_rim_routing_info(resp_pdu, req_pdu); + + resp_pdu->decoded.rim_cont = (struct bssgp_ran_inf_rim_cont) { + .app_id = BSSGP_RAN_INF_APP_ID_NACC, + .seq_num = 1, /* single report has only one message in response */ + .pdu_ind = { + .pdu_type_ext = RIM_PDU_TYPE_SING_REP, + }, + .prot_ver = 1, + }; + + fill_app_cont_nacc(&resp_pdu->decoded.rim_cont.u.app_cont_nacc, bts); + resp_pdu->decoded_present = true; + resp_pdu->rim_cont_iei = BSSGP_IE_RI_RIM_CONTAINER; +} + /* Format a RAN INFORMATION ERROR PDU */ static void format_response_pdu_err(struct bssgp_ran_information_pdu *resp_pdu, const struct bssgp_ran_information_pdu *req_pdu) @@ -167,6 +223,7 @@ struct bssgp_ran_information_pdu resp_pdu; struct osmo_cell_global_id_ps dst_addr; struct gprs_rlcmac_bts *bts; + int rc; OSMO_ASSERT (bp->oph.sap == SAP_BSSGP_RIM); @@ -210,7 +267,15 @@ /* Handle incoming RIM container */ switch (pdu->rim_cont_iei) { case BSSGP_IE_RI_REQ_RIM_CONTAINER: - LOGPRIM(nsei, LOGL_NOTICE, "Responding to RAN INFORMATION REQUEST not yet implemented!\n"); + rc = osmo_cgi_ps_cmp(&dst_addr, &pdu->decoded.req_rim_cont.u.app_cont_nacc.reprt_cell); + if (rc != 0) { + LOGPRIM(nsei, LOGL_ERROR, "reporting cell in RIM application container does not match destination cell in RIM routing info -- rejected.\n"); + format_response_pdu_err(&resp_pdu, pdu); + } else { + LOGPRIM(nsei, LOGL_INFO, "Responding to RAN INFORMATION REQUEST ...\n"); + format_response_pdu(&resp_pdu, pdu, bts); + } + bssgp_tx_rim(&resp_pdu, nsei); break; case BSSGP_IE_RI_RIM_CONTAINER: return handle_ran_info_response(pdu, bts); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index d7590e1..9873469 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -42,6 +42,7 @@ #include #include #include +#include } #include @@ -290,21 +291,69 @@ static int pcu_rx_data_ind_bcch(struct gprs_rlcmac_bts *bts, uint8_t *data, uint8_t len) { - if (len == 0) { + switch (len) { + case 0: + /* Due to historical reasons also accept a completely empty message as + * revoke command for SI13. */ + LOGP(DL1IF, LOGL_ERROR, + "Received PCU data indication that contains no data -- Revoked SI13.\n"); bts->si13_is_set = false; - LOGP(DL1IF, LOGL_INFO, "Received PCU data indication with empty SI13: cache cleaned\n"); - return 0; - } - if (len != GSM_MACBLOCK_LEN) { - LOGP(DL1IF, LOGL_ERROR, "Received PCU data indication with SI13 with unexpected length %u\n", len); + return 0; + case 1: + /* Revoke SI, type is identified by a single byte which is coded after + * enum osmo_sysinfo_type. */ + switch (data[0]) { + case SYSINFO_TYPE_1: + bts->si1_is_set = false; + break; + case SYSINFO_TYPE_3: + bts->si3_is_set = false; + break; + case SYSINFO_TYPE_13: + bts->si13_is_set = false; + break; + default: + LOGP(DL1IF, LOGL_ERROR, + "Received PCU data indication that contains an unsupported system information identifier (%02x,OSMO) -- ignored.\n", data[0]); + return -EINVAL; + } + LOGP(DPCU, LOGL_DEBUG, + "Received PCU data indication: Revoked SI%s\n", + get_value_string(osmo_sitype_strs, data[0])); + return 0; + case GSM_MACBLOCK_LEN: + /* Update SI, type is identified by the RR sysinfo type, which is the + * 3rd byte in the buffer. */ + switch (data[2]) { + case GSM48_MT_RR_SYSINFO_1: + memcpy(bts->si1, data, GSM_MACBLOCK_LEN); + bts->si1_is_set = true; + break; + case GSM48_MT_RR_SYSINFO_3: + memcpy(bts->si3, data, GSM_MACBLOCK_LEN); + bts->si3_is_set = true; + break; + case GSM48_MT_RR_SYSINFO_13: + memcpy(bts->si13, data, GSM_MACBLOCK_LEN); + bts->si13_is_set = true; + break; + default: + LOGP(DL1IF, LOGL_ERROR, + "Received PCU data indication that contains an unsupported system information identifier (%02x,RR) -- ignored.\n", data[2]); + return -EINVAL; + } + LOGP(DPCU, LOGL_DEBUG, + "Received PCU data indication: Updated %s: %s\n", + gsm48_pdisc_msgtype_name(data[1], data[2]), + osmo_hexdump_nospc(data + 1, GSM_MACBLOCK_LEN)); + return 0; + default: + LOGP(DL1IF, LOGL_ERROR, + "Received PCU data indication with unexpected data length: %u -- ignored.\n", + len); return -EINVAL; } - - memcpy(bts->si13, data, GSM_MACBLOCK_LEN); - bts->si13_is_set = true; - - return 0; } static int pcu_rx_data_ind(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data *data_ind) @@ -782,7 +831,7 @@ static int pcu_rx_susp_req(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_susp_req *susp_req) { - struct bssgp_bvc_ctx *bctx = bts->pcu->bssgp.bctx; + struct bssgp_bvc_ctx *bctx = the_pcu->bssgp.bctx; GprsMs *ms; struct gprs_rlcmac_dl_tbf *dl_tbf; struct gprs_rlcmac_ul_tbf *ul_tbf; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:29:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:29:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:29:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:29:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:29:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 ) Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:29:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:29:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:29:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si ...................................................................... PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si Perform a full RAN information request (single report) against the PCU and check the results. Also test what happens when the request is issued at a time where osmo-bts has no system information available. Depends: osmo-pcu Id72118120c14984d2fb1b918b41fac4868150d41 Change-Id: I9054ab0e969c0fbfdc671c92d44cc61360959adc Related: SYS#5103 --- M pcu/PCU_Tests.ttcn 1 file changed, 155 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index e44e204..c44f50a 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4152,6 +4152,158 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Send a RIM RAN info request to the PCU and verify the response, we expect + * getting the system information back which we have transfered to the PCU via + * PCUIF on startup. */ +testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { + const BssgpBvci bvci := mp_gb_cfg.bvc[0].bvci; + var octetstring si1_expect := '198fb100000000000000000000000000007900002b'O; + var octetstring si3_expect := '1b753000f110236ec9033c2747407900003c0b2b2b'O; + var octetstring si13_expect := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; + timer T := 2.0; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename()); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + + /* Send sysinfo to the PCU */ + var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_expect, 0, 0, 0, 0, 32767); + BTS.send(si1_data_ind); + var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_expect, 0, 0, 0, 0, 32767); + BTS.send(si3_data_ind); + var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_expect, 0, 0, 0, 0, 32767); + BTS.send(si16_data_ind); + f_sleep(1.0); + + var template RIM_Routing_Address dst_addr; + var template RIM_Routing_Address src_addr; + var template RAN_Information_Request_RIM_Container req_cont; + var template PDU_BSSGP bssgp_rim_pdu; + var template PDU_BSSGP bssgp_rim_pdu_expect; + var template RAN_Information_RIM_Container rim_cont_expect; + + var BssgpCellId src_cid := {ra_id := { lai := { mcc_mnc := '262F42'H, lac := 12345}, rac := 0 }, cell_id := 20962 }; + src_addr := t_RIM_Routing_Address_cid(src_cid); + dst_addr := t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id); + + + var octetstring si_expect := si1_expect & si3_expect & si13_expect; + + req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), + ts_RIM_Sequence_Number(1), + ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), + ts_RIM_Protocol_Version_Number(1), + tsu_RAN_Information_Request_Application_Container_NACC(mp_gb_cfg.bvc[0].cell_id), + omit); + bssgp_rim_pdu := ts_RAN_INFORMATION_REQUEST(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + req_cont); + + rim_cont_expect := tr_RAN_Information_RIM_Container(tr_RIM_Application_Identity(RIM_APP_ID_NACC), + tr_RIM_Sequence_Number(1), + tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), + tr_RIM_Protocol_Version_Number(1), + tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_expect)), + omit); + + bssgp_rim_pdu_expect := tr_PDU_BSSGP_RAN_INFORMATION(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + rim_cont_expect); + RIM.send(bssgp_rim_pdu); + T.start; + alt { + [] RIM.receive(bssgp_rim_pdu_expect) { } + [] RIM.receive { + setverdict(fail, "Unexpected BSSGP RIM PDU received"); + } + [] T.timeout { + setverdict(fail, "No BSSGP RIM PDU received"); + mtc.stop; + } + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + +/* Same as above, but in this case we simulate the rare case in which the PCU + * has no system information available. We expect getting a response back but + * with no system information inside. */ +testcase TC_rim_ran_info_req_single_rep_no_si() runs on RAW_PCU_Test_CT { + var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var PCUIF_Message pcu_msg; + timer T := 2.0; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + + /* Clear sysinfo from the PCU */ + var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '01'O, 0, 0, 0, 0, 32767); + BTS.send(si1_data_ind); + var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '03'O, 0, 0, 0, 0, 32767); + BTS.send(si3_data_ind); + var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0b'O, 0, 0, 0, 0, 32767); + BTS.send(si16_data_ind); + f_sleep(1.0); + + var template RIM_Routing_Address dst_addr; + var template RIM_Routing_Address src_addr; + var template RAN_Information_Request_RIM_Container req_cont; + var template PDU_BSSGP bssgp_rim_pdu; + var template PDU_BSSGP bssgp_rim_pdu_expect; + var template RAN_Information_RIM_Container rim_cont_expect; + + var BssgpCellId src_cid := {ra_id := { lai := { mcc_mnc := '262F42'H, lac := 12345}, rac := 0 }, cell_id := 20962 }; + src_addr := t_RIM_Routing_Address_cid(src_cid); + dst_addr := t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id); + + req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), + ts_RIM_Sequence_Number(1), + ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), + ts_RIM_Protocol_Version_Number(1), + tsu_RAN_Information_Request_Application_Container_NACC(mp_gb_cfg.bvc[0].cell_id), + omit); + bssgp_rim_pdu := ts_RAN_INFORMATION_REQUEST(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + req_cont); + + + rim_cont_expect := tr_RAN_Information_RIM_Container(tr_RIM_Application_Identity(RIM_APP_ID_NACC), + tr_RIM_Sequence_Number(1), + tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), + tr_RIM_Protocol_Version_Number(1), + tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 0, ''O)), + omit); + + bssgp_rim_pdu_expect := tr_PDU_BSSGP_RAN_INFORMATION(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + rim_cont_expect); + RIM.send(bssgp_rim_pdu); + T.start; + alt { + [] RIM.receive(bssgp_rim_pdu_expect) { } + [] RIM.receive { + setverdict(fail, "Unexpected BSSGP RIM PDU received"); + } + [] T.timeout { + setverdict(fail, "No BSSGP RIM PDU received"); + mtc.stop; + } + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + control { execute( TC_pcuif_suspend() ); execute( TC_pcuif_suspend_active_tbf() ); @@ -4232,6 +4384,9 @@ execute( TC_nacc_outbound_rac_ci_resolve_timeout() ); execute( TC_nacc_outbound_rac_ci_resolve_fail_parse_response() ); execute( TC_nacc_outbound_si_resolve_timeout() ); + + execute( TC_rim_ran_info_req_single_rep() ); + execute( TC_rim_ran_info_req_single_rep_no_si() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 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: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:29:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:29:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 ) Change subject: BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF ...................................................................... BTS_Tests: test forwarding of SI1, SI3 and SI13 via PCUIF Whenever the BSC is updating SI1, SI3 or SI13 via RSL, the PCU should be informed about the change via PCUIF as well. For SI13 this is already the case and a testcase exists. The PCUIF protocol is now capable to update SI1 and SI3 as well. - Update BTS_Tests.TC_pcu_ver_si13 so that it works with the current protocol version - Add BTS_Tests.TC_pcu_ver_si3 and BTS_Tests.TC_pcu_ver_si1 that test SI1 and SI3 as well. Depends: osmo-bts Ib7aeb41e634ad6fcab3766a4667b0267c749436a Change-Id: I5138ab183793e7eee4dc494318d984e9f1f56932 Related: SYS#5103 --- M bts/BTS_Tests.ttcn 1 file changed, 24 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c843032..1e96dcb 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4676,19 +4676,18 @@ } /* Test the PCU->BTS Version and BTS->PCU SI13 handshake */ -testcase TC_pcu_ver_si13() runs on test_CT { - const octetstring si13 := '00010203040506070909'O; +function f_TC_pcu_ver_siXX(octetstring si, RSL_IE_SysinfoType rsl_si_type) runs on test_CT { var PCUIF_send_data sd; timer T:= 3.0; f_init_pcu_test(); /* Set SI13 via RSL */ - f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, si13); + f_rsl_bcch_fill_raw(rsl_si_type, si); T.start; alt { [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_DATA_IND(0, 0, 0, ?, PCU_IF_SAPI_BCCH))) -> value sd { - if (substr(sd.data.u.data_ind.data, 0, lengthof(si13)) == si13) { + if (substr(sd.data.u.data_ind.data, 0, lengthof(si)) == si) { setverdict(pass); } else { repeat; @@ -4696,11 +4695,29 @@ } [] PCU.receive { repeat; } [] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for SI13"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for SI"); } } } +/* Test the PCU->BTS Version and BTS->PCU SI1 handshake */ +testcase TC_pcu_ver_si1() runs on test_CT { + const octetstring si1 := '550111132A252B27CC29AA11BB33CC'O; + f_TC_pcu_ver_siXX(si1, RSL_SYSTEM_INFO_1); +} + +/* Test the PCU->BTS Version and BTS->PCU SI3 handshake */ +testcase TC_pcu_ver_si3() runs on test_CT { + const octetstring si3 := '49012223242526272929AABBCC'O; + f_TC_pcu_ver_siXX(si3, RSL_SYSTEM_INFO_3); +} + +/* Test the PCU->BTS Version and BTS->PCU SI13 handshake */ +testcase TC_pcu_ver_si13() runs on test_CT { + const octetstring si13 := '01010203040506070909'O; + f_TC_pcu_ver_siXX(si13, RSL_SYSTEM_INFO_13); +} + private const octetstring c_PCU_DATA := '000102030405060708090a0b0c0d0e0f10111213141516'O; /* helper function to send a PCU DATA.req */ @@ -7305,6 +7322,8 @@ execute( TC_pcu_act_req_wrong_trx() ); execute( TC_pcu_deact_req() ); execute( TC_pcu_deact_req_wrong_ts() ); + execute( TC_pcu_ver_si1() ); + execute( TC_pcu_ver_si3() ); execute( TC_pcu_ver_si13() ); if (mp_l1_supports_gprs) { execute( TC_pcu_data_req_pdtch() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22540 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: I5138ab183793e7eee4dc494318d984e9f1f56932 Gerrit-Change-Number: 22540 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:30:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:30:10 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:30:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:30:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:30:12 +0000 Subject: Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI13 via PCUIF In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22541 ) Change subject: pcu_sock: send SI1, SI3 and SI13 via PCUIF ...................................................................... pcu_sock: send SI1, SI3 and SI13 via PCUIF This patch PCUIF extends the SAPI 4 that is used to transfer SI13 only, so that it can transfer SI1 and SI3 as well. The system information SI1, SI3 and SI13 is needed by the NACC RIM application which runs inside osmo-pcu. Depends: osmo-pcu I5138ab183793e7eee4dc494318d984e9f1f56932 Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Related: SYS#5103 --- M include/osmo-bts/pcu_if.h M src/common/pcu_sock.c M src/common/rsl.c 3 files changed, 77 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 1475a94..add37f8 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -4,7 +4,7 @@ extern int pcu_direct; int pcu_tx_info_ind(void); -int pcu_tx_si13(const struct gsm_bts *bts, bool enable); +int pcu_tx_si(const struct gsm_bts *bts, enum osmo_sysinfo_type si_type, bool enable); int pcu_tx_app_info_req(struct gsm_bts *bts, uint8_t app_type, uint8_t len, const uint8_t *app_data); int pcu_tx_rts_req(struct gsm_bts_trx_ts *ts, uint8_t is_ptcch, uint32_t fn, uint16_t arfcn, uint8_t block_nr); diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 0466698..ffa8e77 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -725,17 +725,64 @@ return rc; } -int pcu_tx_si13(const struct gsm_bts *bts, bool enable) +int pcu_tx_si(const struct gsm_bts *bts, enum osmo_sysinfo_type si_type, + bool enable) { /* the SI is per-BTS so it doesn't matter which TRX we use */ struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, 0); - /* The low-level data like FN, ARFCN etc will be ignored but we have to set lqual high enough to bypass - the check at lower levels */ - int rc = pcu_tx_data_ind(&trx->ts[0], PCU_IF_SAPI_BCCH, 0, 0, 0, GSM_BTS_SI(bts, SYSINFO_TYPE_13), - enable ? GSM_MACBLOCK_LEN : 0, 0, 0, 0, INT16_MAX); + uint8_t si_buf[GSM_MACBLOCK_LEN]; + uint8_t len; + int rc; + + if (enable) { + memcpy(si_buf, GSM_BTS_SI(bts, si_type), GSM_MACBLOCK_LEN); + len = GSM_MACBLOCK_LEN; + LOGP(DPCU, LOGL_DEBUG, "Updating SI%s to PCU: %s\n", + get_value_string(osmo_sitype_strs, si_type), + osmo_hexdump_nospc(si_buf, GSM_MACBLOCK_LEN)); + } else { + si_buf[0] = si_type; + len = 1; + + /* Note: SI13 is the only system information type that is revked + * by just sending a completely empty message. This is due to + * historical reasons */ + if (si_type != SYSINFO_TYPE_13) + len = 0; + + LOGP(DPCU, LOGL_DEBUG, "Revoking SI%s from PCU\n", + get_value_string(osmo_sitype_strs, si_buf[0])); + } + + /* The low-level data like FN, ARFCN etc will be ignored but we have to + * set lqual high enough to bypass the check at lower levels */ + rc = pcu_tx_data_ind(&trx->ts[0], PCU_IF_SAPI_BCCH, 0, 0, 0, si_buf, len, + 0, 0, 0, INT16_MAX); if (rc < 0) - LOGP(DPCU, LOGL_NOTICE, "Failed to send SI13 to PCU: %d\n", rc); + LOGP(DPCU, LOGL_NOTICE, "Failed to send SI%s to PCU: rc=%d\n", + get_value_string(osmo_sitype_strs, si_type), rc); + + return rc; +} + +static int pcu_tx_si_all(struct gsm_bts *bts) +{ + enum osmo_sysinfo_type si_types[3] = + { SYSINFO_TYPE_1, SYSINFO_TYPE_3, SYSINFO_TYPE_13 }; + unsigned int i; + int rc; + + for (i = 0; i < ARRAY_SIZE(si_types); i++) { + if (GSM_BTS_HAS_SI(bts, si_types[i])) { + rc = pcu_tx_si(bts, si_types[i], true); + if (rc < 0) + rc = -EINVAL; + } else + LOGP(DPCU, LOGL_INFO, + "SI%s is not available on PCU connection\n", + get_value_string(osmo_sitype_strs, si_types[i])); + } return rc; } @@ -743,6 +790,8 @@ static int pcu_rx_txt_ind(struct gsm_bts *bts, struct gsm_pcu_if_txt_ind *txt) { + int rc; + switch (txt->type) { case PCU_VERSION: LOGP(DPCU, LOGL_INFO, "OsmoPCU version %s connected\n", @@ -754,10 +803,10 @@ regenerate_si3_restoctets(bts); regenerate_si4_restoctets(bts); - if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_13)) - return pcu_tx_si13(bts, true); + rc = pcu_tx_si_all(bts); + if (rc < 0) + return -EINVAL; - LOGP(DPCU, LOGL_INFO, "SI13 is not available on PCU connection\n"); break; case PCU_OML_ALERT: oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_INDETERMINATE, OSMO_EVT_EXT_ALARM, diff --git a/src/common/rsl.c b/src/common/rsl.c index 01a0ab4..bde53a1 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -379,6 +379,7 @@ /* patch out GPRS indicator from binary if PCU is not connected; will be enabled * after PCU connects */ regenerate_si3_restoctets(bts); + pcu_tx_si(trx->bts, SYSINFO_TYPE_3, true); } else if (SYSINFO_TYPE_4 == osmo_si) { /* decode original SI4 Rest Octets as sent by BSC */ const uint8_t *si4 = (uint8_t *) GSM_BTS_SI(bts, osmo_si); @@ -391,11 +392,12 @@ * enabled after PCU connects */ regenerate_si4_restoctets(bts); } + } else if (SYSINFO_TYPE_13 == osmo_si) { + pcu_tx_si(trx->bts, SYSINFO_TYPE_13, true); + } else if (SYSINFO_TYPE_1 == osmo_si) { + pcu_tx_si(trx->bts, SYSINFO_TYPE_1, true); } - if (SYSINFO_TYPE_13 == osmo_si) - pcu_tx_si13(trx->bts, true); - } else if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) { uint16_t len = TLVP_LEN(&tp, RSL_IE_L3_INFO); if (len > sizeof(sysinfo_buf_t)) @@ -410,10 +412,20 @@ bts->si_valid &= ~(1 << osmo_si); LOGP(DRSL, LOGL_INFO, " RX RSL Disabling BCCH INFO (SI%s)\n", get_value_string(osmo_sitype_strs, osmo_si)); - if (SYSINFO_TYPE_13 == osmo_si) - pcu_tx_si13(trx->bts, false); - if (SYSINFO_TYPE_3 == osmo_si) + switch (osmo_si) { + case SYSINFO_TYPE_13: + pcu_tx_si(trx->bts, SYSINFO_TYPE_13, false); + break; + case SYSINFO_TYPE_3: memset(&bts->si3_ro_decoded, 0, sizeof(bts->si3_ro_decoded)); + pcu_tx_si(trx->bts, SYSINFO_TYPE_3, false); + break; + case SYSINFO_TYPE_1: + pcu_tx_si(trx->bts, SYSINFO_TYPE_1, false); + break; + default: + break; + } } osmo_signal_dispatch(SS_GLOBAL, S_NEW_SYSINFO, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib7aeb41e634ad6fcab3766a4667b0267c749436a Gerrit-Change-Number: 22541 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:31:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:31:20 +0000 Subject: Change in osmo-bsc[master]: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22527 ) Change subject: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 Gerrit-Change-Number: 22527 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:31:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:31:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:31:30 +0000 Subject: Change in osmo-bsc[master]: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22527 ) Change subject: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 Gerrit-Change-Number: 22527 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:31:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:31:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:31:32 +0000 Subject: Change in osmo-bsc[master]: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22527 ) Change subject: hodec2: fix intra-cell congestion balancing with source lchan on dyn TS ...................................................................... hodec2: fix intra-cell congestion balancing with source lchan on dyn TS Related: SYS#5301 Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 --- M src/osmo-bsc/handover_decision_2.c M tests/handover/test_dyn_ts_amr_tch_f_to_h_congestion_assignment_2.ho_vty M tests/handover/test_dyn_ts_amr_tch_h_to_f_congestion_assignment_2.ho_vty 3 files changed, 34 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 0bfae9b..2cb7a54 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -682,7 +682,18 @@ current_overbooked = load_above_congestion(c->current.free_tch, c->current.min_free_tch); if (requirement & REQUIREMENT_A_TCHF) { bool ok; - int32_t target_overbooked = load_above_congestion(c->target.free_tchf - 1, c->target.min_free_tchf); + int32_t target_overbooked; + int target_free_tchf_after_ho; + + /* To evaluate whether a handover improves or worsens congestion on TCH/F, first figure out how many + * TCH/F lchans will be occupied on the target after the handover. If the target is a different cell, + * then we obviously reduce by one TCH/F. If source and target cell are the same (re-assignment), then + * the source lchan may also free a TCH/F at the same time. Add up all of these effects to figure out + * the congestion percentages before and after handover. */ + target_free_tchf_after_ho = c->target.free_tchf - 1; + if (c->current.bts == c->target.bts) + target_free_tchf_after_ho += c->current.lchan_frees_tchf; + target_overbooked = load_above_congestion(target_free_tchf_after_ho, c->target.min_free_tchf); LOGPHOLCHANTOBTS(c->current.lchan, c->target.bts, LOGL_DEBUG, "current overbooked = %s%%, TCH/F target overbooked after HO = %s%%\n", osmo_int_to_float_str_c(OTC_SELECT, current_overbooked, LOAD_PRECISION - 2), @@ -718,7 +729,18 @@ } if (requirement & REQUIREMENT_A_TCHH) { bool ok; - int32_t target_overbooked = load_above_congestion(c->target.free_tchh - 1, c->target.min_free_tchh); + int32_t target_overbooked; + int target_free_tchh_after_ho; + + /* To evaluate whether a handover improves or worsens congestion on TCH/H, first figure out how many + * TCH/H lchans will be occupied on the target after the handover. If the target is a different cell, + * then we obviously reduce by one TCH/H. If source and target cell are the same (re-assignment), then + * the source lchan may also free one or two TCH/H at the same time. Add up all of these effects to + * figure out the congestion percentages before and after handover. */ + target_free_tchh_after_ho = c->target.free_tchh - 1; + if (c->current.bts == c->target.bts) + target_free_tchh_after_ho += c->current.lchan_frees_tchh; + target_overbooked = load_above_congestion(target_free_tchh_after_ho, c->target.min_free_tchh); LOGPHOLCHANTOBTS(c->current.lchan, c->target.bts, LOGL_DEBUG, "current overbooked = %s%%, TCH/H target overbooked after HO = %s%%\n", osmo_int_to_float_str_c(OTC_SELECT, current_overbooked, LOAD_PRECISION - 2), diff --git a/tests/handover/test_dyn_ts_amr_tch_f_to_h_congestion_assignment_2.ho_vty b/tests/handover/test_dyn_ts_amr_tch_f_to_h_congestion_assignment_2.ho_vty index 6194596..a798457 100644 --- a/tests/handover/test_dyn_ts_amr_tch_f_to_h_congestion_assignment_2.ho_vty +++ b/tests/handover/test_dyn_ts_amr_tch_f_to_h_congestion_assignment_2.ho_vty @@ -14,16 +14,15 @@ # (there must be at least one measurement report on each lchan for congestion check to work) meas-rep lchan * * * * rxlev 40 rxqual 0 ta 0 neighbors 30 congestion-check -# FAIL: after the handover from the dyn TS to TCH/H, the dyn TS has freed two TCH/H, while the static TCH/H has reduced -# the TCH/H count by one. So the resulting free slots are 3 TCH/H, which means no congestion. A handover should occur. -expect-no-chan +expect-ho from lchan 0 0 1 0 to lchan 0 0 4 0 +expect-ts-use trx 0 0 states * pdch - - TCH/H- * * * # Again with one more TCH/H occupied, there will still be two free TCH/H after HO on the dyn TS set-ts-use trx 0 0 states * TCH/F - - TCH/H- * * * meas-rep lchan * * * * rxlev 40 rxqual 0 ta 0 neighbors 30 congestion-check -# FAIL: resulting free slots are 2 TCH/H, which means no congestion. A handover should occur. -expect-no-chan +expect-ho from lchan 0 0 1 0 to lchan 0 0 4 1 +expect-ts-use trx 0 0 states * pdch - - TCH/HH * * * # Again, with the target being a dyn TS create-bts trx-count 1 timeslots c+s4 dyn TCH/F TCH/F dyn PDCH PDCH PDCH @@ -37,13 +36,12 @@ set-ts-use trx 1 0 states * TCH/F TCH/F - pdch * * * meas-rep lchan 1 * * * rxlev 40 rxqual 0 ta 0 neighbors 30 congestion-check -# FAIL: after the handover from the dyn TS to TCH/H, the dyn TS has freed two TCH/H, while the static TCH/H has reduced -# the TCH/H count by one. So the resulting free slots are 3 TCH/H, which means no congestion. A handover should occur. -expect-no-chan +expect-ho from lchan 1 0 1 0 to lchan 1 0 4 0 +expect-ts-use trx 1 0 states * pdch TCH/F - TCH/H- * * * # Again with one more TCH/H occupied, there will still be two free TCH/H after HO on the dyn TS set-ts-use trx 1 0 states * TCH/F TCH/F - TCH/H- * * * meas-rep lchan 1 * * * rxlev 40 rxqual 0 ta 0 neighbors 30 congestion-check -# FAIL: resulting free slots are 2 TCH/H, which means no congestion. A handover should occur. -expect-no-chan +expect-ho from lchan 1 0 1 0 to lchan 1 0 4 1 +expect-ts-use trx 1 0 states * pdch TCH/F - TCH/HH * * * diff --git a/tests/handover/test_dyn_ts_amr_tch_h_to_f_congestion_assignment_2.ho_vty b/tests/handover/test_dyn_ts_amr_tch_h_to_f_congestion_assignment_2.ho_vty index 36a9817..de9595b 100644 --- a/tests/handover/test_dyn_ts_amr_tch_h_to_f_congestion_assignment_2.ho_vty +++ b/tests/handover/test_dyn_ts_amr_tch_h_to_f_congestion_assignment_2.ho_vty @@ -21,8 +21,7 @@ set-ts-use trx 0 0 states * TCH/H- - - TCH/F * * * meas-rep lchan * * * * rxlev 40 rxqual 0 ta 0 neighbors 30 congestion-check -# FAIL: after the handover from the dyn TS to TCH/F, the dyn TS has freed a TCH/F, while the static TCH/F has reduced -# the TCH/F count by one. So the resulting free slots are 2 TCH/F, which means no congestion. A handover should occur. -expect-no-chan +expect-ho from lchan 0 0 1 0 to lchan 0 0 2 0 +expect-ts-use trx 0 0 states * pdch TCH/F - TCH/F * * * # (TCH/H -> TCH/F onto a dyn TS will always make TCH/H congestion worse, so there is no useful test case left here) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I332477cbddf32cf6f057007b45cda8477227f0b1 Gerrit-Change-Number: 22527 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:31:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:31:49 +0000 Subject: Change in osmo-bsc[master]: lchan assignment when RTP is set up: don't break on Mode Modify In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22510 ) Change subject: lchan assignment when RTP is set up: don't break on Mode Modify ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I06d3f35fcc71d77e1f30c2b15ab221ef7d5f7f27 Gerrit-Change-Number: 22510 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:32:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:32:31 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: don't download bumpversion In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22632 ) Change subject: OBS: nightly: don't download bumpversion ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 Gerrit-Change-Number: 22632 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:32:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:32:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:32:33 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: don't download bumpversion In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22632 ) Change subject: OBS: nightly: don't download bumpversion ...................................................................... OBS: nightly: don't download bumpversion Stop downloading bumpversion related archives with each run. They were not uploaded to OBS after the download (no 'osc add' runs aftewards, and last modified of network:osmocom:nightly:bumpversion is 3 years ago). bumpversion is needed to run osmo-release.sh, and is available in debian since 9 (stretch). Related: https://build.opensuse.org/package/show/network:osmocom:nightly/bumpversion Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 44f4a6e..58a8a52 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -162,21 +162,6 @@ osc status } -download_bumpversion() { - # bumpversion is required for debian < 9/stretch - local oscdir=$REPO/osc/$PROJ/bumpversion - local version=0.5.3 - local release=3 - - if [ ! -d "$oscdir" ] ; then - mkdir "$oscdir" - cd "$oscdir" - wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version-$release.dsc" - wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version.orig.tar.gz" - wget "http://http.debian.net/debian/pool/main/b/bumpversion/bumpversion_$version-$release.debian.tar.xz" - fi -} - checkout_limesuite() { cd "$REPO" git clone https://github.com/myriadrf/LimeSuite limesuite @@ -284,8 +269,6 @@ build osmo-smlc build osmo-cbc - download_bumpversion - post } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iaf2527043e9acdb6acff3e481d4516ac4b75b7e7 Gerrit-Change-Number: 22632 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:33:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:33:44 +0000 Subject: Change in osmo-pcu[master]: nacc: Implement Pkt Cell Change Continue retransmission In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: nacc: Implement Pkt Cell Change Continue retransmission ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:33:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:33:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:33:58 +0000 Subject: Change in osmo-pcu[master]: nacc: Avoid RIM procedures targeting cells under same PCU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22631 ) Change subject: nacc: Avoid RIM procedures targeting cells under same PCU ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b Gerrit-Change-Number: 22631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:33:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:34:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:34:04 +0000 Subject: Change in osmo-pcu[master]: nacc: Implement Pkt Cell Change Continue retransmission In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22604 ) Change subject: nacc: Implement Pkt Cell Change Continue retransmission ...................................................................... nacc: Implement Pkt Cell Change Continue retransmission Use the fact that the MS must answer the RRBP of the Pkt Cell Change Continue with a CTRL ACK to find out whether the message was received successfuly or a retransmission is potentially required. 3GPP TS 44.060: """ When the mobile station receives the PACKET CELL CHANGE ORDER or the PACKET CELL CHANGE CONTINUE message the mobile station shall transmit a PACKET CONTROL ACKNOWLEDGMENT message in the specified uplink radio block if a valid RRBP field is received as part of the message; the mobile station may then switch to a new cell. """ Related: SYS#4909 Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f --- M src/encoding.cpp M src/encoding.h M src/gprs_ms.c M src/gprs_ms.h M src/gprs_rlcmac_sched.cpp M src/nacc_fsm.c M src/nacc_fsm.h M src/pdch.cpp M src/tbf.cpp M src/tbf.h 10 files changed, 105 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/encoding.cpp b/src/encoding.cpp index 38bc175..8bc8d15 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -1757,14 +1757,14 @@ block->u.Packet_Neighbour_Cell_Data.Container = *container; } -void write_packet_cell_change_continue(RlcMacDownlink_t *block, - bool tfi_is_dl, uint8_t tfi, bool exist_id, - uint16_t arfcn, uint8_t bsic, uint8_t container_id) +void write_packet_cell_change_continue(RlcMacDownlink_t *block, uint8_t poll, uint8_t rrbp, + bool tfi_is_dl, uint8_t tfi, bool exist_id, + uint16_t arfcn, uint8_t bsic, uint8_t container_id) { block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header - block->RRBP = 0; // 0: N+13 - block->SP = 0; // RRBP field is not valid + block->RRBP = rrbp; // RRBP (e.g. N+13) + block->SP = poll; // RRBP field is valid? block->USF = 0x0; // Uplink state flag block->u.Packet_Cell_Change_Continue.MESSAGE_TYPE = MT_PACKET_CELL_CHANGE_CONTINUE; diff --git a/src/encoding.h b/src/encoding.h index 4ebfa35..89d057c 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -124,9 +124,9 @@ bool tfi_is_dl, uint8_t tfi, uint8_t container_id, uint8_t container_idx, PNCDContainer_t *container); -void write_packet_cell_change_continue(RlcMacDownlink_t *block, - bool tfi_is_dl, uint8_t tfi, bool exist_id, - uint16_t arfcn, uint8_t bsic, uint8_t container_id); +void write_packet_cell_change_continue(RlcMacDownlink_t *block, uint8_t poll, uint8_t rrbp, + bool tfi_is_dl, uint8_t tfi, bool exist_id, + uint16_t arfcn, uint8_t bsic, uint8_t container_id); #ifdef __cplusplus } diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 8078b10..ab1a067 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -958,13 +958,17 @@ return false; } -struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf) +struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts) { int rc; struct nacc_ev_create_rlcmac_msg_ctx data_ctx; - data_ctx.tbf = tbf; - data_ctx.msg = NULL; + data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx) { + .tbf = tbf, + .fn = fn, + .ts = ts, + .msg = NULL, + }; rc = osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_CREATE_RLCMAC_MSG, &data_ctx); if (rc != 0 || !data_ctx.msg) diff --git a/src/gprs_ms.h b/src/gprs_ms.h index c57bbf6..6674261 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -144,7 +144,7 @@ int ms_nacc_start(struct GprsMs *ms, Packet_Cell_Change_Notification_t *notif); bool ms_nacc_rts(const struct GprsMs *ms); -struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf); +struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts); static inline bool ms_is_idle(const struct GprsMs *ms) { diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index a8f65de..5f029a0 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -203,7 +203,7 @@ else if (tbf == tbfs->ul_ack) msg = tbfs->ul_ack->create_ul_ack(fn, ts); else if (tbf == tbfs->nacc) { - msg = ms_nacc_create_rlcmac_msg(tbf->ms(), tbf); + msg = ms_nacc_create_rlcmac_msg(tbf->ms(), tbf, fn, ts); } if (!msg) { diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index d160404..b479f9c 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -46,6 +46,7 @@ [NACC_ST_WAIT_REQUEST_SI] = { .T = PCU_TDEF_SI_RESOLVE_TO }, [NACC_ST_TX_NEIGHBOUR_DATA] = {}, [NACC_ST_TX_CELL_CHG_CONTINUE] = {}, + [NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK] = {}, /* Timeout through event controlled by tbf::poll_timeout() */ [NACC_ST_DONE] = {}, }; @@ -64,6 +65,8 @@ { NACC_EV_RX_RAC_CI, "RX_RAC_CI" }, { NACC_EV_RX_SI, "RX_SI" }, { NACC_EV_CREATE_RLCMAC_MSG, "CREATE_RLCMAC_MSG" }, + { NACC_EV_RX_CELL_CHG_CONTINUE_ACK, "RX_CELL_CHG_CONTINUE_ACK"}, + { NACC_EV_TIMEOUT_CELL_CHG_CONTINUE, "TIMEOUT_CELL_CHG_CONTINUE" }, { 0, NULL } }; @@ -156,12 +159,21 @@ /* TS 44 060 11.2.2a Packet Cell Change Continue */ static struct msgb *create_packet_cell_chg_continue(const struct nacc_fsm_ctx *ctx, - const struct gprs_rlcmac_tbf *tbf) + const struct nacc_ev_create_rlcmac_msg_ctx *data, + uint32_t *new_poll_fn) { struct msgb *msg; int rc; RlcMacDownlink_t *mac_control_block; + struct gprs_rlcmac_tbf *tbf = data->tbf; struct GprsMs *ms = tbf_ms(tbf); + unsigned int rrbp; + + rc = tbf_check_polling(tbf, data->fn, data->ts, new_poll_fn, &rrbp); + if (rc < 0) { + LOGP(DTBF, LOGL_ERROR, "Failed registering poll for Pkt Cell Chg Continue (%d)\n", rc); + return NULL; + } msg = msgb_alloc(GSM_MACBLOCK_LEN, "pkt_cell_chg_continue"); if (!msg) @@ -180,7 +192,7 @@ uint8_t tfi_is_dl = tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF; uint8_t tfi = tbf_tfi(tbf); uint8_t container_id = 0; - write_packet_cell_change_continue(mac_control_block, tfi_is_dl, tfi, true, + write_packet_cell_change_continue(mac_control_block, 1, rrbp, tfi_is_dl, tfi, true, ctx->neigh_key.tgt_arfcn, ctx->neigh_key.tgt_bsic, container_id); LOGP(DNACC, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Cell Change Continue +++++++++++++++++++++++++\n"); rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block); @@ -191,6 +203,7 @@ LOGP(DNACC, LOGL_DEBUG, "------------------------- TX : Packet Cell Change Continue -------------------------\n"); rate_ctr_inc(&bts_rate_counters(ms->bts)->ctr[CTR_PKT_CELL_CHG_CONTINUE]); talloc_free(mac_control_block); + tbf_set_polling(tbf, *new_poll_fn, data->ts, GPRS_RLCMAC_POLL_CELL_CHG_CONTINUE); return msg; free_ret: @@ -458,7 +471,24 @@ switch (event) { case NACC_EV_CREATE_RLCMAC_MSG: data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data; - data_ctx->msg = create_packet_cell_chg_continue(ctx, data_ctx->tbf); + data_ctx->msg = create_packet_cell_chg_continue(ctx, data_ctx, &ctx->continue_poll_fn); + if (data_ctx->msg) { + ctx->continue_poll_ts = data_ctx->ts; + nacc_fsm_state_chg(fi, NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK); + } + break; + default: + OSMO_ASSERT(0); + } +} + +static void st_wait_cell_chg_continue_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case NACC_EV_TIMEOUT_CELL_CHG_CONTINUE: + nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); + break; + case NACC_EV_RX_CELL_CHG_CONTINUE_ACK: nacc_fsm_state_chg(fi, NACC_ST_DONE); break; default: @@ -543,10 +573,20 @@ X(NACC_EV_RX_SI) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = - X(NACC_ST_DONE), + X(NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK), .name = "TX_CELL_CHG_CONTINUE", .action = st_cell_chg_continue, }, + [NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK] = { + .in_event_mask = + X(NACC_EV_RX_CELL_CHG_CONTINUE_ACK) | + X(NACC_EV_TIMEOUT_CELL_CHG_CONTINUE), + .out_state_mask = + X(NACC_ST_TX_CELL_CHG_CONTINUE) | + X(NACC_ST_DONE), + .name = "WAIT_CELL_CHG_CONTINUE_ACK", + .action = st_wait_cell_chg_continue_ack, + }, [NACC_ST_DONE] = { .in_event_mask = 0, .out_state_mask = 0, diff --git a/src/nacc_fsm.h b/src/nacc_fsm.h index 9107daf..7b0adfd 100644 --- a/src/nacc_fsm.h +++ b/src/nacc_fsm.h @@ -32,6 +32,8 @@ NACC_EV_RX_RAC_CI, /* no data passed, RAC_CI became available in neigh_cache */ NACC_EV_RX_SI, /* data: struct si_cache_entry* */ NACC_EV_CREATE_RLCMAC_MSG, /* data: struct nacc_ev_create_rlcmac_msg_ctx* */ + NACC_EV_RX_CELL_CHG_CONTINUE_ACK, + NACC_EV_TIMEOUT_CELL_CHG_CONTINUE, /* Poll Timeout */ }; enum nacc_fsm_states { @@ -40,6 +42,7 @@ NACC_ST_WAIT_REQUEST_SI, NACC_ST_TX_NEIGHBOUR_DATA, NACC_ST_TX_CELL_CHG_CONTINUE, + NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK, NACC_ST_DONE, }; @@ -53,11 +56,15 @@ struct si_cache_value si_info; /* SI info resolved from SGSN, to be sent to MS */ size_t si_info_bytes_sent; /* How many bytes out of si_info->si_len were already sent to MS */ size_t container_idx; /* Next container_idx to assign when sending Packet Neighbor Data message */ + uint32_t continue_poll_fn; /* Scheduled poll FN to CTRL ACK the Pkt Cell Chg Continue */ + uint8_t continue_poll_ts; /* Scheduled poll TS to CTRL ACK the Pkt Cell Chg Continue */ }; /* passed as data in NACC_EV_CREATE_RLCMAC_MSG */ struct nacc_ev_create_rlcmac_msg_ctx { struct gprs_rlcmac_tbf *tbf; /* target tbf to create messages for */ + uint32_t fn; /* FN where the created DL ctrl block is to be sent */ + uint8_t ts; /* TS where the created DL ctrl block is to be sent */ struct msgb *msg; /* to be filled by FSM during event processing */ }; diff --git a/src/pdch.cpp b/src/pdch.cpp index 2028ba2..787208c 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -47,6 +47,7 @@ #include "coding_scheme.h" #include "gsm_rlcmac.h" +#include "nacc_fsm.h" } #include @@ -394,6 +395,19 @@ return; } + if (ms->nacc && ms->nacc->fi->state == NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK && + ms->nacc->continue_poll_fn == fn && ms->nacc->continue_poll_ts == ts_no) { + osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_CELL_CHG_CONTINUE_ACK, NULL); + /* Don't assume MS is no longer reachable (hence don't free) after this: TS 44.060 + * "When the mobile station receives the PACKET CELL CHANGE ORDER + * or the PACKET CELL CHANGE CONTINUE message the mobile station + * shall transmit a PACKET CONTROL ACKNOWLEDGMENT message in the + * specified uplink radio block if a valid RRBP field is + * received as part of the message; the mobile station _MAY_ then + * switch to a new cell." + */ + return; + } LOGP(DRLCMAC, LOGL_ERROR, "Error: received PACET CONTROL ACK " "at no request\n"); } diff --git a/src/tbf.cpp b/src/tbf.cpp index 35bd81d..7caa2ce 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -49,6 +49,7 @@ #include "gsm_rlcmac.h" #include "coding_scheme.h" +#include "nacc_fsm.h" } #include @@ -614,6 +615,10 @@ LOGPTBFDL(this, LOGL_DEBUG, "Scheduled DL Acknowledgement polling on %s (FN=%d, TS=%d)\n", chan, poll_fn, poll_ts); break; + case GPRS_RLCMAC_POLL_CELL_CHG_CONTINUE: + LOGPTBFDL(this, LOGL_DEBUG, "Scheduled 'Packet Cell Change Continue' polling on %s (FN=%d, TS=%d)\n", + chan, poll_fn, poll_ts); + break; } } @@ -690,6 +695,11 @@ } /* reschedule DL assignment */ dl_ass_state = GPRS_RLCMAC_DL_ASS_SEND_ASS; + } else if (m_ms->nacc && m_ms->nacc->fi->state == NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK && + m_ms->nacc->continue_poll_fn == poll_fn && m_ms->nacc->continue_poll_ts == poll_ts) { + /* 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) { gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(this); @@ -1203,3 +1213,13 @@ { return tbf->tfi(); } + +int tbf_check_polling(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts, uint32_t *poll_fn, unsigned int *rrbp) +{ + return tbf->check_polling(fn, ts, poll_fn, rrbp); +} + +void tbf_set_polling(struct gprs_rlcmac_tbf *tbf, uint32_t new_poll_fn, uint8_t ts, enum gprs_rlcmac_tbf_poll_type t) +{ + return tbf->set_polling(new_poll_fn, ts, t); +} diff --git a/src/tbf.h b/src/tbf.h index 1d28afb..989ec08 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -68,6 +68,7 @@ GPRS_RLCMAC_POLL_DL_ASS, GPRS_RLCMAC_POLL_UL_ACK, GPRS_RLCMAC_POLL_DL_ACK, + GPRS_RLCMAC_POLL_CELL_CHG_CONTINUE, }; enum gprs_rlcmac_tbf_poll_state { @@ -206,6 +207,8 @@ bool tbf_is_tfi_assigned(const struct gprs_rlcmac_tbf *tbf); uint8_t tbf_tfi(const struct gprs_rlcmac_tbf *tbf); int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf); +int tbf_check_polling(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts, uint32_t *poll_fn, unsigned int *rrbp); +void tbf_set_polling(struct gprs_rlcmac_tbf *tbf, uint32_t new_poll_fn, uint8_t ts, enum gprs_rlcmac_tbf_poll_type t); #ifdef __cplusplus } #endif -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cc28922e71699598da0ef6eb90136a47d3c002f Gerrit-Change-Number: 22604 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:34:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:34:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: ACK Pkt Cell Change Continue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 ) Change subject: pcu: ACK Pkt Cell Change Continue ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 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: I73aaa80e73b2abb06fd0084433122337dc9c4e3f Gerrit-Change-Number: 22627 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:34:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:34:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:34:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 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: I371033604db8ae845e7c3fb03aef1821520064d9 Gerrit-Change-Number: 22628 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:34:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:34:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:34:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: ACK Pkt Cell Change Continue In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 ) Change subject: pcu: ACK Pkt Cell Change Continue ...................................................................... pcu: ACK Pkt Cell Change Continue Related: OS#4909 Change-Id: I73aaa80e73b2abb06fd0084433122337dc9c4e3f --- M pcu/PCU_Tests.ttcn 1 file changed, 31 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index c44f50a..e302480 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3597,10 +3597,9 @@ f_shutdown(__BFILE__, __LINE__, final := true); } -private function f_skip_dummy(integer max_num_iter) +private function f_skip_dummy(integer max_num_iter, out uint32_t sched_fn) runs on RAW_PCU_Test_CT return RlcmacDlBlock { var RlcmacDlBlock dl_block; - var uint32_t sched_fn; var integer i := 0; while (true) { f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -3628,7 +3627,7 @@ var octetstring exp_si_chunk; var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; - dl_block := f_skip_dummy(50); + dl_block := f_skip_dummy(50, sched_fn); while (true) { var template RlcmacDlCtrlMsg exp_msg; exp_msg := @@ -3745,7 +3744,11 @@ setverdict(fail, "Rx unexpected DL block: ", dl_block); f_shutdown(__BFILE__, __LINE__); } - + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } } /* Verify PCU handles outbound Network Assisted Cell Change Cell Change (NACC, TS 44.060 sec 8.8). */ @@ -3936,11 +3939,16 @@ f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } @@ -4000,11 +4008,16 @@ f_ctrl_exp_get(IPA_CTRL, ctrl_var, omit); /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } @@ -4064,11 +4077,16 @@ f_ctrl_exp_get(IPA_CTRL, ctrl_var, "foobar-error"); /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } @@ -4143,11 +4161,16 @@ /* We never answer the RIM procude -> PCU timeouts and should send Pkt Cell Chg continue */ /* Wait until we receive something non-dummy */ - dl_block := f_skip_dummy(0); + dl_block := f_skip_dummy(0, sched_fn); /* Make sure it is a Pkt Cell Chg Continue */ if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { setverdict(fail, "Rx unexpected DL block: ", dl_block); } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } f_shutdown(__BFILE__, __LINE__, final := true); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 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: I73aaa80e73b2abb06fd0084433122337dc9c4e3f Gerrit-Change-Number: 22627 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:34:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:34:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 ) Change subject: pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack ...................................................................... pcu: Introduce test TC_nacc_outbound_success_no_ctrl_ack Related: OS#4909 Change-Id: I371033604db8ae845e7c3fb03aef1821520064d9 --- M pcu/PCU_Tests.ttcn 1 file changed, 59 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index e302480..1d6349d 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3685,7 +3685,8 @@ /* Start NACC from MS side */ private function f_outbound_nacc_success(inout GprsMS ms, PCUIF_info_ind info_ind, - boolean exp_rac_ci_query := true, boolean exp_si_query := true) + boolean exp_rac_ci_query := true, boolean exp_si_query := true, + boolean skip_final_ctrl_ack := false) runs on RAW_PCU_Test_CT { var template (value) RlcmacUlCtrlMsg cell_chf_notif; var RlcmacDlBlock dl_block; @@ -3745,7 +3746,7 @@ f_shutdown(__BFILE__, __LINE__); } /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ - if (dl_block.ctrl.mac_hdr.rrbp_valid) { + if (not skip_final_ctrl_ack and dl_block.ctrl.mac_hdr.rrbp_valid) { sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); } @@ -3792,6 +3793,61 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Verify Pkt Cell Change Continue is retransmitted if not CTRL ACKed */ +testcase TC_nacc_outbound_success_no_ctrl_ack() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var MultislotCap_GPRS mscap_gprs := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B + }; + var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side, avoid sending final CTRL ACK */ + f_outbound_nacc_success(ms, info_ind, skip_final_ctrl_ack := true); + + /* Wait until we receive something non-dummy */ + dl_block := f_skip_dummy(0, sched_fn); + /* Make sure it is a Pkt Cell Chg Continue (retransmitted)*/ + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Verify PCU handles outbound Network Assisted Cell Change Cell Change (NACC, TS 44.060 sec 8.8) twice, the second time using the caches */ testcase TC_nacc_outbound_success_twice() runs on RAW_PCU_Test_CT { var PollFnCtx pollctx; @@ -4401,6 +4457,7 @@ execute( TC_pcuif_info_ind_subsequent() ); execute( TC_nacc_outbound_success() ); + execute( TC_nacc_outbound_success_no_ctrl_ack() ); execute( TC_nacc_outbound_success_twice() ); execute( TC_nacc_outbound_success_twice_nocache() ); execute( TC_nacc_outbound_rac_ci_resolve_conn_refused() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22628 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: I371033604db8ae845e7c3fb03aef1821520064d9 Gerrit-Change-Number: 22628 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:35:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:35:45 +0000 Subject: Change in osmo-gsm-manuals[master]: diag-filter.conf: drop version from nwdiag / packetdiag commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 ) Change subject: diag-filter.conf: drop version from nwdiag / packetdiag commands ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > Unfortunately this won't work. It would use the pip3 version in gerrit-verifications and master-builds jenkins jobs, but then the debian packages would break. > > https://git.osmocom.org/osmo-gsm-manuals/tree/debian/control?id=ee37483661e1792ec0d2cee2a85f69ff7a1d136a#n18 > > Apparently even debian 10 (buster) ships that old version: > https://packages.debian.org/search?keywords=python3%2Dnwdiag > > How do the build failures look like? can we not simply package a more recent python3-nwdiag in the network:osmocom:* feed and then depend on that from osmo-gsm-manuals-dev? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Gerrit-Change-Number: 22624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 03 Feb 2021 08:35:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:35:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:35:53 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: install nwdiag using pip3 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22623 ) Change subject: debian-stretch-jenkins: install nwdiag using pip3 ...................................................................... Patch Set 1: can we not simply package a more recent python3-nwdiag in the network:osmocom:* feed and then depend on that from osmo-gsm-manuals-dev? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5f7d7a343ff773b2c936cb7e650f166fed69671d Gerrit-Change-Number: 22623 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 03 Feb 2021 08:35:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:36:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:36:55 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Add osmo-gbproxy-* container for osmo-gbproxy Uses the new repo split off of osmo-sgsn Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 --- M make/Makefile A osmo-gbproxy-latest/Dockerfile A osmo-gbproxy-latest/Makefile A osmo-gbproxy-latest/Release.key A osmo-gbproxy-latest/osmo-gbproxy.cfg M osmo-gbproxy-master/Dockerfile A osmo-gbproxy-master/Release.key M osmo-gbproxy-master/osmo-gbproxy.cfg M ttcn3-gbproxy-test/jenkins.sh 9 files changed, 207 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/22636/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:38:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:38:04 +0000 Subject: Change in osmo-ci[master]: master + gerrit jenkins jobs: Add osmo-gbproxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22582 ) Change subject: master + gerrit jenkins jobs: Add osmo-gbproxy ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id29c83bdcd9b626bb7920738c8b1f945ef7f3671 Gerrit-Change-Number: 22582 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 03 Feb 2021 08:38:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:38:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:38:06 +0000 Subject: Change in osmo-ci[master]: master + gerrit jenkins jobs: Add osmo-gbproxy In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22582 ) Change subject: master + gerrit jenkins jobs: Add osmo-gbproxy ...................................................................... master + gerrit jenkins jobs: Add osmo-gbproxy osmo-gbproxy is moving to its own reporitory Change-Id: Id29c83bdcd9b626bb7920738c8b1f945ef7f3671 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 5447495..aa8fc76 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -247,6 +247,7 @@ - osmo-uecups - osmo-el2tpd - osmo-smlc + - osmo-gbproxy - pysim: slave_axis: !!python/tuple [simtester] diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index cab841d..e6a8239 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -347,6 +347,7 @@ - osmo-uecups - osmo-el2tpd - osmo-smlc + - osmo-gbproxy - rtl-sdr: email: laforge at gnumonks.org steve at steve-m.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id29c83bdcd9b626bb7920738c8b1f945ef7f3671 Gerrit-Change-Number: 22582 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:38:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:38:28 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Build osmo-cbc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22583 ) Change subject: osmocom-latest-packages: Build osmo-cbc ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia5bfd126ad168da7ab629b1f18ecfd60d4a49a51 Gerrit-Change-Number: 22583 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 03 Feb 2021 08:38:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:38:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:38:30 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Build osmo-cbc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22583 ) Change subject: osmocom-latest-packages: Build osmo-cbc ...................................................................... osmocom-latest-packages: Build osmo-cbc osmo-cbc has full support for building dpkg + rpm from the latest tag (0.2), hence we can enable building it also in 'latest' Change-Id: Ia5bfd126ad168da7ab629b1f18ecfd60d4a49a51 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 9c842be..906d068 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -151,6 +151,7 @@ checkout neocon https://github.com/laf0rge/neocon checkout osmo-uecups checkout osmo-e1d + checkout osmo-cbc cd "$TOP" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -188,6 +189,7 @@ # re-enable after libosmcoore > 1.3.1 is released (osmo_system_nowait2) #build osmo-uecups build osmo-e1d + build osmo-cbc cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" --noservice -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia5bfd126ad168da7ab629b1f18ecfd60d4a49a51 Gerrit-Change-Number: 22583 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:38:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:38:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on c... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22437 ) Change subject: pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on correct port ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22437 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: I0457302fef24a362f0720247ea653b06af9e1c87 Gerrit-Change-Number: 22437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 03 Feb 2021 08:38:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:38:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on c... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22437 ) Change subject: pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on correct port ...................................................................... pcu: TC_bssgp_dl_unitdata_with_invalid_imsi: Expect BSSGP STATUS on correct port Change-Id: I0457302fef24a362f0720247ea653b06af9e1c87 --- M pcu/PCU_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 1d6349d..4204139 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -2644,7 +2644,7 @@ /* Now SGSN sends some DL data with an invalid IMSI */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, imsi := ts_BSSGP_IMSI('1122'H))); - BSSGP_SIG[0].receive(tr_BSSGP_STATUS(omit, BSSGP_CAUSE_CONDITIONAL_IE_ERROR, ?)); + BSSGP_GLOBAL[0].receive(tr_BSSGP_STATUS(omit, BSSGP_CAUSE_CONDITIONAL_IE_ERROR, ?)); /* TODO: make sure no data is sent over PCU -> MS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22437 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: I0457302fef24a362f0720247ea653b06af9e1c87 Gerrit-Change-Number: 22437 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:40:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:40:30 +0000 Subject: Change in pysim[master]: pySim-read.py: Add support for reading USIM+ISIM data from third-part... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/22351 ) Change subject: pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b Gerrit-Change-Number: 22351 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:40:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:40:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:40:33 +0000 Subject: Change in pysim[master]: pySim-read.py: Add support for reading USIM+ISIM data from third-part... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/22351 ) Change subject: pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC ...................................................................... pySim-read.py: Add support for reading USIM+ISIM data from third-party UICC Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b --- M pySim-read.py 1 file changed, 25 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-read.py b/pySim-read.py index b94e709..f901260 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -33,7 +33,7 @@ from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map from pySim.commands import SimCardCommands -from pySim.cards import card_detect, Card +from pySim.cards import card_detect, Card, UsimCard, IsimCard from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, dec_msisdn from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, init_reader, dec_addr_tlv from pySim.utils import h2s, format_ePDGSelection @@ -250,9 +250,12 @@ # Check whether we have th AID of USIM, if so select it by its AID # EF.UST - File Id in ADF USIM : 6f38 if '9000' == card.select_adf_by_aid(): + # Select USIM profile + usim_card = UsimCard(scc) + # EF.EHPLMN - if card.file_exists(EF_USIM_ADF_map['EHPLMN']): - (res, sw) = card.read_ehplmn() + if usim_card.file_exists(EF_USIM_ADF_map['EHPLMN']): + (res, sw) = usim_card.read_ehplmn() if sw == '9000': print("EHPLMN:\n%s" % (res)) else: @@ -260,10 +263,10 @@ # EF.UST try: - if card.file_exists(EF_USIM_ADF_map['UST']): + if usim_card.file_exists(EF_USIM_ADF_map['UST']): # res[0] - EF content of UST # res[1] - Human readable format of services marked available in UST - (res, sw) = card.read_ust() + (res, sw) = usim_card.read_ust() if sw == '9000': print("USIM Service Table: %s" % res[0]) print("%s" % res[1]) @@ -274,8 +277,8 @@ #EF.ePDGId - Home ePDG Identifier try: - if card.file_exists(EF_USIM_ADF_map['ePDGId']): - (res, sw) = card.read_epdgid() + if usim_card.file_exists(EF_USIM_ADF_map['ePDGId']): + (res, sw) = usim_card.read_epdgid() if sw == '9000': print("ePDGId:\n%s" % (len(res) and res or '\tNot available\n',)) else: @@ -285,8 +288,8 @@ #EF.ePDGSelection - ePDG Selection Information try: - if card.file_exists(EF_USIM_ADF_map['ePDGSelection']): - (res, sw) = card.read_ePDGSelection() + if usim_card.file_exists(EF_USIM_ADF_map['ePDGSelection']): + (res, sw) = usim_card.read_ePDGSelection() if sw == '9000': print("ePDGSelection:\n%s" % (res,)) else: @@ -296,18 +299,21 @@ # Select ISIM application by its AID if '9000' == card.select_adf_by_aid(adf="isim"): + # Select USIM profile + isim_card = IsimCard(scc) + #EF.P-CSCF - P-CSCF Address try: - if card.file_exists(EF_ISIM_ADF_map['PCSCF']): - res = card.read_pcscf() + if isim_card.file_exists(EF_ISIM_ADF_map['PCSCF']): + res = isim_card.read_pcscf() print("P-CSCF:\n%s" % (len(res) and res or '\tNot available\n',)) except Exception as e: print("P-CSCF: Can't read file -- " + str(e)) # EF.DOMAIN - Home Network Domain Name e.g. ims.mncXXX.mccXXX.3gppnetwork.org try: - if card.file_exists(EF_ISIM_ADF_map['DOMAIN']): - (res, sw) = card.read_domain() + if isim_card.file_exists(EF_ISIM_ADF_map['DOMAIN']): + (res, sw) = isim_card.read_domain() if sw == '9000': print("Home Network Domain Name: %s" % (len(res) and res or 'Not available',)) else: @@ -317,8 +323,8 @@ # EF.IMPI - IMS private user identity try: - if card.file_exists(EF_ISIM_ADF_map['IMPI']): - (res, sw) = card.read_impi() + if isim_card.file_exists(EF_ISIM_ADF_map['IMPI']): + (res, sw) = isim_card.read_impi() if sw == '9000': print("IMS private user identity: %s" % (len(res) and res or 'Not available',)) else: @@ -328,16 +334,16 @@ # EF.IMPU - IMS public user identity try: - if card.file_exists(EF_ISIM_ADF_map['IMPU']): - res = card.read_impu() + if isim_card.file_exists(EF_ISIM_ADF_map['IMPU']): + res = isim_card.read_impu() print("IMS public user identity:\n%s" % (len(res) and res or '\tNot available\n',)) except Exception as e: print("IMS public user identity: Can't read file -- " + str(e)) # EF.UICCIARI - UICC IARI try: - if card.file_exists(EF_ISIM_ADF_map['UICCIARI']): - res = card.read_iari() + if isim_card.file_exists(EF_ISIM_ADF_map['UICCIARI']): + res = isim_card.read_iari() print("UICC IARI:\n%s" % (len(res) and res or '\tNot available\n',)) except Exception as e: print("UICC IARI: Can't read file -- " + str(e)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8b95630e90cb5833482da2690e423e7adefb95b Gerrit-Change-Number: 22351 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:41:54 +0000 Subject: Change in osmo-bsc[master]: manual: Location Services: clarify BSC side address In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22081 ) Change subject: manual: Location Services: clarify BSC side address ...................................................................... Patch Set 1: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b06ac7a2f2cb34cabfcec10af761322b8e962fb Gerrit-Change-Number: 22081 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:41:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:44:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:44:41 +0000 Subject: Change in osmo-msc[master]: Add vty option to globally enable LCLS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13421 ) Change subject: Add vty option to globally enable LCLS ...................................................................... Patch Set 15: I've stumbled across this old patch. As far as I can see, it makes LCLS disable-able. The question is: Do we wnat that? @keith, do you remember the context of this patch? If we merge it, I would rather say it is "permit lcls" than "enable lcls", as whether or not LCLS can be used depends on a lot of other conditions, not just this newly introduced flag. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibb587e6ae47cff71f5bf2e2d22c1da86cd7e1762 Gerrit-Change-Number: 13421 Gerrit-PatchSet: 15 Gerrit-Owner: Max Gerrit-Assignee: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: Hoernchen Gerrit-Comment-Date: Wed, 03 Feb 2021 08:44:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:45:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:45:01 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Use LOGHNB() to add log context information to log lines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/21900 ) Change subject: hnbgw: Use LOGHNB() to add log context information to log lines ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/21900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia16eed4ca5e9ef231259e94c65105f7586f366bc Gerrit-Change-Number: 21900 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:45:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:45:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:45:04 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Use LOGHNB() to add log context information to log lines In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/21900 ) Change subject: hnbgw: Use LOGHNB() to add log context information to log lines ...................................................................... hnbgw: Use LOGHNB() to add log context information to log lines So far we don't really have any way of matching a given log message to a specific hNB. Let's use the newly-introduced LOGHNB() macro. Change-Id: Ia16eed4ca5e9ef231259e94c65105f7586f366bc --- M src/context_map.c M src/hnbgw.c M src/hnbgw_hnbap.c M src/hnbgw_ranap.c M src/hnbgw_rua.c 5 files changed, 103 insertions(+), 134 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/context_map.c b/src/context_map.c index dc555bf..f516efe 100644 --- a/src/context_map.c +++ b/src/context_map.c @@ -85,11 +85,11 @@ } if (alloc_cn_conn_id(cn_if_new, &new_scu_conn_id) < 0) { - LOGP(DMAIN, LOGL_ERROR, "Unable to allocate CN connection ID\n"); + LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unable to allocate CN connection ID\n"); return NULL; } - LOGP(DMAIN, LOGL_INFO, "Creating new Mapping RUA CTX %p/%u <-> SCU Conn ID %p/%u\n", + LOGHNB(hnb, DMAIN, LOGL_INFO, "Creating new Mapping RUA CTX %p/%u <-> SCU Conn ID %p/%u\n", hnb, rua_ctx_id, cn_if_new, new_scu_conn_id); /* alloate a new map entry */ @@ -125,8 +125,7 @@ /* we don't allocate new mappings in the CN->HNB * direction, as the RUA=SCCP=SUA connections are always * established from HNB towards CN. */ - LOGP(DMAIN, LOGL_NOTICE, "Unable to resolve map for CN " - "connection ID %p/%u\n", cn, scu_conn_id); + LOGP(DMAIN, LOGL_NOTICE, "Unable to resolve map for CN " "connection ID %p/%u\n", cn, scu_conn_id); return NULL; } diff --git a/src/hnbgw.c b/src/hnbgw.c index ba8a06f..a6e0d29 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -235,7 +235,7 @@ msgb_free(msg); return 0; } else if (rc < 0) { - LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); + LOGHNB(hnb, DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); /* FIXME: clean up after disappeared HNB */ hnb_context_release(hnb); goto out; @@ -260,13 +260,11 @@ case IUH_PPI_SABP: case IUH_PPI_RNA: case IUH_PPI_PUA: - LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%lu received\n", - msgb_sctp_ppid(msg)); + LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%lu received\n", msgb_sctp_ppid(msg)); rc = 0; break; default: - LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%lu received\n", - msgb_sctp_ppid(msg)); + LOGHNB(hnb, DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%lu received\n", msgb_sctp_ppid(msg)); rc = 0; break; } diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c index c118774..bc503d3 100644 --- a/src/hnbgw_hnbap.c +++ b/src/hnbgw_hnbap.c @@ -64,8 +64,8 @@ memset(&reject_out, 0, sizeof(reject_out)); rc = hnbap_encode_hnbregisterrejecties(&reject_out, &reject); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Failure to encode HNB-REGISTER-REJECT to %s: rc=%d\n", - ctx->identity_info, rc); + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to encode HNB-REGISTER-REJECT to %s: rc=%d\n", + ctx->identity_info, rc); return rc; } @@ -106,8 +106,8 @@ memset(&accept_out, 0, sizeof(accept_out)); rc = hnbap_encode_hnbregisteraccepties(&accept_out, &accept); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Failure to encode HNB-REGISTER-ACCEPT to %s: rc=%d\n", - ctx->identity_info, rc); + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to encode HNB-REGISTER-ACCEPT to %s: rc=%d\n", + ctx->identity_info, rc); return rc; } @@ -119,7 +119,7 @@ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBRegisterAccept, &accept_out); - LOGP(DHNBAP, LOGL_NOTICE, "Accepting HNB-REGISTER-REQ from %s\n", ctx->identity_info); + LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "Accepting HNB-REGISTER-REQ from %s\n", ctx->identity_info); return hnbgw_hnbap_tx(ctx, msg); } @@ -174,20 +174,14 @@ /* Copy the identity over to the reject message */ switch (ue_id->present) { case UE_Identity_PR_tMSILAI: - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id tMSI %d %s\n", - ue_id->choice.tMSILAI.tMSI.size, - osmo_hexdump(ue_id->choice.tMSILAI.tMSI.buf, - ue_id->choice.tMSILAI.tMSI.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id tMSI %d %s\n", ue_id->choice.tMSILAI.tMSI.size, + osmo_hexdump(ue_id->choice.tMSILAI.tMSI.buf, ue_id->choice.tMSILAI.tMSI.size)); - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id pLMNID %d %s\n", - ue_id->choice.tMSILAI.lAI.pLMNID.size, - osmo_hexdump(ue_id->choice.tMSILAI.lAI.pLMNID.buf, - ue_id->choice.tMSILAI.lAI.pLMNID.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id pLMNID %d %s\n", ue_id->choice.tMSILAI.lAI.pLMNID.size, + osmo_hexdump(ue_id->choice.tMSILAI.lAI.pLMNID.buf, ue_id->choice.tMSILAI.lAI.pLMNID.size)); - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id lAC %d %s\n", - ue_id->choice.tMSILAI.lAI.lAC.size, - osmo_hexdump(ue_id->choice.tMSILAI.lAI.lAC.buf, - ue_id->choice.tMSILAI.lAI.lAC.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id lAC %d %s\n", ue_id->choice.tMSILAI.lAI.lAC.size, + osmo_hexdump(ue_id->choice.tMSILAI.lAI.lAC.buf, ue_id->choice.tMSILAI.lAI.lAC.size)); BIT_STRING_fromBuf(&reject.uE_Identity.choice.tMSILAI.tMSI, ue_id->choice.tMSILAI.tMSI.buf, @@ -202,25 +196,17 @@ break; case UE_Identity_PR_pTMSIRAI: - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id pTMSI %d %s\n", - ue_id->choice.pTMSIRAI.pTMSI.size, - osmo_hexdump(ue_id->choice.pTMSIRAI.pTMSI.buf, - ue_id->choice.pTMSIRAI.pTMSI.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id pTMSI %d %s\n", ue_id->choice.pTMSIRAI.pTMSI.size, + osmo_hexdump(ue_id->choice.pTMSIRAI.pTMSI.buf, ue_id->choice.pTMSIRAI.pTMSI.size)); - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id pLMNID %d %s\n", - ue_id->choice.pTMSIRAI.rAI.lAI.pLMNID.size, - osmo_hexdump(ue_id->choice.pTMSIRAI.rAI.lAI.pLMNID.buf, - ue_id->choice.pTMSIRAI.rAI.lAI.pLMNID.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id pLMNID %d %s\n", ue_id->choice.pTMSIRAI.rAI.lAI.pLMNID.size, + osmo_hexdump(ue_id->choice.pTMSIRAI.rAI.lAI.pLMNID.buf, ue_id->choice.pTMSIRAI.rAI.lAI.pLMNID.size)); - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id lAC %d %s\n", - ue_id->choice.pTMSIRAI.rAI.lAI.lAC.size, - osmo_hexdump(ue_id->choice.pTMSIRAI.rAI.lAI.lAC.buf, - ue_id->choice.pTMSIRAI.rAI.lAI.lAC.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id lAC %d %s\n", ue_id->choice.pTMSIRAI.rAI.lAI.lAC.size, + osmo_hexdump(ue_id->choice.pTMSIRAI.rAI.lAI.lAC.buf, ue_id->choice.pTMSIRAI.rAI.lAI.lAC.size)); - LOGP(DHNBAP, LOGL_DEBUG, "REJ UE_Id rAC %d %s\n", - ue_id->choice.pTMSIRAI.rAI.rAC.size, - osmo_hexdump(ue_id->choice.pTMSIRAI.rAI.rAC.buf, - ue_id->choice.pTMSIRAI.rAI.rAC.size)); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "REJ UE_Id rAC %d %s\n", ue_id->choice.pTMSIRAI.rAI.rAC.size, + osmo_hexdump(ue_id->choice.pTMSIRAI.rAI.rAC.buf, ue_id->choice.pTMSIRAI.rAI.rAC.size)); BIT_STRING_fromBuf(&reject.uE_Identity.choice.pTMSIRAI.pTMSI, ue_id->choice.pTMSIRAI.pTMSI.buf, @@ -238,13 +224,12 @@ break; default: - LOGP(DHNBAP, LOGL_ERROR, "Cannot compose UE Register Reject:" + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Cannot compose UE Register Reject:" " unsupported UE ID (present=%d)\n", ue_id->present); return -1; } - LOGP(DHNBAP, LOGL_ERROR, "Rejecting UE Register Request:" - " TMSI identity registration is switched off\n"); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Rejecting UE Register Request: TMSI identity registration is switched off\n"); reject.cause.present = Cause_PR_radioNetwork; reject.cause.choice.radioNetwork = CauseRadioNetwork_invalid_UE_identity; @@ -337,14 +322,12 @@ break; default: - LOGP(DHNBAP, LOGL_ERROR, "Unsupportedccept UE ID (present=%d)\n", - ue_id->present); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Unsupportedccept UE ID (present=%d)\n", ue_id->present); return -1; } tmsi = ntohl(tmsi); - LOGP(DHNBAP, LOGL_DEBUG, "HNBAP register with TMSI %x\n", - tmsi); + LOGHNB(hnb, DHNBAP, LOGL_DEBUG, "HNBAP register with TMSI %x\n", tmsi); ue = ue_context_by_tmsi(hnb->gw, tmsi); if (!ue) @@ -402,8 +385,7 @@ if (rc < 0) return rc; - DEBUGP(DHNBAP, "HNB-DE-REGISTER cause=%s\n", - hnbap_cause_str(&ies.cause)); + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "HNB-DE-REGISTER cause=%s\n", hnbap_cause_str(&ies.cause)); hnbap_free_hnbde_registeries(&ies); hnb_context_release(ctx); @@ -419,8 +401,8 @@ rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Failure to decode HNB-REGISTER-REQ from %s: rc=%d\n", - ctx->identity_info, rc); + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode HNB-REGISTER-REQ from %s: rc=%d\n", + ctx->identity_info, rc); return rc; } @@ -437,9 +419,9 @@ if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) { struct osmo_fd *ofd = osmo_stream_srv_get_ofd(ctx->conn); char *name = osmo_sock_get_name(ctx, ofd->fd); - LOGP(DHNBAP, LOGL_ERROR, "rejecting HNB-REGISTER-REQ with duplicate cell identity " - "MCC=%u,MNC=%u,LAC=%u,RAC=%u,SAC=%u,CID=%u from %s\n", - ctx->id.mcc, ctx->id.mnc, ctx->id.lac, ctx->id.rac, ctx->id.sac, ctx->id.cid, name); + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "rejecting HNB-REGISTER-REQ with duplicate cell identity " + "MCC=%u,MNC=%u,LAC=%u,RAC=%u,SAC=%u,CID=%u from %s\n", + ctx->id.mcc, ctx->id.mnc, ctx->id.lac, ctx->id.rac, ctx->id.sac, ctx->id.cid, name); talloc_free(name); return hnbgw_tx_hnb_register_rej(ctx); } @@ -447,7 +429,7 @@ ctx->hnb_registered = true; - DEBUGP(DHNBAP, "HNB-REGISTER-REQ from %s\n", ctx->identity_info); + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "HNB-REGISTER-REQ from %s\n", ctx->identity_info); /* Send HNBRegisterAccept */ rc = hnbgw_tx_hnb_register_acc(ctx); @@ -489,14 +471,13 @@ hnbap_free_ueregisterrequesties(&ies); return rc; default: - LOGP(DHNBAP, LOGL_NOTICE, - "UE-REGISTER-REQ with unsupported UE Id type %d\n", - ies.uE_Identity.present); + LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "UE-REGISTER-REQ with unsupported UE Id type %d\n", + ies.uE_Identity.present); hnbap_free_ueregisterrequesties(&ies); return rc; } - DEBUGP(DHNBAP, "UE-REGISTER-REQ ID_type=%d imsi=%s cause=%ld\n", + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-REGISTER-REQ ID_type=%d imsi=%s cause=%ld\n", ies.uE_Identity.present, imsi, ies.registration_Cause); ue = ue_context_by_imsi(ctx->gw, imsi); @@ -521,8 +502,7 @@ ctxid = asn1bitstr_to_u24(&ies.context_ID); - DEBUGP(DHNBAP, "UE-DE-REGISTER context=%u cause=%s\n", - ctxid, hnbap_cause_str(&ies.cause)); + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-DE-REGISTER context=%u cause=%s\n", ctxid, hnbap_cause_str(&ies.cause)); ue = ue_context_by_id(ctx->gw, ctxid); if (ue) @@ -541,8 +521,7 @@ if (rc < 0) return rc; - LOGP(DHNBAP, LOGL_NOTICE, "HNBAP ERROR.ind, cause: %s\n", - hnbap_cause_str(&ies.cause)); + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "HNBAP ERROR.ind, cause: %s\n", hnbap_cause_str(&ies.cause)); hnbap_free_errorindicationies(&ies); return 0; @@ -573,12 +552,10 @@ case ProcedureCode_id_RelocationComplete: /* 8.11 */ case ProcedureCode_id_U_RNTIQuery: /* 8.12 */ case ProcedureCode_id_privateMessage: - LOGP(DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", - imsg->procedureCode); + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); break; default: - LOGP(DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", - imsg->procedureCode); + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); break; } @@ -594,10 +571,9 @@ static int hnbgw_rx_unsuccessful_outcome_msg(struct hnb_context *hnb, UnsuccessfulOutcome_t *msg) { /* We don't care much about HNBAP */ - LOGP(DHNBAP, LOGL_ERROR, "Received Unsuccessful Outcome, procedureCode %ld, criticality %ld," - " from '%s', cell mcc %u mnc %u lac %u rac %u sac %u cid %u\n", - msg->procedureCode, msg->criticality, hnb->identity_info, - hnb->id.mcc, hnb->id.mnc, hnb->id.lac, hnb->id.rac, hnb->id.sac, hnb->id.cid); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Received Unsuccessful Outcome, procedureCode %ld, criticality %ld," + " cell mcc %u mnc %u lac %u rac %u sac %u cid %u\n", msg->procedureCode, msg->criticality, + hnb->id.mcc, hnb->id.mnc, hnb->id.lac, hnb->id.rac, hnb->id.sac, hnb->id.cid); return 0; } @@ -619,8 +595,7 @@ rc = hnbgw_rx_unsuccessful_outcome_msg(hnb, &pdu->choice.unsuccessfulOutcome); break; default: - LOGP(DHNBAP, LOGL_NOTICE, "Unknown HNBAP Presence %u\n", - pdu->present); + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Presence %u\n", pdu->present); rc = -1; } @@ -639,7 +614,7 @@ dec_ret = aper_decode(NULL, &asn_DEF_HNBAP_PDU, (void **) &pdu, msg->data, msgb_length(msg), 0, 0); if (dec_ret.code != RC_OK) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ASN.1 decode\n"); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Error in ASN.1 decode\n"); return -1; } diff --git a/src/hnbgw_ranap.c b/src/hnbgw_ranap.c index 6822752..445d463 100644 --- a/src/hnbgw_ranap.c +++ b/src/hnbgw_ranap.c @@ -64,7 +64,7 @@ if (ies.cN_DomainIndicator == RANAP_CN_DomainIndicator_ps_domain) is_ps=1; - LOGP(DRANAP, LOGL_INFO, "Rx RESET.req(%s,%s)\n", is_ps ? "ps" : "cs", + LOGHNB(hnb, DRANAP, LOGL_INFO, "Rx RESET.req(%s,%s)\n", is_ps ? "ps" : "cs", ranap_cause_str(&ies.cause)); /* FIXME: Actually we have to wait for some guard time? */ @@ -84,10 +84,9 @@ return rc; if (ies.presenceMask & ERRORINDICATIONIES_RANAP_CAUSE_PRESENT) { - LOGP(DRANAP, LOGL_ERROR, "Rx ERROR.ind(%s)\n", - ranap_cause_str(&ies.cause)); + LOGHNB(hnb, DRANAP, LOGL_ERROR, "Rx ERROR.ind(%s)\n", ranap_cause_str(&ies.cause)); } else - LOGP(DRANAP, LOGL_ERROR, "Rx ERROR.ind\n"); + LOGHNB(hnb, DRANAP, LOGL_ERROR, "Rx ERROR.ind\n"); return 0; } @@ -117,12 +116,12 @@ case RANAP_ProcedureCode_id_InformationTransfer: case RANAP_ProcedureCode_id_DirectInformationTransfer: case RANAP_ProcedureCode_id_UplinkInformationExchange: - LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " - "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); + LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); + LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); break; } @@ -145,12 +144,12 @@ case RANAP_ProcedureCode_id_InformationTransfer: case RANAP_ProcedureCode_id_DirectInformationTransfer: case RANAP_ProcedureCode_id_UplinkInformationExchange: - LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " - "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); + LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); + LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "Procedure %lu from HNB, ignoring\n", imsg->procedureCode); break; } @@ -171,13 +170,13 @@ rc = ranap_rx_successful_msg(hnb, &pdu->choice.successfulOutcome); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " - "unsuccessful outcome procedure %lu from HNB, ignoring\n", - pdu->choice.unsuccessfulOutcome.procedureCode); + LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "unsuccessful outcome procedure %lu from HNB, ignoring\n", + pdu->choice.unsuccessfulOutcome.procedureCode); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "presence %u from HNB, ignoring\n", pdu->present); + LOGHNB(hnb, DRANAP, LOGL_NOTICE, "Received suspicious RANAP " + "presence %u from HNB, ignoring\n", pdu->present); break; } @@ -188,6 +187,7 @@ int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t _pdu, *pdu = &_pdu; + struct hnb_context *hnb = msg->dst; asn_dec_rval_t dec_ret; int rc; @@ -195,11 +195,11 @@ dec_ret = aper_decode(NULL,&asn_DEF_RANAP_RANAP_PDU, (void **) &pdu, data, len, 0, 0); if (dec_ret.code != RC_OK) { - LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); + LOGHNB(hnb, DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); return -1; } - rc = _hnbgw_ranap_rx(msg->dst, pdu); + rc = _hnbgw_ranap_rx(hnb, pdu); return rc; } diff --git a/src/hnbgw_rua.c b/src/hnbgw_rua.c index 71c3f8e..5224bf1 100644 --- a/src/hnbgw_rua.c +++ b/src/hnbgw_rua.c @@ -86,7 +86,7 @@ &out); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_ConnectionlessTransfer, &out); - DEBUGP(DRUA, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); return hnbgw_rua_tx(hnb, msg); } @@ -122,7 +122,7 @@ &out); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_DirectTransfer, &out); - DEBUGP(DRUA, "transmitting RUA (cn=%s) payload of %u bytes\n", + LOGHNB(hnb, DRUA, LOGL_DEBUG, "transmitting RUA (cn=%s) payload of %u bytes\n", is_ps ? "ps" : "cs", msgb_length(msg)); return hnbgw_rua_tx(hnb, msg); @@ -163,7 +163,7 @@ &out); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_Disconnect, &out); - DEBUGP(DRUA, "transmitting RUA (cn=%s) payload of %u bytes\n", + LOGHNB(hnb, DRUA, LOGL_DEBUG, "transmitting RUA (cn=%s) payload of %u bytes\n", is_ps ? "ps" : "cs", msgb_length(msg)); @@ -198,13 +198,12 @@ is_ps = true; break; default: - LOGP(DRUA, LOGL_ERROR, "Unsupported Domain %ld\n", - cN_DomainIndicator); + LOGHNB(hnb, DRUA, LOGL_ERROR, "Unsupported Domain %ld\n", cN_DomainIndicator); return -1; } if (!cn) { - DEBUGP(DRUA, "CN=NULL, discarding message\n"); + LOGHNB(hnb, DRUA, LOGL_NOTICE, "CN=NULL, discarding message\n"); return 0; } @@ -215,17 +214,14 @@ switch (type) { case OSMO_SCU_PRIM_N_UNITDATA: - DEBUGP(DRUA, "rua_to_scu() %s to %s, rua_ctx_id %u (unitdata, no scu_conn_id)\n", - cn_domain_indicator_to_str(cN_DomainIndicator), - osmo_sccp_addr_dump(remote_addr), - context_id); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u (unitdata, no scu_conn_id)\n", + cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), context_id); break; default: map = context_map_alloc_by_hnb(hnb, context_id, is_ps, cn); OSMO_ASSERT(map); - DEBUGP(DRUA, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u\n", - cn_domain_indicator_to_str(cN_DomainIndicator), - osmo_sccp_addr_dump(remote_addr), + LOGHNB(hnb, DRUA, LOGL_DEBUG, "rua_to_scu() %s to %s, rua_ctx_id %u scu_conn_id %u\n", + cn_domain_indicator_to_str(cN_DomainIndicator), osmo_sccp_addr_dump(remote_addr), map->rua_ctx_id, map->scu_conn_id); } @@ -237,10 +233,10 @@ prim->u.connect.sccp_class = 2; prim->u.connect.conn_id = map->scu_conn_id; /* Two separate logs because of osmo_sccp_addr_dump(). */ - DEBUGP(DRUA, "RUA to SCCP N_CONNECT: called_addr:%s\n", - osmo_sccp_addr_dump(&prim->u.connect.called_addr)); - DEBUGP(DRUA, "RUA to SCCP N_CONNECT: calling_addr:%s\n", - osmo_sccp_addr_dump(&prim->u.connect.calling_addr)); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_CONNECT: called_addr:%s\n", + osmo_sccp_addr_dump(&prim->u.connect.called_addr)); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_CONNECT: calling_addr:%s\n", + osmo_sccp_addr_dump(&prim->u.connect.calling_addr)); break; case OSMO_SCU_PRIM_N_DATA: prim->u.data.conn_id = map->scu_conn_id; @@ -254,10 +250,10 @@ prim->u.unitdata.called_addr = *remote_addr; prim->u.unitdata.calling_addr = cn->gw->sccp.local_addr; /* Two separate logs because of osmo_sccp_addr_dump(). */ - DEBUGP(DRUA, "RUA to SCCP N_UNITDATA: called_addr:%s\n", - osmo_sccp_addr_dump(&prim->u.unitdata.called_addr)); - DEBUGP(DRUA, "RUA to SCCP N_UNITDATA: calling_addr:%s\n", - osmo_sccp_addr_dump(&prim->u.unitdata.calling_addr)); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_UNITDATA: called_addr:%s\n", + osmo_sccp_addr_dump(&prim->u.unitdata.called_addr)); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA to SCCP N_UNITDATA: calling_addr:%s\n", + osmo_sccp_addr_dump(&prim->u.unitdata.calling_addr)); break; default: return -EINVAL; @@ -352,11 +348,9 @@ context_id = asn1bitstr_to_u24(&ies.context_ID); - DEBUGP(DRUA, "RUA %s Connect.req(ctx=0x%x, %s)\n", - cn_domain_indicator_to_str(ies.cN_DomainIndicator), - context_id, - ies.establishment_Cause == RUA_Establishment_Cause_emergency_call - ? "emergency" : "normal"); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA %s Connect.req(ctx=0x%x, %s)\n", + cn_domain_indicator_to_str(ies.cN_DomainIndicator), context_id, + ies.establishment_Cause == RUA_Establishment_Cause_emergency_call ? "emergency" : "normal"); rc = rua_to_scu(hnb, ies.cN_DomainIndicator, OSMO_SCU_PRIM_N_CONNECT, context_id, 0, ies.ranaP_Message.buf, @@ -384,7 +378,7 @@ context_id = asn1bitstr_to_u24(&ies.context_ID); scu_cause = rua_to_scu_cause(&ies.cause); - DEBUGP(DRUA, "RUA Disconnect.req(ctx=0x%x,cause=%s)\n", context_id, + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA Disconnect.req(ctx=0x%x,cause=%s)\n", context_id, rua_cause_str(&ies.cause)); if (ies.presenceMask & DISCONNECTIES_RUA_RANAP_MESSAGE_PRESENT) { @@ -414,7 +408,7 @@ context_id = asn1bitstr_to_u24(&ies.context_ID); - DEBUGP(DRUA, "RUA Data.req(ctx=0x%x)\n", context_id); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA Data.req(ctx=0x%x)\n", context_id); rc = rua_to_scu(hnb, ies.cN_DomainIndicator, @@ -430,13 +424,14 @@ static int rua_rx_init_udt(struct msgb *msg, ANY_t *in) { RUA_ConnectionlessTransferIEs_t ies; + struct hnb_context *hnb = msg->dst; int rc; rc = rua_decode_connectionlesstransferies(&ies, in); if (rc < 0) return rc; - DEBUGP(DRUA, "RUA UData.req()\n"); + LOGHNB(hnb, DRUA, LOGL_DEBUG, "RUA UData.req()\n"); /* according tot the spec, we can primarily receive Overload, * Reset, Reset ACK, Error Indication, reset Resource, Reset @@ -455,14 +450,14 @@ static int rua_rx_init_err_ind(struct msgb *msg, ANY_t *in) { RUA_ErrorIndicationIEs_t ies; + struct hnb_context *hnb = msg->dst; int rc; rc = rua_decode_errorindicationies(&ies, in); if (rc < 0) return rc; - LOGP(DRUA, LOGL_ERROR, "RUA UData.ErrorInd(%s)\n", - rua_cause_str(&ies.cause)); + LOGHNB(hnb, DRUA, LOGL_ERROR, "RUA UData.ErrorInd(%s)\n", rua_cause_str(&ies.cause)); rua_free_errorindicationies(&ies); return rc; @@ -470,6 +465,7 @@ static int rua_rx_initiating_msg(struct msgb *msg, RUA_InitiatingMessage_t *imsg) { + struct hnb_context *hnb = msg->dst; int rc; switch (imsg->procedureCode) { @@ -489,13 +485,11 @@ rc = rua_rx_init_err_ind(msg, &imsg->value); break; case RUA_ProcedureCode_id_privateMessage: - LOGP(DRUA, LOGL_NOTICE, - "Unhandled: RUA Initiating Msg: Private Msg\n"); + LOGHNB(hnb, DRUA, LOGL_NOTICE, "Unhandled: RUA Initiating Msg: Private Msg\n"); rc = 0; break; default: - LOGP(DRUA, LOGL_NOTICE, "Unknown RUA Procedure %lu\n", - imsg->procedureCode); + LOGHNB(hnb, DRUA, LOGL_NOTICE, "Unknown RUA Procedure %lu\n", imsg->procedureCode); rc = -1; } @@ -504,21 +498,24 @@ static int rua_rx_successful_outcome_msg(struct msgb *msg, RUA_SuccessfulOutcome_t *in) { + struct hnb_context *hnb = msg->dst; /* FIXME */ - LOGP(DRUA, LOGL_NOTICE, "Unexpected RUA Successful Outcome\n"); + LOGHNB(hnb, DRUA, LOGL_NOTICE, "Unexpected RUA Successful Outcome\n"); return -1; } static int rua_rx_unsuccessful_outcome_msg(struct msgb *msg, RUA_UnsuccessfulOutcome_t *in) { + struct hnb_context *hnb = msg->dst; /* FIXME */ - LOGP(DRUA, LOGL_NOTICE, "Unexpected RUA Unsucessful Outcome\n"); + LOGHNB(hnb, DRUA, LOGL_NOTICE, "Unexpected RUA Unsucessful Outcome\n"); return -1; } static int _hnbgw_rua_rx(struct msgb *msg, RUA_RUA_PDU_t *pdu) { + struct hnb_context *hnb = msg->dst; int rc; /* it's a bit odd that we can't dispatch on procedure code, but @@ -534,7 +531,7 @@ rc = rua_rx_unsuccessful_outcome_msg(msg, &pdu->choice.unsuccessfulOutcome); break; default: - LOGP(DRUA, LOGL_NOTICE, "Unknown RUA presence %u\n", pdu->present); + LOGHNB(hnb, DRUA, LOGL_NOTICE, "Unknown RUA presence %u\n", pdu->present); rc = -1; } @@ -553,7 +550,7 @@ dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu, msg->data, msgb_length(msg), 0, 0); if (dec_ret.code != RC_OK) { - LOGP(DRUA, LOGL_ERROR, "Error in ASN.1 decode\n"); + LOGHNB(hnb, DRUA, LOGL_ERROR, "Error in ASN.1 decode\n"); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/21900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia16eed4ca5e9ef231259e94c65105f7586f366bc Gerrit-Change-Number: 21900 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:45:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:45:20 +0000 Subject: Change in osmo-msc[master]: SMS-over-GSUP: notify sender if no transaction found In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/17876 ) Change subject: SMS-over-GSUP: notify sender if no transaction found ...................................................................... Patch Set 4: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/17876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4f564610fadbfdbbc33de267786534a5405319f6 Gerrit-Change-Number: 17876 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:45:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:46:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:46:17 +0000 Subject: Change in osmo-remsim[master]: bankd: regex matching of reader names In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/20811 ) Change subject: bankd: regex matching of reader names ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/20811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I58b71f9562e152e7ed21b55d7b876bba481b01f8 Gerrit-Change-Number: 20811 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:46:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:47:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:47:44 +0000 Subject: Change in osmo-bsc[master]: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-boun... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20290 ) Change subject: generate_ma_for_ts: check num_cell_arfcns to guarantee no out-of-bounds access ...................................................................... Patch Set 1: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ee8e8b4ba5e16b955685ba42bd58dc2ea08720f Gerrit-Change-Number: 20290 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:47:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:48:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:48:27 +0000 Subject: Change in libosmo-sccp[master]: fixup for 'Introduce SS7 IPv6 support' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19855 ) Change subject: fixup for 'Introduce SS7 IPv6 support' ...................................................................... Patch Set 1: ping? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia41c66665614436ded879c935755993bfeb259a0 Gerrit-Change-Number: 19855 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:48:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:49:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:49:04 +0000 Subject: Change in libosmo-abis[master]: e1_input: Support I.460 timeslot type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/18933 ) Change subject: e1_input: Support I.460 timeslot type ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I44da6dfec77ef475adb35001a0e4fa11d549aa02 Gerrit-Change-Number: 18933 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:49:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:49:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:49:07 +0000 Subject: Change in libosmo-abis[master]: e1_input: Support I.460 timeslot type In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/18933 ) Change subject: e1_input: Support I.460 timeslot type ...................................................................... e1_input: Support I.460 timeslot type Unlike the legacy TRAU mode, this only adds I460 mux/demux, without any TRAU frame synchronization. The user must still be adding the actual sub-channels using osmo_i460_subchan_add() depending on his requirements. Change-Id: I44da6dfec77ef475adb35001a0e4fa11d549aa02 --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/dahdi.c M src/input/e1d.c M src/input/misdn.c 5 files changed, 41 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 44708bb..9b99f12 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -73,9 +74,10 @@ E1INP_TS_TYPE_TRAU, E1INP_TS_TYPE_RAW, E1INP_TS_TYPE_HDLC, + E1INP_TS_TYPE_I460, }; const char *e1inp_tstype_name(enum e1inp_ts_type tp); -extern const struct value_string e1inp_ts_type_names[6]; +extern const struct value_string e1inp_ts_type_names[]; /* A timeslot in the E1 interface */ struct e1inp_ts { @@ -115,6 +117,9 @@ /* queue of pending to-be-transmitted msgbs */ struct llist_head tx_queue; } hdlc; + struct { + struct osmo_i460_timeslot i460_ts; + } i460; }; union { struct { diff --git a/src/e1_input.c b/src/e1_input.c index df61c7b..04c464a 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #define NUM_E1_TS 32 @@ -241,12 +242,13 @@ return get_value_string(e1inp_sign_type_names, tp); } -const struct value_string e1inp_ts_type_names[6] = { +const struct value_string e1inp_ts_type_names[] = { { E1INP_TS_TYPE_NONE, "None" }, { E1INP_TS_TYPE_SIGN, "Signalling" }, { E1INP_TS_TYPE_TRAU, "TRAU" }, { E1INP_TS_TYPE_RAW, "RAW" }, { E1INP_TS_TYPE_HDLC, "HDLC" }, + { E1INP_TS_TYPE_I460, "I460" }, { 0, NULL } }; @@ -313,6 +315,17 @@ return 0; } +int e1inp_ts_config_i460(struct e1inp_ts *ts, struct e1inp_line *line) +{ + if (ts->type == E1INP_TS_TYPE_I460 && ts->line && line) + return 0; + + ts->type = E1INP_TS_TYPE_I460; + ts->line = line; + osmo_i460_ts_init(&ts->i460.i460_ts); + return 0; +} + void e1inp_ts_name(char *out, size_t out_len, const struct e1inp_ts *ts) { if (ts->line->name) @@ -679,6 +692,10 @@ case E1INP_TS_TYPE_HDLC: ts->hdlc.recv_cb(ts, msg); break; + case E1INP_TS_TYPE_I460: + osmo_i460_demux_in(&ts->i460.i460_ts, msg->l2h, msgb_l2len(msg)); + msgb_free(msg); + break; default: ret = -EINVAL; LOGPITS(ts, DLMI, LOGL_ERROR, "unknown TS type %u\n", ts->type); @@ -809,6 +826,13 @@ /* Get msgb from tx_queue */ msg = msgb_dequeue(&e1i_ts->hdlc.tx_queue); break; + case E1INP_TS_TYPE_I460: + msg = msgb_alloc(TSX_ALLOC_SIZE, "I460_TX"); + if (!msg) + return NULL; + len = osmo_i460_mux_out(&e1i_ts->i460.i460_ts, msg->data, 160); + msgb_put(msg, len); + break; default: LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", e1i_ts->type); return NULL; diff --git a/src/input/dahdi.c b/src/input/dahdi.c index a29a233..e59518a 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -199,7 +199,8 @@ /* We never include the DAHDI B-Channel FD into the * writeset, since it doesn't support poll() based * write flow control */ - if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { + if (e1i_ts->type == E1INP_TS_TYPE_TRAU || + e1i_ts->type == E1INP_TS_TYPE_I460) { LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); return 0; } @@ -498,6 +499,7 @@ * writeset, since it doesn't support poll() based * write flow control */ break; + case E1INP_TS_TYPE_I460: case E1INP_TS_TYPE_RAW: if (what & OSMO_FD_EXCEPT) handle_dahdi_exception(e1i_ts); @@ -685,6 +687,7 @@ return ret; break; case E1INP_TS_TYPE_TRAU: + case E1INP_TS_TYPE_I460: case E1INP_TS_TYPE_RAW: /* close/release LAPD instance, if any */ if (e1i_ts->lapd) { diff --git a/src/input/e1d.c b/src/input/e1d.c index e3a3b82..3ae1d89 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -310,7 +310,8 @@ e1d_want_write(struct e1inp_ts *e1i_ts) { /* We never include the DAHDI B-Channel FD into the writeset */ - if (e1i_ts->type == E1INP_TS_TYPE_TRAU) { + if (e1i_ts->type == E1INP_TS_TYPE_TRAU || + e1i_ts->type == E1INP_TS_TYPE_I460) { LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "Trying to write TRAU ts\n"); return 0; } @@ -429,6 +430,7 @@ bfd->when = OSMO_FD_READ; break; case E1INP_TS_TYPE_TRAU: + case E1INP_TS_TYPE_I460: case E1INP_TS_TYPE_RAW: /* close/release LAPD instance, if any */ if (e1i_ts->lapd) { diff --git a/src/input/misdn.c b/src/input/misdn.c index 52cd311..0237cb9 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -213,7 +213,8 @@ /* We never include the mISDN B-Channel FD into the * writeset, since it doesn't support poll() based * write flow control */ - if (e1i_ts->type == E1INP_TS_TYPE_TRAU) + if (e1i_ts->type == E1INP_TS_TYPE_TRAU || + e1i_ts->type == E1INP_TS_TYPE_I460) return 0; e1i_ts->driver.misdn.fd.when |= OSMO_FD_WRITE; @@ -611,6 +612,7 @@ bfd->when = OSMO_FD_READ; break; case E1INP_TS_TYPE_TRAU: + case E1INP_TS_TYPE_I460: case E1INP_TS_TYPE_RAW: bfd->fd = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_RAW); /* We never include the mISDN B-Channel FD into the -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/18933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I44da6dfec77ef475adb35001a0e4fa11d549aa02 Gerrit-Change-Number: 18933 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:49:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:49:50 +0000 Subject: Change in osmo-bsc[master]: abis_nm: properly warn about unknown / not supported features In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18599 ) Change subject: abis_nm: properly warn about unknown / not supported features ...................................................................... Patch Set 4: final ping before abandon? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2f925bcdb010cb10d074bf7c82619e3ae1f8818b Gerrit-Change-Number: 18599 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 08:49:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:50:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:50:04 +0000 Subject: Change in osmo-bsc[master]: BS-11: Send proprietary MRPCI message after assignment + HO complete In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19492 ) Change subject: BS-11: Send proprietary MRPCI message after assignment + HO complete ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6cb6d25e405aa888c4df4022d897330a6af9e946 Gerrit-Change-Number: 19492 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 08:50:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:50:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:50:07 +0000 Subject: Change in osmo-bsc[master]: BS-11: Send proprietary MRPCI message after assignment + HO complete In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19492 ) Change subject: BS-11: Send proprietary MRPCI message after assignment + HO complete ...................................................................... BS-11: Send proprietary MRPCI message after assignment + HO complete This is a non-standard RSL message that must be sent after each traffic channel has been established. Without it, any voice call will be disconnected within seconds. This is a hack; we need to store the subscribers classmark2 value and use it here. Change-Id: I6cb6d25e405aa888c4df4022d897330a6af9e946 Related: OS#2389 --- M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/handover_fsm.c 2 files changed, 19 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 6dba214..e5ef1c5 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -224,10 +225,19 @@ static void assignment_success(struct gsm_subscriber_connection *conn) { + struct gsm_bts *bts; + /* Take on the new lchan */ gscon_change_primary_lchan(conn, conn->assignment.new_lchan); conn->assignment.new_lchan = NULL; + bts = conn_get_bts(conn); + if (is_siemens_bts(bts) && ts_is_tch(conn->lchan->ts)) { + /* HACK: store the actual Classmark 2 LV from the subscriber and use it here! */ + uint8_t cm2_lv[] = { 0x02, 0x00, 0x00 }; + send_siemens_mrpci(conn->lchan, cm2_lv); + } + /* apply LCLS configuration (if any) */ lcls_apply_config(conn); diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 573f249..b9caf04 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -937,9 +937,18 @@ LOG_HO(conn, LOGL_INFO, "Result: %s\n", handover_result_name(result)); if (ho->new_lchan && result == HO_RESULT_OK) { + struct gsm_bts *bts; + gscon_change_primary_lchan(conn, conn->ho.new_lchan); ho->new_lchan = NULL; + bts = conn_get_bts(conn); + if (is_siemens_bts(bts) && ts_is_tch(conn->lchan->ts)) { + /* HACK: store the actual Classmark 2 LV from the subscriber and use it here! */ + uint8_t cm2_lv[] = { 0x02, 0x00, 0x00 }; + send_siemens_mrpci(conn->lchan, cm2_lv); + } + /* If a Perform Location Request (LCS) is busy, inform the SMLC that there is a new lchan */ if (conn->lcs.loc_req) osmo_fsm_inst_dispatch(conn->lcs.loc_req->fi, LCS_LOC_REQ_EV_HANDOVER_PERFORMED, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6cb6d25e405aa888c4df4022d897330a6af9e946 Gerrit-Change-Number: 19492 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 08:50:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 08:50:59 +0000 Subject: Change in osmo-remsim[master]: bankd: regex matching of reader names In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/20811 ) Change subject: bankd: regex matching of reader names ...................................................................... bankd: regex matching of reader names So far, bankd did a 1:1 string match of the CSV file line against the reader name. As pcsc-lite reader names unfortunately tend to change at times, we introduce matching by regular expressions in this patch. Change-Id: I58b71f9562e152e7ed21b55d7b876bba481b01f8 --- M doc/manuals/chapters/remsim-bankd.adoc M src/bankd/bankd_pcsc.c 2 files changed, 115 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc index e76afd5..87dafa1 100644 --- a/doc/manuals/chapters/remsim-bankd.adoc +++ b/doc/manuals/chapters/remsim-bankd.adoc @@ -108,6 +108,9 @@ This CSV file specifies the mapping between the string names of the PCSC readers and the RSPRO bandk/slot numbers. The format is as follows: +* first column: bankd number +* second column: slot number within bankd +* third column: extended POSIX regular expression matching the slot .Example: CSV file mapping bankd slots 0..4 to an ACS ACR33U-A1 reader slots ---- @@ -128,4 +131,24 @@ ---- In this example, there's only a single PC/SC reader available, and it has a string of -"Alcor Micro AU9560 00 00" which needs to be copy-pasted into the CSV file. +"Alcor Micro AU9560 00 00" which needs to be used in the CSV file. + +NOTE:: If the reader name contains any special characters, they might need to be escaped according +to the extended POSIX regular expression syntax. See `man 7 regex` for a reference. + +.Example: CSV file mapping bankd slots 0..7 to a sysmoOCTSIM: +---- +"1","0","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 00" +"1","1","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 01" +"1","2","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 02" +"1","3","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 03" +"1","4","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 04" +"1","5","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 05" +"1","6","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 06" +"1","7","sysmocom sysmoOCTSIM \[CCID\] \(ab19180f3335355320202034463a15ff\) [0-9]{2} 07" +---- + +In the above example, the +\[CCID\]+ and the +\(serialnumber\)+ both had to be escaped. + +The +[0-9]\{2\}+ construct exists to perform wildcard matching, no matter which particular two-digit number +pcscd decides to use. diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c index f6e3683..e0b349c 100644 --- a/src/bankd/bankd_pcsc.c +++ b/src/bankd/bankd_pcsc.c @@ -1,4 +1,4 @@ -/* (C) 2018-2019 by Harald Welte +/* (C) 2018-2020 by Harald Welte * * All Rights Reserved * @@ -26,6 +26,8 @@ #include #include +#include +#include #include "bankd.h" @@ -34,9 +36,19 @@ /* RSPRO bank slot number */ struct bank_slot slot; /* String name of the reader in PC/SC world */ - const char *name; + const char *name_regex; }; +/* return a talloc-allocated string containing human-readable POSIX regex error */ +static char *get_regerror(void *ctx, int errcode, regex_t *compiled) +{ + size_t len = regerror(errcode, compiled, NULL, 0); + char *buffer = talloc_size(ctx, len); + OSMO_ASSERT(buffer); + regerror(errcode, compiled, buffer, len); + return buffer; +} + enum parser_state_name { ST_NONE, ST_BANK_NR, @@ -76,7 +88,7 @@ break; case ST_PCSC_NAME: OSMO_ASSERT(ps->cur); - ps->cur->name = talloc_strdup(ps->cur, field); + ps->cur->name_regex = talloc_strdup(ps->cur, field); break; default: OSMO_ASSERT(0); @@ -87,9 +99,23 @@ { struct parser_state *ps = data; struct pcsc_slot_name *sn = ps->cur; + regex_t compiled_name; + int rc; - printf("PC/SC slot name: %u/%u -> '%s'\n", sn->slot.bank_id, sn->slot.slot_nr, sn->name); - llist_add_tail(&sn->list, &ps->bankd->pcsc_slot_names); + printf("PC/SC slot name: %u/%u -> regex '%s'\n", sn->slot.bank_id, sn->slot.slot_nr, sn->name_regex); + + memset(&compiled_name, 0, sizeof(compiled_name)); + + rc = regcomp(&compiled_name, sn->name_regex, REG_EXTENDED); + if (rc != 0) { + char *errmsg = get_regerror(sn, rc, &compiled_name); + fprintf(stderr, "Error compiling regex '%s': %s - Ignoring\n", sn->name_regex, errmsg); + talloc_free(errmsg); + talloc_free(sn); + } else { + llist_add_tail(&sn->list, &ps->bankd->pcsc_slot_names); + } + regfree(&compiled_name); ps->state = ST_BANK_NR; ps->cur = NULL; @@ -134,7 +160,7 @@ llist_for_each_entry(cur, &bankd->pcsc_slot_names, list) { if (bank_slot_equals(&cur->slot, slot)) - return cur->name; + return cur->name_regex; } return NULL; } @@ -144,9 +170,12 @@ #include #include +#define LOGW_PCSC_ERROR(w, rv, text) \ + LOGW((w), text ": %s (0x%lX)\n", pcsc_stringify_error(rv), rv) + #define PCSC_ERROR(w, rv, text) \ if (rv != SCARD_S_SUCCESS) { \ - LOGW((w), text ": %s (0x%lX)\n", pcsc_stringify_error(rv), rv); \ + LOGW_PCSC_ERROR(w, rv, text); \ goto end; \ } else { \ LOGW((w), ": OK\n"); \ @@ -170,6 +199,57 @@ return rc; } + +static int pcsc_connect_slot_regex(struct bankd_worker *worker) +{ + DWORD dwReaders = SCARD_AUTOALLOCATE; + LPSTR mszReaders = NULL; + regex_t compiled_name; + int result = -1; + LONG rc; + char *p; + + LOGW(worker, "Attempting to find card/slot using regex '%s'\n", worker->reader.name); + + rc = regcomp(&compiled_name, worker->reader.name, REG_EXTENDED); + if (rc != 0) { + LOGW(worker, "Error compiling RegEx over name '%s'\n", worker->reader.name); + return -EINVAL; + } + + rc = SCardListReaders(worker->reader.pcsc.hContext, NULL, (LPSTR)&mszReaders, &dwReaders); + if (rc != SCARD_S_SUCCESS) { + LOGW_PCSC_ERROR(worker, rc, "SCardListReaders"); + goto out_regfree; + } + + p = mszReaders; + while (*p) { + DWORD dwActiveProtocol; + int r = regexec(&compiled_name, p, 0, NULL, 0); + if (r == 0) { + LOGW(worker, "Attempting to open card/slot '%s'\n", p); + rc = SCardConnect(worker->reader.pcsc.hContext, p, SCARD_SHARE_SHARED, + SCARD_PROTOCOL_T0, &worker->reader.pcsc.hCard, + &dwActiveProtocol); + if (rc == SCARD_S_SUCCESS) + result = 0; + else + LOGW_PCSC_ERROR(worker, rc, "SCardConnect"); + break; + } + p += strlen(p) + 1; + } + + SCardFreeMemory(worker->reader.pcsc.hContext, mszReaders); + +out_regfree: + regfree(&compiled_name); + + return result; +} + + static int pcsc_open_card(struct bankd_worker *worker) { long rc; @@ -182,14 +262,13 @@ } if (!worker->reader.pcsc.hCard) { - LOGW(worker, "Attempting to open card/slot '%s'\n", worker->reader.name); - DWORD dwActiveProtocol; - rc = SCardConnect(worker->reader.pcsc.hContext, worker->reader.name, SCARD_SHARE_SHARED, - SCARD_PROTOCOL_T0, &worker->reader.pcsc.hCard, &dwActiveProtocol); - PCSC_ERROR(worker, rc, "SCardConnect") + rc = pcsc_connect_slot_regex(worker); + if (rc != 0) + goto end; } rc = pcsc_get_atr(worker); + end: return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/20811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I58b71f9562e152e7ed21b55d7b876bba481b01f8 Gerrit-Change-Number: 20811 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 09:08:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 09:08:31 +0000 Subject: Change in osmo-pcu[master]: nacc: Avoid RIM procedures targeting cells under same PCU In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22631 ) Change subject: nacc: Avoid RIM procedures targeting cells under same PCU ...................................................................... nacc: Avoid RIM procedures targeting cells under same PCU Now that we have the required System Information in osmo-pcu to craft the Packet Neigbour Cell Change packet for cells it controls, let's avoid starting a RIM procedure to gather the SI info, since the SGSN would end up routing the RIM request back at us and we'd answer back to ourselves. This same optimization cannot be done on the first step (CTRL Neighbor Resolution against BSC), because the PCU cannot know if the target ARFCN+BSIC requested by the MS is actually managed by a cell under the PCU or it's another cell managed by another external PCU, because ARFCN+BSIC keys can be resued among non-neighbor cells. Hence, it shall always ask the BSC since only it holds the information about neighboring cells. Related: OS#4909 Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b --- M doc/manuals/chapters/configuration.adoc M src/nacc_fsm.c 2 files changed, 55 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 7371e72..01e4d65 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -236,9 +236,8 @@ their control, obtained through PCUIF when the BTS registers against OsmoPCU, so no specific user configuration is required here. -However, for remote neighbors (cells managed by another OsmoPCU instance), -OsmoPCU requires to gather the information from somewhere else before being able -to provide it to the MS requesting the NACC. +In general, OsmoPCU requires to gather the information from somewhere else +before being able to provide it to the MS requesting the NACC. If OsmoPCU fails to gather the System Information, it will simply answer the MS allowing the proposed changed but without previously providing the System @@ -280,13 +279,19 @@ ==== System Information Resolution Once OsmoPCU gains knowledge of the target cell's address in the Core Network, -it can query its System Information. The query is done using RIM procedures -(NACC RAN-INFO application) over the Gb interface against the SGSN that OsmoPCU -is connected to. In its turn, the SGSN will potentially forward this query to -the PCU serving the target cell, which will provide back the System Information -of that cell. +it can query its System Information. -The System Information received from remote neighbors are by default +OsmoPCU will gather the requested System Information of target cells under its +control without need for any external query, since the System Information of all +BTSs it manages are received over PCUIF and stored internally in OsmoPCU. + +For those targets cells not managed by the OsmoPCU instance, the query is +accomplished by using RIM procedures (NACC RAN-INFO application) over the Gb +interface against the SGSN that OsmoPCU is connected to. In its turn, the SGSN +will potentially forward this query to the PCU serving the target cell, which +will provide back the System Information of that cell. + +The System Information received from external PCUs over RIM are by default cached for a while in order to avoid querying the SGSN frequently and, as a result, optimizing the resolution time too. diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index b479f9c..6a92f83 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -268,6 +268,27 @@ return 0; } +#define SI_HDR_LEN 2 +static void bts_fill_si_cache_value(const struct gprs_rlcmac_bts *bts, struct si_cache_value *val) +{ + val->type_psi = false; + val->si_len = 0; + if (bts->si1_is_set) { + osmo_static_assert(sizeof(bts->si1) - SI_HDR_LEN == BSSGP_RIM_SI_LEN, _si1_header_size); + memcpy(&val->si_buf[val->si_len], bts->si1 + SI_HDR_LEN, BSSGP_RIM_SI_LEN); + val->si_len += BSSGP_RIM_SI_LEN; + } + if (bts->si3_is_set) { + osmo_static_assert(sizeof(bts->si3) - SI_HDR_LEN == BSSGP_RIM_SI_LEN, _si3_header_size); + memcpy(&val->si_buf[val->si_len], bts->si3 + SI_HDR_LEN, BSSGP_RIM_SI_LEN); + val->si_len += BSSGP_RIM_SI_LEN; + } + if (bts->si13_is_set) { + osmo_static_assert(sizeof(bts->si13) - SI_HDR_LEN == BSSGP_RIM_SI_LEN, _si13_header_size); + memcpy(&val->si_buf[val->si_len], bts->si13 + SI_HDR_LEN, BSSGP_RIM_SI_LEN); + val->si_len += BSSGP_RIM_SI_LEN; + } +} //////////////// // FSM states // @@ -382,8 +403,28 @@ struct gprs_pcu *pcu = bts->pcu; struct bssgp_ran_information_pdu pdu; const struct si_cache_value *si; + struct gprs_rlcmac_bts *bts_i; int rc; + /* First check if the CGI-PS addresses a cell managed by this PCU. If + * that's the case, we already have the info and there's no need to go + * the RIM way since we'd end up to this same PCU on the other end anyway. + */ + llist_for_each_entry(bts_i, &the_pcu->bts_list, list) { + if (bts_i == bts) /* Makes no sense targeting the same cell */ + continue; + if (osmo_cgi_ps_cmp(&ctx->cgi_ps, &bts_i->cgi_ps) != 0) + continue; + + LOGPFSML(fi, LOGL_DEBUG, "neighbor CGI-PS %s addresses local BTS %d\n", + osmo_cgi_ps_name(&ctx->cgi_ps), bts_i->nr); + bts_fill_si_cache_value(bts, &ctx->si_info); + /* Tell the PCU scheduler we are ready to go, from here one we + * are polled/driven by the scheduler */ + nacc_fsm_state_chg(fi, NACC_ST_TX_NEIGHBOUR_DATA); + return; + } + /* First check if we have SI info for the target cell in cache */ si = si_cache_lookup_value(pcu->si_cache, &ctx->cgi_ps); if (si) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I928875b6b66dff55fc12f51b6b1ad919fef7d03b Gerrit-Change-Number: 22631 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 09:42:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 09:42:27 +0000 Subject: Change in osmo-bts[master]: Use osmo_fd_*_{disable,enable} In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20775 to look at the new patch set (#5). Change subject: Use osmo_fd_*_{disable,enable} ...................................................................... Use osmo_fd_*_{disable,enable} Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec --- M TODO-RELEASE M src/common/pcu_sock.c M src/osmo-bts-lc15/l1_transp_hw.c M src/osmo-bts-oc2g/l1_transp_hw.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c M src/osmo-bts-sysmo/l1_transp_hw.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 7 files changed, 19 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/20775/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec Gerrit-Change-Number: 20775 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 09:42:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 09:42:27 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22641 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rst_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am M src/common/pcu_sock.c A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 8 files changed, 72 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22641/1 diff --git a/configure.ac b/configure.ac index 249a81a..e8309d7 100644 --- a/configure.ac +++ b/configure.ac @@ -349,6 +349,38 @@ AC_SUBST([OSMO_GSM_MANUALS_DIR]) fi +# +# SystemTap support +# +AC_MSG_CHECKING([whether to include systemtap tracing support]) +AC_ARG_ENABLE([systemtap], + [AS_HELP_STRING([--enable-systemtap], + [Enable inclusion of systemtap trace support])], + [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no']) +AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) +AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) + +if test "x${ENABLE_SYSTEMTAP}" = xyes; then + # Additional configuration for --enable-systemtap is HERE + AC_CHECK_PROGS(DTRACE, dtrace) + if test -z "$DTRACE"; then + AC_MSG_ERROR([dtrace not found]) + fi + AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], + [SDT_H_FOUND='no'; + AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) + AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.]) + AC_ARG_WITH([tapset-install-dir], + [AS_HELP_STRING([--with-tapset-install-dir], + [The absolute path where the tapset dir will be installed])], + [if test "x${withval}" = x; then + ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset" + else + ABS_TAPSET_DIR="${withval}" + fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"]) + AC_SUBST(ABS_TAPSET_DIR) +fi + # https://www.freedesktop.org/software/systemd/man/daemon.html AC_ARG_WITH([systemdsystemunitdir], [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, diff --git a/src/common/Makefile.am b/src/common/Makefile.am index d979bc0..99b74f6 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -43,6 +43,18 @@ nm_bb_transc_fsm.c \ nm_channel_fsm.c \ nm_radio_carrier_fsm.c \ + probes.d \ $(NULL) libl1sched_a_SOURCES = scheduler.c + +if ENABLE_SYSTEMTAP +probes.h: probes.d + $(DTRACE) -C -h -s $< -o $@ + +probes.lo: probes.d + $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ + +BUILT_SOURCES = probes.h probes.lo +libbts_la_LDADD = probes.lo +endif diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fb32773..3b09e49 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1115,7 +1115,7 @@ LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have " "another active connection ?!?\n"); /* We already have one PCU connected, this is all we support */ - state->listen_bfd.when &= ~OSMO_FD_READ; + osmo_fd_read_disable(&state->listen_bfd); close(rc); return 0; } diff --git a/src/common/probes.d b/src/common/probes.d new file mode 100644 index 0000000..aaf9030 --- /dev/null +++ b/src/common/probes.d @@ -0,0 +1,2 @@ +provider osmo_bts { +}; diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 54d1af9..7317fdc 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -51,6 +51,7 @@ trx_provision_fsm.c \ trx_vty.c \ loops.c \ + probes.d \ $(NULL) osmo_bts_trx_LDADD = \ @@ -58,3 +59,14 @@ $(top_builddir)/src/common/libbts.a \ $(LDADD) \ $(NULL) + +if ENABLE_SYSTEMTAP +probes.h: probes.d + $(DTRACE) -C -h -s $< -o $@ + +probes.lo: probes.d + $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ + +BUILT_SOURCES = probes.h probes.lo +osmo_bts_trx_LDADD += probes.lo +endif diff --git a/src/osmo-bts-trx/probes.d b/src/osmo-bts-trx/probes.d new file mode 100644 index 0000000..2f905bd --- /dev/null +++ b/src/osmo-bts-trx/probes.d @@ -0,0 +1,7 @@ +provider osmo_bts_trx { + probe ul_data_start(int, int, int); /* trx_nr, ts_nr, fn */ + probe ul_data_done(int, int, int); /* trx_nr, ts_nr, fn */ + + probe dl_rts_start(int, int, int); /* trx_nr, ts_nr, fn */ + probe dl_rts_done(int, int, int); /* trx_nr, ts_nr, fn */ +}; diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 1552a86..eca5601 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -47,6 +47,7 @@ #include "l1_if.h" #include "trx_if.h" +#include "probes.h" #define SCHED_FH_PARAMS_FMT "hsn=%u, maio=%u, ma_len=%u" #define SCHED_FH_PARAMS_VALS(ts) \ @@ -123,7 +124,9 @@ /* process every TS of TRX */ for (tn = 0; tn < ARRAY_SIZE(l1t->ts); tn++) { /* ready-to-send */ + OSMO_BTS_TRX_DL_RTS_START(trx->nr, tn, sched_fn); _sched_rts(l1t, tn, GSM_TDMA_FN_SUM(sched_fn, plink->u.osmotrx.rts_advance)); + OSMO_BTS_TRX_DL_RTS_DONE(trx->nr, tn, sched_fn); /* All other parameters to be set by _sched_dl_burst() */ br = (struct trx_dl_burst_req) { diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 05167ca..27b34a8 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -49,6 +49,7 @@ #include "l1_if.h" #include "trx_if.h" #include "trx_provision_fsm.h" +#include "probes.h" /* * socket helper functions @@ -1100,7 +1101,9 @@ hdr_ver, trx_data_desc_msg(&bi)); /* feed received burst into scheduler code */ + OSMO_BTS_TRX_UL_DATA_START(l1h->phy_inst->trx->nr, bi.tn, bi.fn); trx_sched_route_burst_ind(&bi, &l1h->l1s); + OSMO_BTS_TRX_UL_DATA_DONE(l1h->phy_inst->trx->nr, bi.tn, bi.fn); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:08:20 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:08:20 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test proce... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22642 ) Change subject: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. ...................................................................... gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. Otherwise a NS-VC would flap between ALIVE and UNBLOCKED state. Related: OS#4959 Change-Id: Id98629bd65f92103e0e571ec388c58b02cb2ccb5 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22642/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index f4c4e46..6314408 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -200,6 +200,7 @@ switch (priv->alive.mode) { case NS_TOUT_TNS_TEST: priv->alive.mode = NS_TOUT_TNS_ALIVE; + priv->alive.N = 0; ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id98629bd65f92103e0e571ec388c58b02cb2ccb5 Gerrit-Change-Number: 22642 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:11:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:11:37 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: regen: put args in own lines In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/22596 ) Change subject: gen_makefile.py: regen: put args in own lines ...................................................................... Patch Set 1: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/22596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e Gerrit-Change-Number: 22596 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:11:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:11:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:11:40 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: regen: put args in own lines In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/22596 ) Change subject: gen_makefile.py: regen: put args in own lines ...................................................................... gen_makefile.py: regen: put args in own lines Make it easier to adjust opts before running 'make regen'. Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e --- M gen_makefile.py 1 file changed, 14 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved; Verified diff --git a/gen_makefile.py b/gen_makefile.py index f76ebb0..ad42978 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -276,22 +276,29 @@ # regenerate this Makefile, in case the deps or opts changed .PHONY: regen regen: - {script} {projects_and_deps} {configure_opts} -m {make_dir} -o {makefile} -s {src_dir} -b {build_dir} -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check} + {script} \ + {projects_and_deps} \ + {configure_opts} \ + -m {make_dir} \ + -o {makefile} \ + -s {src_dir} \ + -b {build_dir} \ + -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check} '''.format( script=os.path.relpath(sys.argv[0], make_dir), projects_and_deps=os.path.relpath(args.projects_and_deps_file, make_dir), - configure_opts=' '.join([os.path.relpath(f, make_dir) for f in configure_opts_files]), + configure_opts=' \\\n\t\t'.join([os.path.relpath(f, make_dir) for f in configure_opts_files]), make_dir='.', makefile=args.output, src_dir=os.path.relpath(args.src_dir, make_dir), build_dir=os.path.relpath(build_dir, make_dir), url=args.url, - push_url=(" -p '%s'"%args.push_url) if args.push_url else '', - sudo_make_install=' -I' if args.sudo_make_install else '', - no_ldconfig=' -L' if args.no_ldconfig else '', - ldconfig_without_sudo=' --ldconfig-without-sudo' if args.ldconfig_without_sudo else '', - make_check='' if args.make_check else " --no-make-check", + push_url=(" \\\n\t\t-p '%s'"%args.push_url) if args.push_url else '', + sudo_make_install=' \\\n\t\t-I' if args.sudo_make_install else '', + no_ldconfig=' \\\n\t\t-L' if args.no_ldconfig else '', + ldconfig_without_sudo=' \\\n\t\t--ldconfig-without-sudo' if args.ldconfig_without_sudo else '', + make_check='' if args.make_check else " \\\n\t\t--no-make-check", )) # convenience target: clone all repositories first -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/22596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3c537ca9cd876e62547efca1ea40f31e90d8761e Gerrit-Change-Number: 22596 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:19:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:19:10 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22638/1/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22638/1/src/gb/gprs_ns2_fr.c at 589 PS1, Line 589: bpriv->if_running = if_running; Since you are moving use of this field here, it probably makes sense to move the "if (bpriv->if_running != if_running) {" in function below at the start of this function. if (bpriv->if_running == if_running) continue; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:19:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:21:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:21:04 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:21:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:21:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:21:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ST_ALIVE isn't quite clear. This state means this NS-VC is still dead. ST_ALIVE is used for NS-VC with vc_mode ALIVE (e.g. UDP NS-VC). It's the first state when the remote hasn't yet answered or when the NS-VC lost ALIVEs. Related: OS#4958 Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22643/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 6314408..f8d5afa 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -97,7 +97,7 @@ GPRS_NS2_ST_BLOCKED, GPRS_NS2_ST_UNBLOCKED, /* allows sending NS_UNITDATA */ - GPRS_NS2_ST_ALIVE, /* only used when not using RESET/BLOCK procedure */ + GPRS_NS2_ST_RECOVERING, /* only used when not using RESET/BLOCK procedure */ }; enum gprs_ns2_vc_event { @@ -217,7 +217,7 @@ if (priv->nsvc->mode == GPRS_NS2_VC_MODE_BLOCKRESET) { osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); } else { - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); } } break; @@ -244,7 +244,7 @@ case GPRS_NS2_EV_REQ_START: switch (priv->nsvc->mode) { case GPRS_NS2_VC_MODE_ALIVE: - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE); break; case GPRS_NS2_VC_MODE_BLOCKRESET: osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET); @@ -422,7 +422,7 @@ priv->alive.mode = NS_TOUT_TNS_TEST; osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_TEST], 0); - if (old_state != GPRS_NS2_ST_ALIVE) + if (old_state != GPRS_NS2_ST_RECOVERING) priv->N = 0; ns2_tx_alive(priv->nsvc); @@ -437,7 +437,7 @@ static const struct osmo_fsm_state ns2_vc_states[] = { [GPRS_NS2_ST_UNCONFIGURED] = { .in_event_mask = S(GPRS_NS2_EV_REQ_START), - .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE), + .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_RECOVERING), .name = "UNCONFIGURED", .action = ns2_st_unconfigured, .onenter = ns2_st_unconfigured_onenter, @@ -465,7 +465,7 @@ [GPRS_NS2_ST_UNBLOCKED] = { .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK) | S(GPRS_NS2_EV_RX_UNBLOCK), - .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE) | + .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_RECOVERING) | S(GPRS_NS2_ST_BLOCKED) | S(GPRS_NS2_ST_UNCONFIGURED), .name = "UNBLOCKED", @@ -473,13 +473,13 @@ .onenter = ns2_st_unblocked_on_enter, }, - /* ST_ALIVE is only used on VC without RESET/BLOCK */ - [GPRS_NS2_ST_ALIVE] = { + /* ST_RECOVERING is only used on VC without RESET/BLOCK */ + [GPRS_NS2_ST_RECOVERING] = { .in_event_mask = S(GPRS_NS2_EV_RX_ALIVE_ACK), - .out_state_mask = S(GPRS_NS2_ST_ALIVE) | + .out_state_mask = S(GPRS_NS2_ST_RECOVERING) | S(GPRS_NS2_ST_UNBLOCKED) | S(GPRS_NS2_ST_UNCONFIGURED), - .name = "ALIVE", + .name = "RECOVERING", .action = ns2_st_alive, .onenter = ns2_st_alive_onenter, .onleave = ns2_st_alive_onleave, @@ -523,14 +523,14 @@ } } break; - case GPRS_NS2_ST_ALIVE: + case GPRS_NS2_ST_RECOVERING: if (priv->initiate_reset) { priv->N++; if (priv->N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) { - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, 0, 0); } else { priv->N = 0; - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, 0, 0); } break; } @@ -606,7 +606,7 @@ break; case GPRS_NS2_EV_RX_ALIVE_ACK: /* for VCs without RESET/BLOCK/UNBLOCK, the connections comes after ALIVE_ACK unblocked */ - if (fi->state == GPRS_NS2_ST_ALIVE) + if (fi->state == GPRS_NS2_ST_RECOVERING) ns2_st_alive(fi, event, data); else recv_test_procedure(fi); @@ -630,7 +630,7 @@ 0, msg); break; /* ALIVE can receive UNITDATA if the ALIVE_ACK is lost */ - case GPRS_NS2_ST_ALIVE: + case GPRS_NS2_ST_RECOVERING: case GPRS_NS2_ST_UNBLOCKED: ns2_recv_unitdata(fi, msg); return; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:29:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:29:07 +0000 Subject: Change in osmo-bts[master]: Use osmo_fd_*_{disable,enable} In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20775 ) Change subject: Use osmo_fd_*_{disable,enable} ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec Gerrit-Change-Number: 20775 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:29:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:30:09 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:30:09 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22644 ) Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... gprs_ns2: unify the handling of **result when bind already present. All bind function should work in the same way. Also fixing a null pointer assignment if no **result is giving. Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 --- M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 3 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22644/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index fc6a5c4..3af20b4 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -738,8 +738,12 @@ if (strlen(netif) > IFNAMSIZ) return -EINVAL; - if (gprs_ns2_bind_by_name(nsi, name)) + bind = gprs_ns2_bind_by_name(nsi, name); + if (bind) { + if (result) + *result = bind; return -EALREADY; + } rc = ns2_bind_alloc(nsi, name, &bind); if (rc < 0) diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 88ef037..8b40d7b 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -546,7 +546,8 @@ bind = gprs_ns2_bind_by_name(nsi, name); if (bind) { - *result = bind; + if (result) + *result = bind; return -EALREADY; } diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 9277f9a..9bc63c7 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -320,7 +320,8 @@ bind = gprs_ns2_ip_bind_by_sockaddr(nsi, local); if (bind) { - *result = bind; + if (result) + *result = bind; return -EBUSY; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:31:08 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:31:08 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: free_bind(): first do the NULL check before using members References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22645 ) Change subject: gprs_ns2_fr: free_bind(): first do the NULL check before using members ...................................................................... gprs_ns2_fr: free_bind(): first do the NULL check before using members Change-Id: I80f72ada15b477d735bf5aee36a5d67e80eb0136 --- M src/gb/gprs_ns2_fr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/22645/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 3af20b4..fcbafec 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -161,10 +161,10 @@ struct priv_bind *priv; struct msgb *msg, *msg2; - OSMO_ASSERT(gprs_ns2_is_fr_bind(bind)); if (!bind) return; + OSMO_ASSERT(gprs_ns2_is_fr_bind(bind)); priv = bind->priv; OSMO_ASSERT(llist_empty(&bind->nsvc)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80f72ada15b477d735bf5aee36a5d67e80eb0136 Gerrit-Change-Number: 22645 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:31:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:31:55 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22641 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22641/1/src/common/pcu_sock.c File src/common/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bts/+/22641/1/src/common/pcu_sock.c at 1118 PS1, Line 1118: osmo_fd_read_disable(&state->listen_bfd); Not related to this patch, probably a rebase issue with https://gerrit.osmocom.org/c/osmo-bts/+/20775 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:31:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:32:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:32:11 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test proce... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22642 ) Change subject: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id98629bd65f92103e0e571ec388c58b02cb2ccb5 Gerrit-Change-Number: 22642 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:32:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:34:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:34:32 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22643/1/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22643/1/src/gb/gprs_ns2_vc_fsm.c at 90 PS1, Line 90: * The ALIVE state is used as intermediate, because a VC is only valid if it received an Alive ACK when this needs change too then. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:34:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:34:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:34:59 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: free_bind(): first do the NULL check before using members In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22645 ) Change subject: gprs_ns2_fr: free_bind(): first do the NULL check before using members ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80f72ada15b477d735bf5aee36a5d67e80eb0136 Gerrit-Change-Number: 22645 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 03 Feb 2021 10:34:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:36:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 10:36:43 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22644 ) Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22644/1/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22644/1/src/gb/gprs_ns2_fr.c at 725 PS1, Line 725: * \return 0 on success; negative on error */ You should document the -ELAREADY case here returning the existing bind in **result. Otherwise, if it's not public, don't do it in the function. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:36:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:42:07 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:42:07 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile File osmo-gbproxy-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile at 34 PS1, Line 34: CMD ["/bin/sh", "-c", "/usr/bin/osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"] > yes, but given that there's no osmo-gbproxy tag/release, that is not really relevant yet. [?] If it takes quite some time, until we have osmo-gbproxy as separate package on latest, I suggest we remove the osmo-gbproxy-latest subdir from this patch for now. Then we don't need to keep in mind that this isn't really used. jenkins.sh for ttcn3-gbproxy-test-latest would try to build a osmo-gbproxy-latest docker container, so I suggest we disable that jenkins job until osmo-gbproxy is available on latest. https://gerrit.osmocom.org/c/docker-playground/+/22636/2/osmo-gbproxy-master/Dockerfile File osmo-gbproxy-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/2/osmo-gbproxy-master/Dockerfile at 3 PS2, Line 3: ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" Unlike $USER and $DISTRO, $OSMOCOM_REPO_MIRROR isn't used in FROM. So we don't need to have this line twice, once after the FROM is enough. (That's how I understand it at least, didn't test it.) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:42:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:42:59 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:42:59 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22636/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/22636/2//COMMIT_MSG at 10 PS2, Line 10: Related: OS#4992 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:42:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:44:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:44:37 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:44:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:44:49 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:44:49 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... OBS: nightly: add osmo-gbproxy Depends: osmo-sgsn I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Related: OS#4992 Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 58a8a52..d8338ae 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -225,6 +225,7 @@ checkout osmo-e1d checkout osmo-smlc checkout osmo-cbc + checkout osmo-gbproxy cd "$REPO" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -268,6 +269,7 @@ build osmo-e1d build osmo-smlc build osmo-cbc + build osmo-gbproxy post } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:47:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 10:47:55 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: add osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22603 ) Change subject: OBS: nightly: add osmo-gbproxy ...................................................................... Patch Set 2: Merged before the depending commit, as we want to have this one as last one: > Depends: osmo-sgsn I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Heads up: the repo-install-test might run and fail before the other patch is merged too, as the repo install test tries to install all packages from the repo at the same time, and will get and unexpected conflict while trying to install osmo-sgsn and osmo-gbproxy at the same time. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I08c513ba812bcb302b5dcab52fc187b27b1b32b7 Gerrit-Change-Number: 22603 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 10:47:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:58:10 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:58:10 +0000 Subject: Change in libosmocore[master]: frame_relay: fix NULL pointer deref References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22646 ) Change subject: frame_relay: fix NULL pointer deref ...................................................................... frame_relay: fix NULL pointer deref Related: CID#215530 Change-Id: Ic58394ab44ee555a0c5dee2b07fa1054093fbcf0 --- M src/gb/frame_relay.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/22646/1 diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index ff97a17..96f51cf 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -585,6 +585,7 @@ dlc = osmo_fr_dlc_alloc(link, dlci); if (!dlc) { LOGPFRL(link, LOGL_ERROR, "Rx STATUS: Could not create DLC %d\n", dlci); + continue; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic58394ab44ee555a0c5dee2b07fa1054093fbcf0 Gerrit-Change-Number: 22646 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:58:11 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:58:11 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: set a correct gre pointer for ipv6 References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22647 ) Change subject: gprs_ns2_frgre: set a correct gre pointer for ipv6 ...................................................................... gprs_ns2_frgre: set a correct gre pointer for ipv6 Also fixes a nullpointer deref because iph is NULL on IPv6 Related: CID#216555 Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb --- M src/gb/gprs_ns2_frgre.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/22647/1 diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 8b40d7b..2c5fe2f 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -339,7 +339,11 @@ break; } - greh = (struct gre_hdr *) (msg->data + iph->ihl*4); + if (iph) + greh = (struct gre_hdr *) (msg->data + iph->ihl*4); + else + greh = (struct gre_hdr *) (msg->data + sizeof(struct ip6_hdr)); + if (greh->flags) { LOGBIND(bind, LOGL_NOTICE, "Unknown GRE flags 0x%04x\n", osmo_ntohs(greh->flags)); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb Gerrit-Change-Number: 22647 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 10:58:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 10:58:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22648 ) Change subject: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions ...................................................................... gprs_ns2_frgre: check iph/ip6h before passing them to rx functions With IPv4 and IPv6 support it's not guaranteed that iph/ip6h is valid. Related CID#214288 Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 --- M src/gb/gprs_ns2_frgre.c 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/22648/1 diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 2c5fe2f..2087681 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -351,11 +351,17 @@ switch (osmo_ntohs(greh->ptype)) { case GRE_PTYPE_IPv4: /* IPv4 messages might be GRE keepalives */ - *error = handle_rx_gre_ipv4(bfd, msg, iph, greh); + if (iph) + *error = handle_rx_gre_ipv4(bfd, msg, iph, greh); + else + *error = -EIO; goto out_err; break; case GRE_PTYPE_IPv6: - *error = handle_rx_gre_ipv6(bfd, msg, ip6h, greh); + if (ip6h) + *error = handle_rx_gre_ipv6(bfd, msg, ip6h, greh); + else + *error = -EIO; goto out_err; break; case GRE_PTYPE_FR: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 Gerrit-Change-Number: 22648 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:01:32 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 11:01:32 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22644 ) Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22644/1/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22644/1/src/gb/gprs_ns2_fr.c at 725 PS1, Line 725: * \return 0 on success; negative on error */ > You should document the -ELAREADY case here returning the existing bind in **result. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:01:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:01:37 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 11:01:37 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22644 to look at the new patch set (#2). Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... gprs_ns2: unify the handling of **result when bind already present. All bind function should work in the same way. Also fixing a null pointer assignment if no **result is giving. Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 --- M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 3 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22644/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:02:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 11:02:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22643 to look at the new patch set (#2). Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ST_ALIVE isn't quite clear. This state means this NS-VC is still dead. ST_ALIVE is used for NS-VC with vc_mode ALIVE (e.g. UDP NS-VC). It's the first state when the remote hasn't yet answered or when the NS-VC lost ALIVEs. Related: OS#4958 Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22643/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:03:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 11:03:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22643/1/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22643/1/src/gb/gprs_ns2_vc_fsm.c at 90 PS1, Line 90: * The ALIVE state is used as intermediate, because a VC is only valid if it received an Alive ACK when > this needs change too then. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:03:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:31:11 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 3 Feb 2021 11:31:11 +0000 Subject: Change in osmo-gsm-manuals[master]: diag-filter.conf: drop version from nwdiag / packetdiag commands In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 ) Change subject: diag-filter.conf: drop version from nwdiag / packetdiag commands ...................................................................... Patch Set 1: > can we not simply package a more recent python3-nwdiag in the network:osmocom:* feed For debian 9, 10 without problems since the dependencies are already present: * https://packages.debian.org/sid/python3-nwdiag * https://packages.debian.org/buster/python3-nwdiag * https://packages.debian.org/stretch/python3-nwdiag For jessie we need to backport python3-blockdiag too, but no other dependencies. So that should work as well. * https://packages.debian.org/jessie/python3-nwdiag * https://packages.debian.org/jessie/python3-blockdiag * https://packages.debian.org/stretch/python3-blockdiag > and then depend on that from osmo-gsm-manuals-dev? Do we want to explicitly depend on the new version, if we only use it for stability reasons? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Gerrit-Change-Number: 22624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 03 Feb 2021 11:31:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:47:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 11:47:50 +0000 Subject: Change in libosmocore[master]: frame_relay: fix NULL pointer deref In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22646 ) Change subject: frame_relay: fix NULL pointer deref ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic58394ab44ee555a0c5dee2b07fa1054093fbcf0 Gerrit-Change-Number: 22646 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:47:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:49:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 11:49:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: set a correct gre pointer for ipv6 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22647 ) Change subject: gprs_ns2_frgre: set a correct gre pointer for ipv6 ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22647/3/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/22647/3/src/gb/gprs_ns2_frgre.c at 345 PS3, Line 345: greh = (struct gre_hdr *) (msg->data + sizeof(struct ip6_hdr)); sizeof(*iph6) would be clearer for readers, since your are using that pointer in ipv6 case otherwise first it looked like msg->data was being used directly. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb Gerrit-Change-Number: 22647 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:49:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:51:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 11:51:34 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22648 ) Change subject: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 Gerrit-Change-Number: 22648 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:51:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:52:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 11:52:28 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22644 ) Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:52:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 11:53:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 11:53:56 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22643/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22643/2/src/gb/gprs_ns2_vc_fsm.c at 86 PS2, Line 86: * The UNBLOCKED and TEST states are used to send RECOVERY PDU using the timeout Tns-test and Tns-alive. Does teh "REcovery PDU" exist? or is it an Alive PDU? (see line below). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 11:53:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:16:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:16:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test proce... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22642 ) Change subject: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id98629bd65f92103e0e571ec388c58b02cb2ccb5 Gerrit-Change-Number: 22642 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:17:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:17:31 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22643/2/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/22643/2/src/gb/gprs_ns2_vc_fsm.c at 86 PS2, Line 86: * The UNBLOCKED and TEST states are used to send RECOVERY PDU using the timeout Tns-test and Tns-alive. > Does teh "REcovery PDU" exist? or is it an Alive PDU? (see line below). it' salive, I guess lynxis' search+replace was a bit too aggressive. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 12:17:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:18:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:18:00 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22644 ) Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:18:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:18:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:18:23 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: free_bind(): first do the NULL check before using members In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22645 ) Change subject: gprs_ns2_fr: free_bind(): first do the NULL check before using members ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80f72ada15b477d735bf5aee36a5d67e80eb0136 Gerrit-Change-Number: 22645 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:18:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:18:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:18:38 +0000 Subject: Change in libosmocore[master]: frame_relay: fix NULL pointer deref In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22646 ) Change subject: frame_relay: fix NULL pointer deref ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic58394ab44ee555a0c5dee2b07fa1054093fbcf0 Gerrit-Change-Number: 22646 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:18:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:19:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:19:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: set a correct gre pointer for ipv6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22647 ) Change subject: gprs_ns2_frgre: set a correct gre pointer for ipv6 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb Gerrit-Change-Number: 22647 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:19:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:19:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:19:21 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22648 ) Change subject: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 Gerrit-Change-Number: 22648 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:19:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:20:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:20:18 +0000 Subject: Change in osmo-bts[master]: Use osmo_fd_*_{disable,enable} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20775 ) Change subject: Use osmo_fd_*_{disable,enable} ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec Gerrit-Change-Number: 20775 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:20:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:20:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:20:22 +0000 Subject: Change in osmo-bts[master]: Use osmo_fd_*_{disable,enable} In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20775 ) Change subject: Use osmo_fd_*_{disable,enable} ...................................................................... Use osmo_fd_*_{disable,enable} Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec --- M TODO-RELEASE M src/common/pcu_sock.c M src/osmo-bts-lc15/l1_transp_hw.c M src/osmo-bts-oc2g/l1_transp_hw.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c M src/osmo-bts-sysmo/l1_transp_hw.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c 7 files changed, 19 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 03c11eb..66a9bb3 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +1,2 @@ * update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. +* update libosmocore dependency for osmo_fd_{read,write}_{enable,disable}() diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index ffa8e77..fb32773 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -926,7 +926,7 @@ return -EIO; } msgb_enqueue(&state->upqueue, msg); - conn_bfd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(conn_bfd); return 0; } @@ -956,7 +956,7 @@ regenerate_si4_restoctets(bts); /* re-enable the generation of ACCEPT for new connections */ - state->listen_bfd.when |= OSMO_FD_READ; + osmo_fd_read_enable(&state->listen_bfd); #if 0 /* remove si13, ... */ @@ -1045,7 +1045,7 @@ msg = llist_entry(state->upqueue.next, struct msgb, list); pcu_prim = (struct gsm_pcu_if *)msg->data; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -1060,7 +1060,7 @@ goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(bfd); break; } goto close; diff --git a/src/osmo-bts-lc15/l1_transp_hw.c b/src/osmo-bts-lc15/l1_transp_hw.c index ffe8613..36b77fe 100644 --- a/src/osmo-bts-lc15/l1_transp_hw.c +++ b/src/osmo-bts-lc15/l1_transp_hw.c @@ -99,7 +99,7 @@ struct msgb *msg, *tmp; int written, count = 0; - fd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(fd); llist_for_each_entry(msg, &queue->msg_queue, list) { /* more writes than we have */ @@ -117,7 +117,7 @@ /* Nothing scheduled? This should not happen. */ if (count == 0) { if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); return 0; } @@ -125,7 +125,7 @@ if (written < 0) { /* nothing written?! */ if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); return 0; } @@ -144,7 +144,7 @@ } if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); } return 0; diff --git a/src/osmo-bts-oc2g/l1_transp_hw.c b/src/osmo-bts-oc2g/l1_transp_hw.c index daebf60..3738b23 100644 --- a/src/osmo-bts-oc2g/l1_transp_hw.c +++ b/src/osmo-bts-oc2g/l1_transp_hw.c @@ -99,7 +99,7 @@ struct msgb *msg, *tmp; int written, count = 0; - fd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(fd); llist_for_each_entry(msg, &queue->msg_queue, list) { /* more writes than we have */ @@ -117,7 +117,7 @@ /* Nothing scheduled? This should not happen. */ if (count == 0) { if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); return 0; } @@ -125,7 +125,7 @@ if (written < 0) { /* nothing written?! */ if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); return 0; } @@ -144,7 +144,7 @@ } if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); } return 0; diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c index b9f8dc5..f66761a 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c @@ -605,7 +605,7 @@ select_led_pattern(mgr); /* The connection failures are to be expected during boot */ - mgr->oc2gbts_ctrl.bts_conn->ofd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(mgr->oc2gbts_ctrl.bts_conn->ofd); rc = ipa_client_conn_open(mgr->oc2gbts_ctrl.bts_conn); if (rc < 0) { LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n"); diff --git a/src/osmo-bts-sysmo/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c index 5561af4..7df74eb 100644 --- a/src/osmo-bts-sysmo/l1_transp_hw.c +++ b/src/osmo-bts-sysmo/l1_transp_hw.c @@ -106,7 +106,7 @@ struct msgb *msg, *tmp; int written, count = 0; - fd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(fd); llist_for_each_entry(msg, &queue->msg_queue, list) { /* more writes than we have */ @@ -124,7 +124,7 @@ /* Nothing scheduled? This should not happen. */ if (count == 0) { if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); return 0; } @@ -132,7 +132,7 @@ if (written < 0) { /* nothing written?! */ if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); return 0; } @@ -151,7 +151,7 @@ } if (!llist_empty(&queue->msg_queue)) - fd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(fd); } return 0; diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c index 0126aaa..6ea2876 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c @@ -457,7 +457,7 @@ struct sysmobts_mgr_instance *mgr = data; /* The connection failures are to be expected during boot */ - mgr->calib.bts_conn->ofd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(mgr->calib.bts_conn->ofd); rc = ipa_client_conn_open(mgr->calib.bts_conn); if (rc < 0) { LOGP(DLCTRL, LOGL_NOTICE, "Failed to connect to BTS.\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0da17d851ccb83c28a70c9039d0a4d1fe63da0ec Gerrit-Change-Number: 20775 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:22:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:22:10 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile File osmo-gbproxy-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile at 34 PS1, Line 34: CMD ["/bin/sh", "-c", "/usr/bin/osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"] > If it takes quite some time, until we have osmo-gbproxy as separate package on latest, I suggest we [?] It will take a few weeks at least. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:22:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:23:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:23:21 +0000 Subject: Change in libosmocore[master]: make use of OTC_GLOBAL when allocating library-internal contexts In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/13338 ) Change subject: make use of OTC_GLOBAL when allocating library-internal contexts ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I48f475efd3ee0d5120b8fc30861e852d1a6920b1 Gerrit-Change-Number: 13338 Gerrit-PatchSet: 23 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:23:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:23:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:23:29 +0000 Subject: Change in libosmocore[master]: osmo_fsm: Ensure all state and event names are valid identifiers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16355 ) Change subject: osmo_fsm: Ensure all state and event names are valid identifiers ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If98587eff3c48a66ed2e5cc1f01a12accab5a3e7 Gerrit-Change-Number: 16355 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:23:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:23:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:23:59 +0000 Subject: Change in libosmocore[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20491 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e Gerrit-Change-Number: 20491 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 03 Feb 2021 12:23:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:24:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:24:32 +0000 Subject: Change in osmo-bsc[master]: [WIP] ctrl: Send TRAP in case of OML FAIL EVT REP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14177 ) Change subject: [WIP] ctrl: Send TRAP in case of OML FAIL EVT REP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4f8a9737c6ef1b951ea8e742cdbd3689371a99d5 Gerrit-Change-Number: 14177 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 12:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:24:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:24:52 +0000 Subject: Change in docker-playground[master]: WIP: Add ttcn3-pgw-test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17953 ) Change subject: WIP: Add ttcn3-pgw-test ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I69e2f5be8204cc4fd0cc0f4eb019ef1104121b60 Gerrit-Change-Number: 17953 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 12:24:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:25:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:25:48 +0000 Subject: Change in libosmocore[master]: WIP: add rate_ctr_group to log_target In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20306 ) Change subject: WIP: add rate_ctr_group to log_target ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I89b696311b823267e05d6a3e85b92c1784b220ed Gerrit-Change-Number: 20306 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 03 Feb 2021 12:25:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:29:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:29:22 +0000 Subject: Change in libosmocore[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20491 to look at the new patch set (#2). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated libosmocore binary. At this point, only two tracepoints are supported: log_start and log_done. They can be used to trace the amount of time a libosmocore-using application spends in potentiall blocking calls to log to stderr or to files. Related: OS#4311 Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e --- M Makefile.am M configure.ac M src/Makefile.am M src/logging.c A src/probes.d A tapset/Makefile.am A tapset/libosmocore.stp 7 files changed, 103 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/20491/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e Gerrit-Change-Number: 20491 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:29:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:29:22 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20305 to look at the new patch set (#10). Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Related: OS#4311 Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 43 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/20305/10 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 10 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:29:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:29:22 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20317 to look at the new patch set (#8). Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... logging: Attempt a synchronous, non-blocking write first (file, stderr) In the old days, we performed synchronous, blocking writes to the log file or stderr. This was replaced by code that turned all log file/stderr writes into non-blocking writes behind a write_queue. This patch now introduces a further optimization: If we currently don't have any log messages pending in the write queue, we are not back-logged and assume we have a fair chance of writing the log message right now, synchronously. So we try that first, and only enqueue the log message if the write fails (no bytes or insufficient number of bytes written). This way we should get the best of both worlds: No delay/re-ordering (and lower select syscall load) for the "normal" case (benefits of the old synchronous writes) while at the same time never risking to block on log output. Related: OS#4311 Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 --- M src/logging.c 1 file changed, 30 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/20317/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:29:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:29:22 +0000 Subject: Change in libosmocore[master]: WIP: add rate_ctr_group to log_target In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20306 to look at the new patch set (#8). Change subject: WIP: add rate_ctr_group to log_target ...................................................................... WIP: add rate_ctr_group to log_target This way we account for the number of dropped log messages at write_queue overflow. However, log targets have no numerical ID and hence we're not able to extract them in a reasonable manner. Related: OS#4311 Change-Id: I89b696311b823267e05d6a3e85b92c1784b220ed --- M include/osmocom/core/logging.h M src/logging.c M tests/ctrl/ctrl_test.c 3 files changed, 45 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/20306/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I89b696311b823267e05d6a3e85b92c1784b220ed Gerrit-Change-Number: 20306 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:30:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 12:30:21 +0000 Subject: Change in libosmocore[master]: make use of OTC_GLOBAL when allocating library-internal contexts In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/13338 ) Change subject: make use of OTC_GLOBAL when allocating library-internal contexts ...................................................................... Patch Set 23: Code-Review-1 (5 comments) https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/gsm/lapd_core.c File src/gsm/lapd_core.c: https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/gsm/lapd_core.c at 257 PS23, Line 257: __thread void *tall_lapd_ctx; I'd say adding __thread here is actually a different fix/commit. https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/gsm/lapdm.c File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/gsm/lapdm.c at 129 PS23, Line 129: extern __thread void *tall_lapd_ctx; same (__thread) https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/logging.c at 1066 PS23, Line 1066: * \param[in] ctx should be NULL; only used for egacy API compatibility typo: legacy https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/signal.c File src/signal.c: https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/signal.c at 42 PS23, Line 42: static void *tall_sigh_ctx2; why not reuse the tall_sigh_ctx and make it static once we get rid of its use in openbsc? https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/vty/telnet_interface.c File src/vty/telnet_interface.c: https://gerrit.osmocom.org/c/libosmocore/+/13338/23/src/vty/telnet_interface.c at 78 PS23, Line 78: * \param[in] tall_ctx should be NULL; nly for legacy API compatibility typo: only -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I48f475efd3ee0d5120b8fc30861e852d1a6920b1 Gerrit-Change-Number: 13338 Gerrit-PatchSet: 23 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:30:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:37:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:37:51 +0000 Subject: Change in libosmocore[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20491 to look at the new patch set (#3). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated libosmocore binary. At this point, only two tracepoints are supported: log_start and log_done. They can be used to trace the amount of time a libosmocore-using application spends in potentiall blocking calls to log to stderr or to files. Related: OS#4311 Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e --- M Makefile.am M configure.ac M src/Makefile.am M src/logging.c A src/probes.d A tapset/Makefile.am A tapset/libosmocore.stp 7 files changed, 103 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/20491/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e Gerrit-Change-Number: 20491 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:40:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 12:40:39 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... Patch Set 10: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20305/10/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20305/10/src/logging.c at 1146 PS10, Line 1146: wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, Ah cool, we already have a mem pool here, I was going to suggest it ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 10 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:40:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:43:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 12:43:33 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20317 ) Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20317/8/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20317/8/src/logging.c at 957 PS8, Line 957: msgb_free(msg); don't you need to remove msg from wqueue before freeing it? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:43:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:43:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 12:43:58 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20317 ) Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... Patch Set 8: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/20317/8/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20317/8/src/logging.c at 957 PS8, Line 957: msgb_free(msg); > don't you need to remove msg from wqueue before freeing it? Ah never mind, the msg is not yet queued here ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:43:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:44:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 12:44:31 +0000 Subject: Change in libosmocore[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20491 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e Gerrit-Change-Number: 20491 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:44:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 12:51:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 12:51:28 +0000 Subject: Change in libosmocore[master]: log file: Increase output buffering using setvbuf() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19463 ) Change subject: log file: Increase output buffering using setvbuf() ...................................................................... Patch Set 4: I think this patch is not needed, if we ever eventually get around merging the patches for non-blocknig I/O for file + stderr based logging. See e.g. Ia58fd78535c41b3da3aeb7733aadc785ace610da Unfortuantely this is still blocked by some applications making assumptions on how many talloc contexts libosmocore internally uses, which is just so wrong. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19463 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I59beadb8d1d10a942513efc4c0477701f967237a Gerrit-Change-Number: 19463 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 12:51:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:10:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 13:10:04 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to latest release 1.4.2 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/22649 ) Change subject: libosmocore: Update to latest release 1.4.2 ...................................................................... libosmocore: Update to latest release 1.4.2 This fix release only contains 1 commit fixing out of bounds accesses in tlv_parser. Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/22649/1 diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 1acf6ac..205da74 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "5681a3254c1727d4926ac6d36800fd63d87ad7a2" +SRCREV = "34b328b6d040d31017269f7558cf9354bdeea8dd" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.4.1+gitr${SRCPV}" +PV = "1.4.2+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 Gerrit-Change-Number: 22649 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:23:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 13:23:03 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to latest release 1.4.2 In-Reply-To: References: Message-ID: Hello laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 to look at the new patch set (#2). Change subject: libosmocore: Update to latest release 1.4.2 ...................................................................... libosmocore: Update to latest release 1.4.2 This fix release only contains 1 commit fixing out of bounds accesses in tlv_parser. Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/22649/2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 Gerrit-Change-Number: 22649 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:23:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 13:23:09 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to latest release 1.4.2 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22649 ) Change subject: libosmocore: Update to latest release 1.4.2 ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 Gerrit-Change-Number: 22649 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 13:23:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 13:37:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22643 to look at the new patch set (#3). Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ST_ALIVE isn't quite clear. This state means this NS-VC is still dead. ST_ALIVE is used for NS-VC with vc_mode ALIVE (e.g. UDP NS-VC). It's the first state when the remote hasn't yet answered or when the NS-VC lost ALIVEs. Related: OS#4958 Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22643/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:41:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 13:41:17 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 13:41:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:43:11 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 13:43:11 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to latest release 1.4.2 In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22649 ) Change subject: libosmocore: Update to latest release 1.4.2 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 Gerrit-Change-Number: 22649 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 13:43:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:54:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:54:55 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 13:54:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test proce... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22642 ) Change subject: gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. ...................................................................... gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. Otherwise a NS-VC would flap between ALIVE and UNBLOCKED state. Related: OS#4959 Change-Id: Id98629bd65f92103e0e571ec388c58b02cb2ccb5 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index f4c4e46..6314408 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -200,6 +200,7 @@ switch (priv->alive.mode) { case NS_TOUT_TNS_TEST: priv->alive.mode = NS_TOUT_TNS_ALIVE; + priv->alive.N = 0; ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id98629bd65f92103e0e571ec388c58b02cb2ccb5 Gerrit-Change-Number: 22642 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:05 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22643 ) Change subject: gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ...................................................................... gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING ST_ALIVE isn't quite clear. This state means this NS-VC is still dead. ST_ALIVE is used for NS-VC with vc_mode ALIVE (e.g. UDP NS-VC). It's the first state when the remote hasn't yet answered or when the NS-VC lost ALIVEs. Related: OS#4958 Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 17 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 6314408..f6424de 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -81,13 +81,13 @@ * - UNCONFIGURED -> RESET -> BLOCK -> UNBLOCKED * * Without RESET/BLOCK, the state should follow: - * - UNCONFIGURED -> ALIVE -> UNBLOCKED + * - UNCONFIGURED -> RECOVERY -> UNBLOCKED * * The UNBLOCKED and TEST states are used to send ALIVE PDU using the timeout Tns-test and Tns-alive. * UNBLOCKED -> TEST: on expire of Tns-Test, send Alive PDU. * TEST -> UNBLOCKED: on receive of Alive_Ack PDU, go into UNBLOCKED. * - * The ALIVE state is used as intermediate, because a VC is only valid if it received an Alive ACK when + * The RECOVERY state is used as intermediate, because a VC is only valid if it received an Alive ACK when * not using RESET/BLOCK procedure. */ @@ -97,7 +97,7 @@ GPRS_NS2_ST_BLOCKED, GPRS_NS2_ST_UNBLOCKED, /* allows sending NS_UNITDATA */ - GPRS_NS2_ST_ALIVE, /* only used when not using RESET/BLOCK procedure */ + GPRS_NS2_ST_RECOVERING, /* only used when not using RESET/BLOCK procedure */ }; enum gprs_ns2_vc_event { @@ -217,7 +217,7 @@ if (priv->nsvc->mode == GPRS_NS2_VC_MODE_BLOCKRESET) { osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0); } else { - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); } } break; @@ -244,7 +244,7 @@ case GPRS_NS2_EV_REQ_START: switch (priv->nsvc->mode) { case GPRS_NS2_VC_MODE_ALIVE: - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE); break; case GPRS_NS2_VC_MODE_BLOCKRESET: osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET); @@ -422,7 +422,7 @@ priv->alive.mode = NS_TOUT_TNS_TEST; osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_TEST], 0); - if (old_state != GPRS_NS2_ST_ALIVE) + if (old_state != GPRS_NS2_ST_RECOVERING) priv->N = 0; ns2_tx_alive(priv->nsvc); @@ -437,7 +437,7 @@ static const struct osmo_fsm_state ns2_vc_states[] = { [GPRS_NS2_ST_UNCONFIGURED] = { .in_event_mask = S(GPRS_NS2_EV_REQ_START), - .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE), + .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_RECOVERING), .name = "UNCONFIGURED", .action = ns2_st_unconfigured, .onenter = ns2_st_unconfigured_onenter, @@ -465,7 +465,7 @@ [GPRS_NS2_ST_UNBLOCKED] = { .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK) | S(GPRS_NS2_EV_RX_UNBLOCK), - .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE) | + .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_RECOVERING) | S(GPRS_NS2_ST_BLOCKED) | S(GPRS_NS2_ST_UNCONFIGURED), .name = "UNBLOCKED", @@ -473,13 +473,13 @@ .onenter = ns2_st_unblocked_on_enter, }, - /* ST_ALIVE is only used on VC without RESET/BLOCK */ - [GPRS_NS2_ST_ALIVE] = { + /* ST_RECOVERING is only used on VC without RESET/BLOCK */ + [GPRS_NS2_ST_RECOVERING] = { .in_event_mask = S(GPRS_NS2_EV_RX_ALIVE_ACK), - .out_state_mask = S(GPRS_NS2_ST_ALIVE) | + .out_state_mask = S(GPRS_NS2_ST_RECOVERING) | S(GPRS_NS2_ST_UNBLOCKED) | S(GPRS_NS2_ST_UNCONFIGURED), - .name = "ALIVE", + .name = "RECOVERING", .action = ns2_st_alive, .onenter = ns2_st_alive_onenter, .onleave = ns2_st_alive_onleave, @@ -523,14 +523,14 @@ } } break; - case GPRS_NS2_ST_ALIVE: + case GPRS_NS2_ST_RECOVERING: if (priv->initiate_reset) { priv->N++; if (priv->N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) { - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, 0, 0); } else { priv->N = 0; - osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RECOVERING, 0, 0); } break; } @@ -606,7 +606,7 @@ break; case GPRS_NS2_EV_RX_ALIVE_ACK: /* for VCs without RESET/BLOCK/UNBLOCK, the connections comes after ALIVE_ACK unblocked */ - if (fi->state == GPRS_NS2_ST_ALIVE) + if (fi->state == GPRS_NS2_ST_RECOVERING) ns2_st_alive(fi, event, data); else recv_test_procedure(fi); @@ -630,7 +630,7 @@ 0, msg); break; /* ALIVE can receive UNITDATA if the ALIVE_ACK is lost */ - case GPRS_NS2_ST_ALIVE: + case GPRS_NS2_ST_RECOVERING: case GPRS_NS2_ST_UNBLOCKED: ns2_recv_unitdata(fi, msg); return; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b29e8ce6444546d90bde68b1f957f1013238784 Gerrit-Change-Number: 22643 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:05 +0000 Subject: Change in libosmocore[master]: gprs_ns2: unify the handling of **result when bind already present. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22644 ) Change subject: gprs_ns2: unify the handling of **result when bind already present. ...................................................................... gprs_ns2: unify the handling of **result when bind already present. All bind function should work in the same way. Also fixing a null pointer assignment if no **result is giving. Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 --- M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_udp.c 3 files changed, 15 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index fc6a5c4..f1a5576 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -721,8 +721,8 @@ * \param[in] netif Network interface to bind to * \param[in] fr_network * \param[in] fr_role - * \param[out] result pointer to created bind - * \return 0 on success; negative on error */ + * \param[out] result pointer to the created bind or if a bind with the name exists return the bind. + * \return 0 on success; negative on error. -EALREADY returned in case a bind with the name exists */ int gprs_ns2_fr_bind(struct gprs_ns2_inst *nsi, const char *name, const char *netif, @@ -738,8 +738,12 @@ if (strlen(netif) > IFNAMSIZ) return -EINVAL; - if (gprs_ns2_bind_by_name(nsi, name)) + bind = gprs_ns2_bind_by_name(nsi, name); + if (bind) { + if (result) + *result = bind; return -EALREADY; + } rc = ns2_bind_alloc(nsi, name, &bind); if (rc < 0) diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 88ef037..853375d 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -529,8 +529,8 @@ * \param[in] nsi NS instance in which to create the bind * \param[in] local local address on which to bind * \param[in] dscp DSCP/TOS bits to use for transmitted data on this bind - * \param[out] result pointer to created bind - * \return 0 on success; negative on error */ + * \param[out] result pointer to the created bind or if a bind with the name exists return the bind. + * \return 0 on success; negative on error. -EALREADY returned in case a bind with the name exists */ int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi, const char *name, const struct osmo_sockaddr *local, @@ -546,7 +546,8 @@ bind = gprs_ns2_bind_by_name(nsi, name); if (bind) { - *result = bind; + if (result) + *result = bind; return -EALREADY; } diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 9277f9a..e07f6d4 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -303,8 +303,8 @@ * \param[in] nsi NS Instance in which to create the NSVC * \param[in] local the local address to bind to * \param[in] dscp the DSCP/TOS bits used for transmitted data - * \param[out] result if set, returns the bind object - * \return 0 on success; negative in case of error */ + * \param[out] result pointer to the created bind or if a bind with the name exists return the bind. + * \return 0 on success; negative on error. -EALREADY returned in case a bind with the name exists */ int gprs_ns2_ip_bind(struct gprs_ns2_inst *nsi, const char *name, const struct osmo_sockaddr *local, @@ -320,7 +320,8 @@ bind = gprs_ns2_ip_bind_by_sockaddr(nsi, local); if (bind) { - *result = bind; + if (result) + *result = bind; return -EBUSY; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd0c2190d2af39804c18c4786a997079db9a4330 Gerrit-Change-Number: 22644 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:05 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: free_bind(): first do the NULL check before using members In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22645 ) Change subject: gprs_ns2_fr: free_bind(): first do the NULL check before using members ...................................................................... gprs_ns2_fr: free_bind(): first do the NULL check before using members Change-Id: I80f72ada15b477d735bf5aee36a5d67e80eb0136 --- M src/gb/gprs_ns2_fr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index f1a5576..78abddc 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -161,10 +161,10 @@ struct priv_bind *priv; struct msgb *msg, *msg2; - OSMO_ASSERT(gprs_ns2_is_fr_bind(bind)); if (!bind) return; + OSMO_ASSERT(gprs_ns2_is_fr_bind(bind)); priv = bind->priv; OSMO_ASSERT(llist_empty(&bind->nsvc)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I80f72ada15b477d735bf5aee36a5d67e80eb0136 Gerrit-Change-Number: 22645 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:06 +0000 Subject: Change in libosmocore[master]: frame_relay: fix NULL pointer deref In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22646 ) Change subject: frame_relay: fix NULL pointer deref ...................................................................... frame_relay: fix NULL pointer deref Related: CID#215530 Change-Id: Ic58394ab44ee555a0c5dee2b07fa1054093fbcf0 --- M src/gb/frame_relay.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index ff97a17..96f51cf 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -585,6 +585,7 @@ dlc = osmo_fr_dlc_alloc(link, dlci); if (!dlc) { LOGPFRL(link, LOGL_ERROR, "Rx STATUS: Could not create DLC %d\n", dlci); + continue; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic58394ab44ee555a0c5dee2b07fa1054093fbcf0 Gerrit-Change-Number: 22646 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:06 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: set a correct gre pointer for ipv6 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22647 ) Change subject: gprs_ns2_frgre: set a correct gre pointer for ipv6 ...................................................................... gprs_ns2_frgre: set a correct gre pointer for ipv6 Also fixes a nullpointer deref because iph is NULL on IPv6 Related: CID#216555 Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb --- M src/gb/gprs_ns2_frgre.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 853375d..f163704 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -339,7 +339,11 @@ break; } - greh = (struct gre_hdr *) (msg->data + iph->ihl*4); + if (iph) + greh = (struct gre_hdr *) (msg->data + iph->ihl*4); + else + greh = (struct gre_hdr *) (msg->data + sizeof(struct ip6_hdr)); + if (greh->flags) { LOGBIND(bind, LOGL_NOTICE, "Unknown GRE flags 0x%04x\n", osmo_ntohs(greh->flags)); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ff868a7bba6151a2202df774ff022c02b8c34cb Gerrit-Change-Number: 22647 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:06 +0000 Subject: Change in libosmocore[master]: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22648 ) Change subject: gprs_ns2_frgre: check iph/ip6h before passing them to rx functions ...................................................................... gprs_ns2_frgre: check iph/ip6h before passing them to rx functions With IPv4 and IPv6 support it's not guaranteed that iph/ip6h is valid. Related CID#214288 Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 --- M src/gb/gprs_ns2_frgre.c 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index f163704..177aeb2 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -351,11 +351,17 @@ switch (osmo_ntohs(greh->ptype)) { case GRE_PTYPE_IPv4: /* IPv4 messages might be GRE keepalives */ - *error = handle_rx_gre_ipv4(bfd, msg, iph, greh); + if (iph) + *error = handle_rx_gre_ipv4(bfd, msg, iph, greh); + else + *error = -EIO; goto out_err; break; case GRE_PTYPE_IPv6: - *error = handle_rx_gre_ipv6(bfd, msg, ip6h, greh); + if (ip6h) + *error = handle_rx_gre_ipv6(bfd, msg, ip6h, greh); + else + *error = -EIO; goto out_err; break; case GRE_PTYPE_FR: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9015906917e3ad11d14b84c29d64f28a3158144 Gerrit-Change-Number: 22648 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:33 +0000 Subject: Change in libosmocore[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20491 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e Gerrit-Change-Number: 20491 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 13:55:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 13:55:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 13:55:40 +0000 Subject: Change in libosmocore[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20491 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated libosmocore binary. At this point, only two tracepoints are supported: log_start and log_done. They can be used to trace the amount of time a libosmocore-using application spends in potentiall blocking calls to log to stderr or to files. Related: OS#4311 Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e --- M Makefile.am M configure.ac M src/Makefile.am M src/logging.c A src/probes.d A tapset/Makefile.am A tapset/libosmocore.stp 7 files changed, 103 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index f2a05a9..ab2aad9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc src/usb utils tests +SUBDIRS = include src src/vty src/codec src/gsm src/coding src/gb src/ctrl src/sim src/pseudotalloc src/usb utils tapset tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ diff --git a/configure.ac b/configure.ac index 2077570..2a6a180 100644 --- a/configure.ac +++ b/configure.ac @@ -433,6 +433,38 @@ AC_MSG_RESULT([$neon]) AM_CONDITIONAL(HAVE_NEON, [test "x$neon" != "xno"]) +# +# SystemTap support +# +AC_MSG_CHECKING([whether to include systemtap tracing support]) +AC_ARG_ENABLE([systemtap], + [AS_HELP_STRING([--enable-systemtap], + [Enable inclusion of systemtap trace support])], + [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no']) +AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) +AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) + +if test "x${ENABLE_SYSTEMTAP}" = xyes; then + # Additional configuration for --enable-systemtap is HERE + AC_CHECK_PROGS(DTRACE, dtrace) + if test -z "$DTRACE"; then + AC_MSG_ERROR([dtrace not found]) + fi + AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], + [SDT_H_FOUND='no'; + AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) + AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.]) + AC_ARG_WITH([tapset-install-dir], + [AS_HELP_STRING([--with-tapset-install-dir], + [The absolute path where the tapset dir will be installed])], + [if test "x${withval}" = x; then + ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset" + else + ABS_TAPSET_DIR="${withval}" + fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"]) + AC_SUBST(ABS_TAPSET_DIR) +fi + OSMO_AC_CODE_COVERAGE @@ -487,6 +519,7 @@ src/gb/Makefile src/ctrl/Makefile src/pseudotalloc/Makefile + tapset/Makefile tests/Makefile tests/atlocal utils/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index dd31db8..a2566a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ use_count.c \ exec.c \ it_q.c \ + probes.d \ $(NULL) if HAVE_SSSE3 @@ -82,5 +83,16 @@ libosmocore_la_LIBADD += $(LIBMNL_LIBS) endif +if ENABLE_SYSTEMTAP +probes.h: probes.d + $(DTRACE) -C -h -s $< -o $@ + +probes.lo: probes.d + $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ + +BUILT_SOURCES += probes.h probes.lo +libosmocore_la_LIBADD += probes.lo +endif + crc%gen.c: crcXXgen.c.tpl $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/src/logging.c b/src/logging.c index 60dba64..a40008e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -44,6 +44,17 @@ #include #endif +#ifdef HAVE_SYSTEMTAP +/* include the generated probes header and put markers in code */ +#include "probes.h" +#define TRACE(probe) probe +#define TRACE_ENABLED(probe) probe ## _ENABLED() +#else +/* Wrap the probe to allow it to be removed when no systemtap available */ +#define TRACE(probe) +#define TRACE_ENABLED(probe) (0) +#endif /* HAVE_SYSTEMTAP */ + #include #include #include @@ -670,9 +681,11 @@ { va_list ap; + TRACE(LIBOSMOCORE_LOG_START()); va_start(ap, format); osmo_vlogp(subsys, level, file, line, cont, format, ap); va_end(ap); + TRACE(LIBOSMOCORE_LOG_DONE()); } /*! Register a new log target with the logging core diff --git a/src/probes.d b/src/probes.d new file mode 100644 index 0000000..c16eb1e --- /dev/null +++ b/src/probes.d @@ -0,0 +1,4 @@ +provider libosmocore { + probe log_start(); + probe log_done(); +}; diff --git a/tapset/Makefile.am b/tapset/Makefile.am new file mode 100644 index 0000000..a07a3b1 --- /dev/null +++ b/tapset/Makefile.am @@ -0,0 +1,22 @@ +.PHONY: clean-local install-data-hook uninstall-local + +EXTRA_DIST = libosmocore.stp +TAPSET_FILES = $(EXTRA_DIST) +TAPSET_INSTALL_DIR = $(DESTDIR)@ABS_TAPSET_DIR@ + +if ENABLE_SYSTEMTAP +all-local: $(TAPSET_FILES) + +clean-local: + +install-data-hook: + $(MKDIR_P) $(TAPSET_INSTALL_DIR) + $(INSTALL_DATA) $(TAPSET_FILES) $(TAPSET_INSTALL_DIR) + +uninstall-local: + @list='$(TAPSET_FILES)'; for p in $$list; do \ + echo " rm -f '$(TAPSET_INSTALL_DIR)/$$p'"; \ + rm -f "$(TAPSET_INSTALL_DIR)/$$p"; \ + done + +endif diff --git a/tapset/libosmocore.stp b/tapset/libosmocore.stp new file mode 100644 index 0000000..0ec3c42 --- /dev/null +++ b/tapset/libosmocore.stp @@ -0,0 +1,18 @@ +/* libosmocore tapset + * + * This file is part of libosmocore. + * + * Each probe defines the probe name and a full probestr which consist of the probe name and between + * brackets all argument names and values. + */ + +probe libosmocore_log_start = process("libosmocore").mark("log_start") +{ + count = $arg1; + probestr = sprintf("%s(count=%d), $$name, count); +} + +probe libosmocore_log_done = process("libosmocore").mark("log_done") +{ + probestr = sprintf("%s", $$name); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e1ab664241deb524c9582cbd1bec31af46c747e Gerrit-Change-Number: 20491 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:05:15 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 14:05:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework logging of Rx and Tx NS PDU In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22294 ) Change subject: gprs_ns2: rework logging of Rx and Tx NS PDU ...................................................................... Patch Set 14: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22294/14/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22294/14/src/gb/gprs_ns2.c at 1091 PS14, Line 1091: LOG_NS_RX_SIGNAL(nsvc, nsh->pdu_type); This also logs NS_PDUT_UNITDATA https://gerrit.osmocom.org/c/libosmocore/+/22294/11/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22294/11/src/gb/gprs_ns2_internal.h at 33 PS11, Line 33: #define LOG_NS_TX_MESSAGE(nsvc, pdu_type) LOG_NS_MESSAGE(nsvc, "Tx", pdu_type, LOGL_INFO, "\n") > Separate subsystems would be good, yeah. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 14 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 14:05:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:15:45 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 14:15:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fix broken tests by adding weight References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 ) Change subject: ns: fix broken tests by adding weight ...................................................................... ns: fix broken tests by adding weight when weights has been introduces the NS tests has been forgotten to add a default data/signalling Change-Id: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 --- M ns/NS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/22650/1 diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn index ef8be2a..59ab765 100644 --- a/ns/NS_Tests.ttcn +++ b/ns/NS_Tests.ttcn @@ -38,7 +38,9 @@ local_udp_port := 21000, local_ip := "127.0.0.1", remote_udp_port := 23000, - remote_ip := "127.0.0.1" + remote_ip := "127.0.0.1", + data_weight := 2, + signalling_weight := 2 } }, nsvci := 97 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 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: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 Gerrit-Change-Number: 22650 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:17:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 14:17:11 +0000 Subject: Change in libosmocore[master]: Enable systemd-journald log target in debian + rpm packaging References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22651 ) Change subject: Enable systemd-journald log target in debian + rpm packaging ...................................................................... Enable systemd-journald log target in debian + rpm packaging Given that all the distributions we support are shipping systemd anyway, this will not really introduce any additional runtime package dependencies. Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 --- M contrib/libosmocore.spec.in M debian/control M debian/rules 3 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/22651/1 diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 728a0fb..93e5e16 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -31,6 +31,7 @@ BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(talloc) >= 2.0.1 BuildRequires: pkgconfig(libmnl) +BuildRequires: pkgconfig(libsystemd) %description libosmocore is a package with various utility functions that were @@ -305,7 +306,7 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static \ +%configure --enable-shared --disable-static --enable-systemd-logging \ --includedir="%_includedir/%name" make %{?_smp_mflags} V=1 diff --git a/debian/control b/debian/control index 24e729a..05069c5 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ libsctp-dev, libusb-1.0-0-dev, libmnl-dev, + libsystemd-dev, python3:native Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git diff --git a/debian/rules b/debian/rules index afff17f..f5b71eb 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static --disable-sctp-tests + dh_auto_configure -- --enable-static --disable-sctp-tests --enable-systemd-logging override_dh_clean: dh_clean -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 Gerrit-Change-Number: 22651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:17:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 14:17:41 +0000 Subject: Change in libosmocore[master]: Enable systemd-journald log target in debian + rpm packaging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22651 ) Change subject: Enable systemd-journald log target in debian + rpm packaging ...................................................................... Patch Set 1: I built the resulting package on debian8 + debian unstable, and it built fine. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 Gerrit-Change-Number: 22651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 03 Feb 2021 14:17:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:43:42 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 14:43:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fix broken tests by adding weight In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 to look at the new patch set (#2). Change subject: ns: fix broken tests by adding weight ...................................................................... ns: fix broken tests by adding weight The NSConfiguration now requires signalling_weight and data_weight. Otherwise the tests will fail to an unbound integer. Change-Id: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 --- M ns/NS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/22650/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 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: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 Gerrit-Change-Number: 22650 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:52:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 14:52:16 +0000 Subject: Change in libosmocore[master]: Enable systemd-journald log target in debian + rpm packaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22651 ) Change subject: Enable systemd-journald log target in debian + rpm packaging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 Gerrit-Change-Number: 22651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 14:52:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:52:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 14:52:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fix broken tests by adding weight In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 ) Change subject: ns: fix broken tests by adding weight ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 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: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 Gerrit-Change-Number: 22650 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 14:52:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 14:56:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 3 Feb 2021 14:56:24 +0000 Subject: Change in libosmocore[master]: Enable systemd-journald log target in debian + rpm packaging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22651 ) Change subject: Enable systemd-journald log target in debian + rpm packaging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 Gerrit-Change-Number: 22651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 14:56:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:03:22 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:03:22 +0000 Subject: Change in osmo-gbproxy[master]: Add Function to get gbproxy cell by cell id References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: Add Function to get gbproxy cell by cell id ...................................................................... Add Function to get gbproxy cell by cell id Related: SYS#5103 Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy_peer.c 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/52/22652/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index d988cae..f69cb56 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -264,6 +265,7 @@ struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci); struct gbproxy_cell *gbproxy_cell_by_bvci(struct gbproxy_config *cfg, uint16_t bvci); +struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid); void gbproxy_cell_free(struct gbproxy_cell *cell); bool gbproxy_cell_add_sgsn_bvc(struct gbproxy_cell *cell, struct gbproxy_bvc *bvc); diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index e276c85..bd11719 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -206,6 +206,19 @@ return cell; } +struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid) +{ + int i; + struct gbproxy_cell *cell; + + hash_for_each(cfg->cells, i, cell, list) { + if ((cell->id.cid == cid) && (!memcmp(&cell->id.raid, raid, sizeof(*raid)))) { + return cell; + } + } + return NULL; +} + void gbproxy_cell_free(struct gbproxy_cell *cell) { unsigned int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:03:23 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:03:23 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: Simplify raid data storage ...................................................................... Simplify raid data storage Instead of storing the raw ra_id in gbproxy_bvc and gbproxy_cell store the decoded ra_id plus cell id in gbproxy cell and use it from there. Related: OS#4894 Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 17 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index f69cb56..871ba68 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -111,8 +111,11 @@ /* BVCI of PTP BVCs associated to this cell */ uint16_t bvci; - /* Routing Area that this BVC is part of (raw 04.08 encoding) */ - uint8_t ra[6]; + /* Routing Area that this BVC is part of */ + struct { + struct gprs_ra_id raid; + uint16_t cid; + } id; /* pointer to the BSS-side BVC */ struct gbproxy_bvc *bss_bvc; @@ -132,9 +135,6 @@ /* PTP BVCI of this BVC */ uint16_t bvci; - /* Routing Area that this BVC is part of (raw 04.08 encoding) */ - uint8_t ra[6]; - /* Counter */ struct rate_ctr_group *ctrg; diff --git a/src/gb_proxy.c b/src/gb_proxy.c index e8a78f2..04ebaf6 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -671,7 +671,7 @@ bvc->cell = gbproxy_cell_alloc(cfg, bvci); OSMO_ASSERT(bvc->cell); - memcpy(bvc->cell->ra, bvc->ra, sizeof(bvc->cell->ra)); + memcpy(&bvc->cell->id.raid, ra_id, sizeof(*ra_id)); /* link us to the cell and vice-versa */ bvc->cell->bss_bvc = bvc; @@ -688,7 +688,6 @@ OSMO_ASSERT(sgsn_bvc); sgsn_bvc->cell = bvc->cell; - memcpy(sgsn_bvc->ra, bvc->cell->ra, sizeof(sgsn_bvc->ra)); sgsn_bvc->fi = bssgp_bvc_fsm_alloc_ptp_bss(sgsn_bvc, cfg->nsi, sgsn_nse->nsei, bvci, ra_id, cell_id); OSMO_ASSERT(sgsn_bvc->fi); @@ -871,17 +870,6 @@ gbproxy_bvc_move(from_bvc, nse_new); } #endif - /* FIXME: do we need this, if it happens within FSM? */ - if (TLVP_PRES_LEN(tp, BSSGP_IE_CELL_ID, 8)) { - struct gprs_ra_id raid; - /* We have a Cell Identifier present in this - * PDU, this means we can extend our local - * state information about this particular cell - * */ - memcpy(from_bvc->ra, TLVP_VAL(tp, BSSGP_IE_CELL_ID), sizeof(from_bvc->ra)); - gsm48_parse_ra(&raid, from_bvc->ra); - LOGPBVC(from_bvc, LOGL_INFO, "Cell ID %s\n", osmo_rai_name(&raid)); - } } /* hand into FSM for further processing */ osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_RESET, msg); @@ -1053,11 +1041,13 @@ LOGPBVC(sgsn_bvc, LOGL_INFO, "Rx %s: routing by BVCI\n", pdut_name); return gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci); } else if (TLVP_PRES_LEN(tp, BSSGP_IE_ROUTEING_AREA, 6)) { + struct gprs_ra_id raid; errctr = GBPROX_GLOB_CTR_INV_RAI; + gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA)); /* iterate over all bvcs and dispatch the paging to each matching one */ hash_for_each(cfg->bss_nses, i, nse, list) { hash_for_each(nse->bvcs, j, bss_bvc, list) { - if (!memcmp(bss_bvc->ra, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA), 6)) { + if (!memcmp(&bss_bvc->cell->id.raid, &raid, sizeof(raid))) { LOGPNSE(nse, LOGL_INFO, "Rx %s: routing to NSE (RAI match)\n", pdut_name); gbprox_relay2peer(msg, bss_bvc, ns_bvci); @@ -1068,11 +1058,13 @@ } } } else if (TLVP_PRES_LEN(tp, BSSGP_IE_LOCATION_AREA, 5)) { + struct gsm48_ra_id lac; errctr = GBPROX_GLOB_CTR_INV_LAI; /* iterate over all bvcs and dispatch the paging to each matching one */ hash_for_each(cfg->bss_nses, i, nse, list) { hash_for_each(nse->bvcs, j, bss_bvc, list) { - if (!memcmp(bss_bvc->ra, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) { + gsm48_encode_ra(&lac, &bss_bvc->cell->id.raid); + if (!memcmp(&lac, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) { LOGPNSE(nse, LOGL_INFO, "Rx %s: routing to NSE (LAI match)\n", pdut_name); gbprox_relay2peer(msg, bss_bvc, ns_bvci); diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c index 794afd7..c43082d 100644 --- a/src/gb_proxy_ctrl.c +++ b/src/gb_proxy_ctrl.c @@ -91,13 +91,12 @@ hash_for_each(cfg->bss_nses, i, nse_peer, list) { struct gbproxy_bvc *bvc; hash_for_each(nse_peer->bvcs, j, bvc, list) { - struct gprs_ra_id raid; - gsm48_parse_ra(&raid, bvc->ra); + struct gprs_ra_id *raid = &bvc->cell->id.raid; cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", nse_peer->nsei, bvc->bvci, - raid.mcc, raid.mnc, - raid.lac, raid.rac, + raid->mcc, raid->mnc, + raid->lac, raid->rac, osmo_fsm_inst_state_name(bvc->fi)); } } diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index fd4692d..9dbde58 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -78,10 +78,8 @@ vty_out(vty, "NSEI %5u, SIG-BVCI %5u [%s]%s", bvc->nse->nsei, bvc->bvci, osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE); } else { - struct gprs_ra_id raid; - gsm48_parse_ra(&raid, bvc->ra); vty_out(vty, "NSEI %5u, PTP-BVCI %5u, RAI %s [%s]%s", bvc->nse->nsei, bvc->bvci, - osmo_rai_name(&raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE); + osmo_rai_name(&bvc->cell->id.raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE); } } @@ -100,12 +98,10 @@ static void gbproxy_vty_print_cell(struct vty *vty, struct gbproxy_cell *cell, bool show_stats) { - struct gprs_ra_id raid; - gsm48_parse_ra(&raid, cell->ra); unsigned int num_sgsn_bvc = 0; unsigned int i; - vty_out(vty, "BVCI %5u RAI %s: ", cell->bvci, osmo_rai_name(&raid)); + vty_out(vty, "BVCI %5u RAI %s CID %05u: ", cell->bvci, osmo_rai_name(&cell->id.raid), cell->id.cid); if (cell->bss_bvc) vty_out(vty, "BSS NSEI %5u, SGSN NSEI ", cell->bss_bvc->nse->nsei); else -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:03:23 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:03:23 +0000 Subject: Change in osmo-gbproxy[master]: Require ra_id and cid in gbproxy_cell_alloc References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22654 ) Change subject: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Require ra_id and cid in gbproxy_cell_alloc Related: SYS#5103 Change-Id: Id57f6b04e558554f2a082821d74b4c733301b059 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/54/22654/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 871ba68..f838354 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -222,7 +222,7 @@ LOGPBVC_CAT(BVC, DGPRS, LEVEL, FMT, ## ARGS) #define LOGPCELL_CAT(CELL, SUBSYS, LEVEL, FMT, ARGS...) \ - LOGP(SUBSYS, LEVEL, "CELL(%05u) " FMT, (CELL)->bvci, ## ARGS) + LOGP(SUBSYS, LEVEL, "CELL(%05u/%05u) " FMT, (CELL)->bvci, (CELL)->id.cid, ## ARGS) #define LOGPCELL(CELL, LEVEL, FMT, ARGS...) \ LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS) @@ -263,7 +263,7 @@ void gbproxy_bvc_free(struct gbproxy_bvc *bvc); int gbproxy_cleanup_bvcs(struct gbproxy_nse *nse, uint16_t bvci); -struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci); +struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci, const struct gprs_ra_id *raid, uint16_t cid); struct gbproxy_cell *gbproxy_cell_by_bvci(struct gbproxy_config *cfg, uint16_t bvci); struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid); void gbproxy_cell_free(struct gbproxy_cell *cell); diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 04ebaf6..2dee5b2 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -669,9 +669,8 @@ * for this BVC. We need to create the 'cell' data structure and the SGSN-side * BVC counterparts */ - bvc->cell = gbproxy_cell_alloc(cfg, bvci); + bvc->cell = gbproxy_cell_alloc(cfg, bvci, ra_id, cell_id); OSMO_ASSERT(bvc->cell); - memcpy(&bvc->cell->id.raid, ra_id, sizeof(*ra_id)); /* link us to the cell and vice-versa */ bvc->cell->bss_bvc = bvc; diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index bd11719..311ab78 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -163,7 +163,7 @@ ***********************************************************************/ /* Allocate a new 'cell' object */ -struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci) +struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci, const struct gprs_ra_id *raid, uint16_t cid) { struct gbproxy_cell *cell; OSMO_ASSERT(cfg); @@ -174,6 +174,8 @@ cell->cfg = cfg; cell->bvci = bvci; + cell->id.cid = cid; + memcpy(&cell->id.raid, raid, sizeof(cell->id.raid)); hash_add(cfg->cells, &cell->list, cell->bvci); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id57f6b04e558554f2a082821d74b4c733301b059 Gerrit-Change-Number: 22654 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:03:24 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:03:24 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused function gbproxy_cell_by_bvci_or_new References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22655 ) Change subject: Remove unused function gbproxy_cell_by_bvci_or_new ...................................................................... Remove unused function gbproxy_cell_by_bvci_or_new Related: SYS#5103 Change-Id: Ia866fa1083ea281be77014eaec77de2f1d093cba --- M src/gb_proxy_peer.c 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/55/22655/1 diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 311ab78..7dd7ea5 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -196,18 +196,6 @@ return NULL; } -struct gbproxy_cell *gbproxy_cell_by_bvci_or_new(struct gbproxy_config *cfg, uint16_t bvci) -{ - struct gbproxy_cell *cell; - OSMO_ASSERT(cfg); - - cell = gbproxy_cell_by_bvci(cfg, bvci); - if (!cell) - cell = gbproxy_cell_alloc(cfg, bvci); - - return cell; -} - struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid) { int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ia866fa1083ea281be77014eaec77de2f1d093cba Gerrit-Change-Number: 22655 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:03:24 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:03:24 +0000 Subject: Change in osmo-gbproxy[master]: WIP rim support References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22656 ) Change subject: WIP rim support ...................................................................... WIP rim support Change-Id: I11fbe29e73aa27ed5f87156ac612e6c0ad6ed788 --- M src/gb_proxy.c 1 file changed, 53 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/56/22656/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 2dee5b2..bf5e544 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -973,9 +974,34 @@ case BSSGP_PDUT_RAN_INFO_ACK: case BSSGP_PDUT_RAN_INFO_ERROR: case BSSGP_PDUT_RAN_INFO_APP_ERROR: - /* FIXME: route based in RIM Routing IE */ - rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); + { + struct gbproxy_cell *cell; + struct gbproxy_sgsn *sgsn; + struct bssgp_rim_routing_info ri; + + /* TODO: Check the RIM src addr and ensure it matches a Cell we have for this BSS */ + /* Reply with STATUS if BSSGP didn't negotiate RIM feature */ + /* FIXME: Check negotiated features + if (0) { + rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); + } */ + + rc = bssgp_parse_rim_ri(&ri, TLVP_VAL(&tp, BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp, BSSGP_IE_RIM_ROUTING_INFO)); + + /* Check RIM destination addr */ + if (ri.discr == BSSGP_RIM_ROUTING_INFO_GERAN) { + cell = gbproxy_cell_by_cellid(nse->cfg, &ri.geran.raid, ri.geran.cid); + if (cell) { + /* Destination is known by gbproxy, route directly */ + return gbprox_relay2peer(msg, cell->bss_bvc, 0); + } + } + /* Otherwise pass on to a RIM-capable SGSN */ + /* TODO: Check SGSN is RIM-capable */ + sgsn = gbproxy_select_sgsn(nse->cfg, NULL); + gbprox_relay2nse(msg, sgsn->nse, 0); break; + } case BSSGP_PDUT_LLC_DISCARD: case BSSGP_PDUT_FLUSH_LL_ACK: /* route based on BVCI + TLLI */ @@ -1275,9 +1301,32 @@ case BSSGP_PDUT_RAN_INFO_ACK: case BSSGP_PDUT_RAN_INFO_ERROR: case BSSGP_PDUT_RAN_INFO_APP_ERROR: - /* FIXME: route based in RIM Routing IE */ - rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); + { + struct gbproxy_cell *cell; + struct bssgp_rim_routing_info ri; + + /* Reply with STATUS if BSSGP didn't negotiate RIM feature */ + /* FIXME: Check negotiated features + if (0) { + rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); + } */ + + rc = bssgp_parse_rim_ri(&ri, TLVP_VAL(&tp, BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp, BSSGP_IE_RIM_ROUTING_INFO)); + + /* Check RIM destination addr */ + if (ri.discr == BSSGP_RIM_ROUTING_INFO_GERAN) { + cell = gbproxy_cell_by_cellid(cfg, &ri.geran.raid, ri.geran.cid); + if (!cell) { + /* TODO: Log error */ + } else { + return gbprox_relay2peer(msg, cell->bss_bvc, 0); + } + } + /* If it's not a GERAN Cell or it's a Cell gbproxy doesn't know about: Return STATUS PDU with + * "Unknown Destination Address" */ + rc = bssgp_tx_status(BSSGP_CAUSE_UNKN_DST, NULL, msg); break; + } default: LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I11fbe29e73aa27ed5f87156ac612e6c0ad6ed788 Gerrit-Change-Number: 22656 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:04:10 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:04:10 +0000 Subject: Change in osmo-gbproxy[master]: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22654 ) Change subject: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id57f6b04e558554f2a082821d74b4c733301b059 Gerrit-Change-Number: 22654 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:04:15 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:04:15 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused function gbproxy_cell_by_bvci_or_new In-Reply-To: References: Message-ID: daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22655 ) Change subject: Remove unused function gbproxy_cell_by_bvci_or_new ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ia866fa1083ea281be77014eaec77de2f1d093cba Gerrit-Change-Number: 22655 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:04:21 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:04:21 +0000 Subject: Change in osmo-gbproxy[master]: WIP rim support In-Reply-To: References: Message-ID: daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22656 ) Change subject: WIP rim support ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I11fbe29e73aa27ed5f87156ac612e6c0ad6ed788 Gerrit-Change-Number: 22656 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:09:03 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 15:09:03 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 to look at the new patch set (#2). Change subject: Simplify raid data storage ...................................................................... Simplify raid data storage Instead of storing the raw ra_id in gbproxy_bvc and gbproxy_cell store the decoded ra_id plus cell id in gbproxy cell and use it from there. Related: OS#4894 Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 18 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:12:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 15:12:43 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: Simplify raid data storage ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 03 Feb 2021 15:12:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:13:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 15:13:27 +0000 Subject: Change in osmo-gbproxy[master]: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/2/src/gb_proxy_peer.c File src/gb_proxy_peer.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/2/src/gb_proxy_peer.c at 215 PS2, Line 215: if ((cell->id.cid == cid) && (!memcmp(&cell->id.raid, raid, sizeof(*raid)))) { be careful when memcomparing structures, I already had some issues using it with cgi_ps one (due to padding bytes having uninitialized bytes). I'd rather add a _cmp function for gprs_ra_id (see for osmo_cgi_ps_cmp as an example). -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 15:13:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:16:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 15:16:56 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: Simplify raid data storage ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/include/osmocom/sgsn/gb_proxy.h at 115 PS2, Line 115: struct { There's already struct osmo_cgi_ps in case you want to reuse it. However I see it may be more handy using this self struct since you memcpy it from somewhere else. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c File src/gb_proxy_ctrl.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c at 96 PS2, Line 96: cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", Not related to this patch, but it would be better using the "%u-%u-%u" notation (as per specs) for RAI here. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 15:16:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:34:31 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 3 Feb 2021 15:34:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... pcu: move generic RAW_NS_CT function to library/RAW_NS Allow the NS tests to use the SNS functions. Change-Id: I6c404475f39dd00023eb11e98da93ee423604039 --- M library/RAW_NS.ttcnpp M pcu/PCU_Tests_SNS.ttcn 2 files changed, 184 insertions(+), 184 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/22657/1 diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp index 81836c7..e8d4564 100644 --- a/library/RAW_NS.ttcnpp +++ b/library/RAW_NS.ttcnpp @@ -266,4 +266,188 @@ } } +/********************************************************************************** + * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) + **********************************************************************************/ + +/* perform inbound SNS-SIZE procedure */ +function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_incoming_sns_size(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, + num_v4 := 4, num_v6 := omit), idx); + } else { + /* expect one single SNS-SIZE with RESET flag; no v4 EP; 4x v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, + num_v4 := omit, num_v6 := 4), idx); + } + NSCP[idx].send(ts_SNS_SIZE_ACK(g_nsconfig.nsei, cause)); +} + +/* perform outbound SNS-SIZE procedure */ +function f_outgoing_sns_size(template (omit) NsCause cause := omit, integer idx:= 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_size(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, + num_v4 := 1, num_v6 := omit) + ); + } else { + NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, + num_v4 := omit, num_v6 := 1) + ); + } + /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig.nsei, cause), idx); +} + +/* perform inbound SNS-CONFIG procedure */ +function f_incoming_sns_config(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_incoming_sns_config(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template IP4_Elements v4_elem := { tr_SNS_IPv4(nsvc_cfg.provider.ip.remote_ip, + nsvc_cfg.provider.ip.remote_udp_port) }; + rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v4 := v4_elem), idx); + } else { + var template IP6_Elements v6_elem := { tr_SNS_IPv6(nsvc_cfg.provider.ip.remote_ip, + nsvc_cfg.provider.ip.remote_udp_port) }; + rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v6 := v6_elem), idx); + } + NSCP[idx].send(ts_SNS_CONFIG_ACK(g_nsconfig.nsei, cause)); +} + +/* perform outbound SNS-CONFIG procedure */ +function f_outgoing_sns_config(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_config(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port) } + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port) } + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); + } + rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); +} + +/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ +function f_outgoing_sns_config_1c1u(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_config_1c1u(idx=", idx, ")"); + var PDU_NS rx; + + if (g_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[0].provider.ip.local_ip, + g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[0].provider.ip.local_ip, + g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); + } + rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); +} + +/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ +function f_outgoing_sns_config_1c1u_separate(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")"); + var PDU_NS rx; + if (g_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig.nsvc[2].provider.ip.local_ip, + g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv6(g_nsconfig.nsvc[2].provider.ip.local_ip, + g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); + } + rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); +} + +function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit) +runs on RAW_NS_CT { + log("f_outgoing_sns_add(idx_add=", idx_add, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_add]; + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, v6)); + } +} + +function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_del(idx_del=", idx_del, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_del]; + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, omit, v6)); + } +} + +function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_chg]; + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, v6)); + } +} + } diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 4fca26e..c4f6b6e 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -22,190 +22,6 @@ * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) **********************************************************************************/ -/* perform inbound SNS-SIZE procedure */ -function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_incoming_sns_size(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, - num_v4 := 4, num_v6 := omit), idx); - } else { - /* expect one single SNS-SIZE with RESET flag; no v4 EP; 4x v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, - num_v4 := omit, num_v6 := 4), idx); - } - NSCP[idx].send(ts_SNS_SIZE_ACK(g_nsconfig.nsei, cause)); -} - -/* perform outbound SNS-SIZE procedure */ -function f_outgoing_sns_size(template (omit) NsCause cause := omit, integer idx:= 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_size(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, - num_v4 := 1, num_v6 := omit) - ); - } else { - NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, - num_v4 := omit, num_v6 := 1) - ); - } - /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig.nsei, cause), idx); -} - -/* perform inbound SNS-CONFIG procedure */ -function f_incoming_sns_config(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_incoming_sns_config(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template IP4_Elements v4_elem := { tr_SNS_IPv4(nsvc_cfg.provider.ip.remote_ip, - nsvc_cfg.provider.ip.remote_udp_port) }; - rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v4 := v4_elem), idx); - } else { - var template IP6_Elements v6_elem := { tr_SNS_IPv6(nsvc_cfg.provider.ip.remote_ip, - nsvc_cfg.provider.ip.remote_udp_port) }; - rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v6 := v6_elem), idx); - } - NSCP[idx].send(ts_SNS_CONFIG_ACK(g_nsconfig.nsei, cause)); -} - -/* perform outbound SNS-CONFIG procedure */ -function f_outgoing_sns_config(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_config(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port) } - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port) } - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); - } - rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); -} - -/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ -function f_outgoing_sns_config_1c1u(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_config_1c1u(idx=", idx, ")"); - var PDU_NS rx; - - if (mp_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[0].provider.ip.local_ip, - g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[0].provider.ip.local_ip, - g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); - } - rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); -} - -/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ -function f_outgoing_sns_config_1c1u_separate(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")"); - var PDU_NS rx; - if (mp_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig.nsvc[2].provider.ip.local_ip, - g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv6(g_nsconfig.nsvc[2].provider.ip.local_ip, - g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); - } - rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); -} - -function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit) -runs on RAW_NS_CT { - log("f_outgoing_sns_add(idx_add=", idx_add, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_add]; - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, v6)); - } -} - -function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_del(idx_del=", idx_del, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_del]; - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, omit, v6)); - } -} - -function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_chg]; - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, v6)); - } -} - - - - - /* PCU-originated SNS-SIZE: successful case */ testcase TC_sns_po_size_success() runs on RAW_Test_CT { f_init_ns_codec(mp_nsconfig); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:43:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 3 Feb 2021 15:43:26 +0000 Subject: Change in osmo-gsm-manuals[master]: diag-filter.conf: drop version from nwdiag / packetdiag commands In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 ) Change subject: diag-filter.conf: drop version from nwdiag / packetdiag commands ...................................................................... Abandoned Let's stick to the current version and simplify the diagrams causing build failures instead. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Icfe51966f8801e5f01e209c21c127d0ebd3478ba Gerrit-Change-Number: 22624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 15:43:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 3 Feb 2021 15:43:47 +0000 Subject: Change in docker-playground[master]: debian-stretch-jenkins: install nwdiag using pip3 In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22623 ) Change subject: debian-stretch-jenkins: install nwdiag using pip3 ...................................................................... Abandoned Let's stick to the current version and simplify the diagrams causing build failures instead. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5f7d7a343ff773b2c936cb7e650f166fed69671d Gerrit-Change-Number: 22623 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 16:29:34 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 3 Feb 2021 16:29:34 +0000 Subject: Change in osmo-gbproxy[master]: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/2/src/gb_proxy_peer.c File src/gb_proxy_peer.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/2/src/gb_proxy_peer.c at 215 PS2, Line 215: if ((cell->id.cid == cid) && (!memcmp(&cell->id.raid, raid, sizeof(*raid)))) { > be careful when memcomparing structures, I already had some issues using it with cgi_ps one (due to [?] Ok, thanks. I was a bit unsure about that. Will write/use a compare function -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 16:29:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/SCTPasp: Update to master (uses epoll instead of select) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22658 ) Change subject: deps/SCTPasp: Update to master (uses epoll instead of select) ...................................................................... deps/SCTPasp: Update to master (uses epoll instead of select) The old version of SCTPasp we use * had no IPv6 support * didn't support file descriptors > 1024 See also https://www.eclipse.org/forums/index.php/m/1837587/#msg_1837587 Change-Id: I446dfb2f885999e40478b9332162a2584b0b71a3 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/22658/1 diff --git a/deps/Makefile b/deps/Makefile index 0a5d86c..c80e688 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -121,7 +121,7 @@ titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f titan.TestPorts.PIPEasp_commit= R.7.D-3-g8b01154 -titan.TestPorts.SCTPasp_commit= R.11.A-2-g2faa9cf +titan.TestPorts.SCTPasp_commit= R.11.A-7-ga21b94f titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0 titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6 titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22658 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: I446dfb2f885999e40478b9332162a2584b0b71a3 Gerrit-Change-Number: 22658 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Don't wait indefinitely, but wait until all UE components terminate References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659 ) Change subject: fr: Don't wait indefinitely, but wait until all UE components terminate ...................................................................... fr: Don't wait indefinitely, but wait until all UE components terminate Change-Id: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e --- M fr/FR_Tests.ttcn 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/22659/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index f3652a3..973f262 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -85,6 +85,7 @@ timer g_Tguard; var LLC_Entities llc; } +type record of UE_CT ro_ue; type record UE_Pars { hexstring imsi, @@ -120,7 +121,7 @@ } function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 30.0) -runs on test_CT +runs on test_CT return UE_CT { var UE_CT ue_comp; var UE_Pars ue_pars := { @@ -133,10 +134,13 @@ connect(ue_comp:BSSGP_SIG[0], bvc_comp:BSSGP_SP_SIG); connect(ue_comp:BSSGP_PROC[0], bvc_comp:BSSGP_PROC); ue_comp.start(f_handler_init(fn, id, ue_pars)); + + return ue_comp; } testcase TC_foo() runs on test_CT { + var ro_ue ues := {}; for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { g_gb[i].cfg := { @@ -151,20 +155,26 @@ log("Initializing Gb interface ", i, ": NSEI=", g_gb[i].cfg.nsei); f_init_gb(g_gb[i], "gb", i); } + for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { for (var integer j := 0; j < mp_num_bvc; j := j+1) { var BSSGP_BVC_CT bvc_comp := f_bssgp_get_bvci_ct(g_gb[i].cfg.bvc[j].bvci, BSSGP_PROC[i]); for (var integer k := 0; k < mp_num_ue_in_bvc; k := k+1) { var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k); - f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); + var UE_CT ue; + ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); + ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ f_sleep(0.05); } } } - while (true) { - f_sleep(100.0); + + /* wait for all UE components to terminate */ + for (var integer i := 0; i < lengthof(ues); i := i + 1) { + ues[i].done; } + setverdict(pass); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659 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: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e Gerrit-Change-Number: 22659 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Implement per-UE guard timeout References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22660 ) Change subject: fr: Implement per-UE guard timeout ...................................................................... fr: Implement per-UE guard timeout Change-Id: Ie52b1923ca81f7717be446891df1bfdb67ed7ed7 --- M fr/FR_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/22660/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 973f262..5777856 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -89,15 +89,25 @@ type record UE_Pars { hexstring imsi, - OCT4 tlli + OCT4 tlli, + float tguard }; type function void_fn(charstring id) runs on UE_CT; +private altstep as_ue_tguard() runs on UE_CT { +[] g_Tguard.timeout { + setverdict(fail, "Tguard timeout after ", g_pars.tguard); + self.stop; + } +} + function f_handler_init(void_fn fn, charstring id, UE_Pars pars) runs on UE_CT { g_pars := pars; llc := f_llc_create(false); f_bssgp_client_register(g_pars.imsi, g_pars.tlli); + g_Tguard.start(g_pars.tguard); + activate(as_ue_tguard()); fn.apply(id); f_bssgp_client_unregister(g_pars.imsi); @@ -126,7 +136,8 @@ var UE_CT ue_comp; var UE_Pars ue_pars := { imsi := f_gen_imsi(imsi_suffix), - tlli := f_gprs_tlli_random() + tlli := f_gprs_tlli_random(), + tguard := t_guard }; ue_comp := UE_CT.create(id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22660 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: Ie52b1923ca81f7717be446891df1bfdb67ed7ed7 Gerrit-Change-Number: 22660 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Make TC_foo() actually terminate References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22661 ) Change subject: fr: Make TC_foo() actually terminate ...................................................................... fr: Make TC_foo() actually terminate Rather than running in an endless loop (useful for manual tets), terminate each UE_CT after sending 50 packets. Also adjust the ramping and timeouts in a way that it manages to terminate ahead of the guard timeout. Change-Id: I7f40f5c59d399d528072986d067b5014fbd085c4 --- M fr/FR_Tests.ttcn 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/22661/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 5777856..23c8e26 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -122,7 +122,7 @@ } log ("Entering main loop"); - while (true) { + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { var integer ran_index := 0; //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) @@ -130,7 +130,7 @@ } } -function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 30.0) +function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) runs on test_CT return UE_CT { var UE_CT ue_comp; @@ -176,7 +176,11 @@ ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ - f_sleep(0.05); + f_sleep(0.005); + /* FIXME: as the BSSGP emulation is already running, we must not + * take too long to start the UE components. If we do, the + * BVC_S_UNBLOCKED notification will arrive before the components + * all are running, meaning we never get that one :( */ } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22661 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: I7f40f5c59d399d528072986d067b5014fbd085c4 Gerrit-Change-Number: 22661 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22662 ) Change subject: fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK ...................................................................... fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK Change-Id: If62d54517ee9af828d6fa56d83073260ceced1e8 --- M fr/FR_Tests.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/22662/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 23c8e26..2bac1f8 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -115,19 +115,28 @@ function f_ul_ud(charstring id) runs on UE_CT { - log("Waiting for BVC-UNBLOCK"); + log(id, " Waiting for BVC-UNBLOCK"); + timer T := 15.0; + T.start; alt { [] BSSGP[0].receive(BssgpStatusIndication:{*,?,BVC_S_UNBLOCKED}) { } [] BSSGP[0].receive { repeat; } + [] T.timeout { + setverdict(fail, id, " Timeout waiting for BVC-UNBLOCK"); + self.stop; + } } - log ("Entering main loop"); + log (id, " Entering main loop"); for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { var integer ran_index := 0; //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) f_sleep(0.5); + /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ + /* at 100 UE that ends up about 870 kBps */ } + log (id, "Leaving main loop"); } function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22662 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: If62d54517ee9af828d6fa56d83073260ceced1e8 Gerrit-Change-Number: 22662 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulaiton: Support up tp 64 BVCs with 64 users each References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 ) Change subject: BSSGP_Emulaiton: Support up tp 64 BVCs with 64 users each ...................................................................... BSSGP_Emulaiton: Support up tp 64 BVCs with 64 users each Increase this from the previous limit of 16 BVC with 16 users each Change-Id: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/22663/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 7996f96..4af5f82 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -253,7 +253,7 @@ /* port to per-BVC components */ port BSSGP_BVC_SP_PT BVC; /* per-BVC state table */ - var BvcEntity BvcTable[16]; + var BvcEntity BvcTable[64]; }; /* one element in the per-BVC state table */ @@ -722,7 +722,7 @@ var BssgpCause g_last_block_cause; var BssgpCause g_last_reset_cause; - var ClientEntity ClientTable[16]; + var ClientEntity ClientTable[64]; }; /* port between global BSSGP_CT and per-BVC BSSGP_BVC_CT */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 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: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 Gerrit-Change-Number: 22663 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Generalize and document functions References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22664 ) Change subject: fr: Generalize and document functions ...................................................................... fr: Generalize and document functions This prepares a lot of the FR_Tests functionality to be re-used in more test cases. Change-Id: I95b759ad85d9d1cba1533122672e7ff5628bc014 --- M fr/FR_Tests.ttcn 1 file changed, 36 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/22664/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 2bac1f8..7ef5f1f 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -9,8 +9,11 @@ import from LLC_Templates all; modulepar { + /* number of BVCs to bring up in one Gb instance */ integer mp_num_bvc := 10; + /* number of UEs to start in each PTP BVC */ integer mp_num_ue_in_bvc := 10; + /* NS configurations; one per NSE; each with any number of NSVC */ NSConfigurations mp_nsconfig := { { nsei := 123, @@ -47,6 +50,7 @@ port BSSGP_CT_PROC_PT BSSGP_PROC[16]; }; +/* initialize one Gb interface */ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { var charstring id_idx := id & int2str(offset); gb.vc_NS := NS_CT.create(id_idx & "-NSemu"); @@ -57,7 +61,8 @@ gb.vc_BSSGP.start(BssgpStart(gb.cfg, testcasename())); } -function f_gen_bvc(integer base, integer idx) return BssgpBvcConfig { +/* generate a BVC dynamically, using distinct number ranges for BVCI, CID, LAC, ... */ +private function f_gen_bvc(integer base, integer idx) return BssgpBvcConfig { var BssgpBvcConfig bvc := { bvci := base + 100 + idx, cell_id := { @@ -102,6 +107,7 @@ } } +/* first function executed in UE_CT; creates LLC context, registers with BSSGP, starts Tguard */ function f_handler_init(void_fn fn, charstring id, UE_Pars pars) runs on UE_CT { g_pars := pars; llc := f_llc_create(false); @@ -109,12 +115,6 @@ g_Tguard.start(g_pars.tguard); activate(as_ue_tguard()); - fn.apply(id); - f_bssgp_client_unregister(g_pars.imsi); -} - -function f_ul_ud(charstring id) runs on UE_CT { - log(id, " Waiting for BVC-UNBLOCK"); timer T := 15.0; T.start; @@ -128,17 +128,12 @@ } log (id, " Entering main loop"); - for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { - var integer ran_index := 0; - //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); - BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) - f_sleep(0.5); - /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ - /* at 100 UE that ends up about 870 kBps */ - } + fn.apply(id); log (id, "Leaving main loop"); + f_bssgp_client_unregister(g_pars.imsi); } +/* start a single UE component; connect it to BSSGP */ function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) runs on test_CT return UE_CT { @@ -159,7 +154,9 @@ } -testcase TC_foo() runs on test_CT { +/* main test case body function; start Gb instances, start UE_CTs on top; wait for termination */ +private function f_tc_body(void_fn ue_fn, integer ue_per_bvc := mp_num_ue_in_bvc, + float delay_between_ue := 0.005, float ue_tguard := 40.0) runs on test_CT { var ro_ue ues := {}; for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { @@ -179,13 +176,14 @@ for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { for (var integer j := 0; j < mp_num_bvc; j := j+1) { var BSSGP_BVC_CT bvc_comp := f_bssgp_get_bvci_ct(g_gb[i].cfg.bvc[j].bvci, BSSGP_PROC[i]); - for (var integer k := 0; k < mp_num_ue_in_bvc; k := k+1) { + for (var integer k := 0; k < ue_per_bvc; k := k+1) { var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k); var UE_CT ue; - ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); + ue := f_start_ue(ue_fn, id, g_gb[i], i*10000+j*100+k, bvc_comp, +ue_tguard); ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ - f_sleep(0.005); + f_sleep(delay_between_ue); /* FIXME: as the BSSGP emulation is already running, we must not * take too long to start the UE components. If we do, the * BVC_S_UNBLOCKED notification will arrive before the components @@ -201,8 +199,26 @@ setverdict(pass); } +private function f_ul_ud(charstring id) runs on UE_CT +{ + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { + var integer ran_index := 0; + //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); + BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) + f_sleep(0.5); + /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ + /* at 100 UE that ends up about 870 kBps */ + } +} +/* Generate uplink-unitdata traffic */ +testcase TC_ul_ud() runs on test_CT +{ + f_tc_body(refers(f_ul_ud)); +} + + control { - execute( TC_foo() ); + execute( TC_ul_ud() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22664 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: I95b759ad85d9d1cba1533122672e7ff5628bc014 Gerrit-Change-Number: 22664 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:22:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:22:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: TC_bvc_bringup References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22665 ) Change subject: fr: TC_bvc_bringup ...................................................................... fr: TC_bvc_bringup Change-Id: I91d61e01158802496a1058748c51506f0472b24e --- M fr/FR_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/22665/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 7ef5f1f..5f58bc3 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -217,7 +217,19 @@ } +/* test bring-up of all BVCs */ +private function f_pass(charstring id) runs on UE_CT +{ + setverdict(pass); +} +testcase TC_bvc_bringup() runs on test_CT +{ + f_tc_body(refers(f_pass), ue_per_bvc := 1, ue_tguard := 20.0); +} + + control { + execute( TC_bvc_bringup() ); execute( TC_ul_ud() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22665 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: I91d61e01158802496a1058748c51506f0472b24e Gerrit-Change-Number: 22665 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:52:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:52:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fix broken tests by adding weight In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 ) Change subject: ns: fix broken tests by adding weight ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 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: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 Gerrit-Change-Number: 22650 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 17:52:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:52:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:52:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 17:52:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:52:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:52:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fix broken tests by adding weight In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 ) Change subject: ns: fix broken tests by adding weight ...................................................................... ns: fix broken tests by adding weight The NSConfiguration now requires signalling_weight and data_weight. Otherwise the tests will fail to an unbound integer. Change-Id: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 --- M ns/NS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn index ef8be2a..59ab765 100644 --- a/ns/NS_Tests.ttcn +++ b/ns/NS_Tests.ttcn @@ -38,7 +38,9 @@ local_udp_port := 21000, local_ip := "127.0.0.1", remote_udp_port := 23000, - remote_ip := "127.0.0.1" + remote_ip := "127.0.0.1", + data_weight := 2, + signalling_weight := 2 } }, nsvci := 97 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22650 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: I4484d48d945d5e6e1711f9bedf3248a24ecc4e76 Gerrit-Change-Number: 22650 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:52:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:52:56 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to latest release 1.4.2 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22649 ) Change subject: libosmocore: Update to latest release 1.4.2 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 Gerrit-Change-Number: 22649 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 17:52:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:52:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:52:58 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to latest release 1.4.2 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22649 ) Change subject: libosmocore: Update to latest release 1.4.2 ...................................................................... libosmocore: Update to latest release 1.4.2 This fix release only contains 1 commit fixing out of bounds accesses in tlv_parser. Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 1acf6ac..205da74 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "5681a3254c1727d4926ac6d36800fd63d87ad7a2" +SRCREV = "34b328b6d040d31017269f7558cf9354bdeea8dd" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.4.1+gitr${SRCPV}" +PV = "1.4.2+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I28c5551d8622414ff747d1c47ec0b6d9eb2d0e94 Gerrit-Change-Number: 22649 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:53:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:53:18 +0000 Subject: Change in libosmocore[master]: Enable systemd-journald log target in debian + rpm packaging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22651 ) Change subject: Enable systemd-journald log target in debian + rpm packaging ...................................................................... Enable systemd-journald log target in debian + rpm packaging Given that all the distributions we support are shipping systemd anyway, this will not really introduce any additional runtime package dependencies. Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 --- M contrib/libosmocore.spec.in M debian/control M debian/rules 3 files changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 728a0fb..93e5e16 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -31,6 +31,7 @@ BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(talloc) >= 2.0.1 BuildRequires: pkgconfig(libmnl) +BuildRequires: pkgconfig(libsystemd) %description libosmocore is a package with various utility functions that were @@ -305,7 +306,7 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static \ +%configure --enable-shared --disable-static --enable-systemd-logging \ --includedir="%_includedir/%name" make %{?_smp_mflags} V=1 diff --git a/debian/control b/debian/control index 24e729a..05069c5 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ libsctp-dev, libusb-1.0-0-dev, libmnl-dev, + libsystemd-dev, python3:native Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/libosmocore.git diff --git a/debian/rules b/debian/rules index afff17f..f5b71eb 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) override_dh_auto_configure: - dh_auto_configure -- --enable-static --disable-sctp-tests + dh_auto_configure -- --enable-static --disable-sctp-tests --enable-systemd-logging override_dh_clean: dh_clean -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib3af918cd4cc8d0ca6d228a0f2c8338534374d46 Gerrit-Change-Number: 22651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 17:56:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 17:56:03 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: Simplify raid data storage ...................................................................... Patch Set 2: I think this mixes two orthogonal topics: a) moving from a binary to a decoded ra_id b) reducing redundancy between the multiple places of storage "a" is uncontroversial to me. "b" is dangerous, as without detailed review I would not be sure if bvc->cell always exists in all situations where we want to read or write the ra_id. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 17:56:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:28:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:28:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Support up to 64 BVCs with 64 users each In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 to look at the new patch set (#2). Change subject: BSSGP_Emulation: Support up to 64 BVCs with 64 users each ...................................................................... BSSGP_Emulation: Support up to 64 BVCs with 64 users each Increase this from the previous limit of 16 BVC with 16 users each Change-Id: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/22663/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 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: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 Gerrit-Change-Number: 22663 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:28:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:28:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Use latest version of AF_PACKET References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22666 ) Change subject: deps: Use latest version of AF_PACKET ...................................................................... deps: Use latest version of AF_PACKET ... as this contains a fix to FrameRelay_Emulation to disable T392 if a service affecting condition is detected. Change-Id: I8b266577f738b7c12514eb8671e11d7a75be6034 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/22666/1 diff --git a/deps/Makefile b/deps/Makefile index c80e688..8d6c2b5 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-2-g90ef318 +titan.TestPorts.AF_PACKET_commit= 0.1-3-g3d61883 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22666 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: I8b266577f738b7c12514eb8671e11d7a75be6034 Gerrit-Change-Number: 22666 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:28:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:28:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22667 ) Change subject: NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN ...................................................................... NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN This happens e.g. if FrameRelay detects a "service affecting condition", i.e. the link is considered dead. Change-Id: I7409079f5e2b77cc08ccc93d1b0baa72720cefb8 --- M library/NS_Emulation.ttcnpp M library/NS_Provider_FR.ttcn 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/22667/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index dc8e0ec..ec3386f 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -612,6 +612,13 @@ var PDU_NS rf; var ASP_Event evt; + [] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_DOWN}) { + log("Provider Link went down"); + Tns_test.stop; + Tns_alive.stop; + f_change_state(NSVC_S_DEAD_BLOCKED); + } + [] NS_SP.receive(NsCtrlRequest:DisableReq) { /* To make NS-VCG remove us from list of active NS-VC */ f_change_state(NSVC_S_DEAD_BLOCKED); diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn index 1cb02dd..5138d82 100644 --- a/library/NS_Provider_FR.ttcn +++ b/library/NS_Provider_FR.ttcn @@ -62,6 +62,7 @@ } [] FR.receive(FRemu_Event:{link_status:=FR_LINK_STS_UNAVAILABLE}) -> value rx_frevt { link_available := false; + pvc_active := false; NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_DOWN}); } [] FR.receive(tr_FRemu_PvcStatusAct(config.provider.fr.dlci, true)) -> value rx_frevt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22667 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: I7409079f5e2b77cc08ccc93d1b0baa72720cefb8 Gerrit-Change-Number: 22667 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:30:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/SCTPasp: Update to master (uses epoll instead of select) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22658 ) Change subject: deps/SCTPasp: Update to master (uses epoll instead of select) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22658 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: I446dfb2f885999e40478b9332162a2584b0b71a3 Gerrit-Change-Number: 22658 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:30:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:31:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:31:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Use latest version of AF_PACKET In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22666 ) Change subject: deps: Use latest version of AF_PACKET ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22666 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: I8b266577f738b7c12514eb8671e11d7a75be6034 Gerrit-Change-Number: 22666 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:31:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:31:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22667 ) Change subject: NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22667 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: I7409079f5e2b77cc08ccc93d1b0baa72720cefb8 Gerrit-Change-Number: 22667 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:31:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:31:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:31:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Support up to 64 BVCs with 64 users each In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 ) Change subject: BSSGP_Emulation: Support up to 64 BVCs with 64 users each ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 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: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 Gerrit-Change-Number: 22663 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:31:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:31:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:31:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Don't wait indefinitely, but wait until all UE components terminate In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659 ) Change subject: fr: Don't wait indefinitely, but wait until all UE components terminate ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659 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: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e Gerrit-Change-Number: 22659 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:31:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:31:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:31:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Implement per-UE guard timeout In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22660 ) Change subject: fr: Implement per-UE guard timeout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22660 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: Ie52b1923ca81f7717be446891df1bfdb67ed7ed7 Gerrit-Change-Number: 22660 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:31:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:31:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:31:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Make TC_foo() actually terminate In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22661 ) Change subject: fr: Make TC_foo() actually terminate ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22661 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: I7f40f5c59d399d528072986d067b5014fbd085c4 Gerrit-Change-Number: 22661 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:31:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:32:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:32:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22662 ) Change subject: fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22662 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: If62d54517ee9af828d6fa56d83073260ceced1e8 Gerrit-Change-Number: 22662 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:32:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:32:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:32:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Generalize and document functions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22664 ) Change subject: fr: Generalize and document functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22664 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: I95b759ad85d9d1cba1533122672e7ff5628bc014 Gerrit-Change-Number: 22664 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:32:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:32:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 18:32:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: TC_bvc_bringup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22665 ) Change subject: fr: TC_bvc_bringup ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22665 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: I91d61e01158802496a1058748c51506f0472b24e Gerrit-Change-Number: 22665 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 18:32:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:53:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 18:53:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 18:53:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 18:54:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 3 Feb 2021 18:54:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657/1/library/RAW_NS.ttcnpp File library/RAW_NS.ttcnpp: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657/1/library/RAW_NS.ttcnpp at 269 PS1, Line 269: /********************************************************************************** This header doesn't apply here, it's not test cases. You copied it from other file. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 03 Feb 2021 18:54:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/SCTPasp: Update to master (uses epoll instead of select) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22658 ) Change subject: deps/SCTPasp: Update to master (uses epoll instead of select) ...................................................................... deps/SCTPasp: Update to master (uses epoll instead of select) The old version of SCTPasp we use * had no IPv6 support * didn't support file descriptors > 1024 See also https://www.eclipse.org/forums/index.php/m/1837587/#msg_1837587 Change-Id: I446dfb2f885999e40478b9332162a2584b0b71a3 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index 0a5d86c..c80e688 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -121,7 +121,7 @@ titan.TestPorts.MTP3asp_commit= 1cecdad6f3641a5f19b3833703bff6e5005eff11 titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f titan.TestPorts.PIPEasp_commit= R.7.D-3-g8b01154 -titan.TestPorts.SCTPasp_commit= R.11.A-2-g2faa9cf +titan.TestPorts.SCTPasp_commit= R.11.A-7-ga21b94f titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0 titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6 titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22658 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: I446dfb2f885999e40478b9332162a2584b0b71a3 Gerrit-Change-Number: 22658 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Use latest version of AF_PACKET In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22666 ) Change subject: deps: Use latest version of AF_PACKET ...................................................................... deps: Use latest version of AF_PACKET ... as this contains a fix to FrameRelay_Emulation to disable T392 if a service affecting condition is detected. Change-Id: I8b266577f738b7c12514eb8671e11d7a75be6034 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index c80e688..8d6c2b5 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-2-g90ef318 +titan.TestPorts.AF_PACKET_commit= 0.1-3-g3d61883 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22666 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: I8b266577f738b7c12514eb8671e11d7a75be6034 Gerrit-Change-Number: 22666 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22667 ) Change subject: NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN ...................................................................... NS_Emulation: Handle NS_PROV_LINK_STATUS_DOWN This happens e.g. if FrameRelay detects a "service affecting condition", i.e. the link is considered dead. Change-Id: I7409079f5e2b77cc08ccc93d1b0baa72720cefb8 --- M library/NS_Emulation.ttcnpp M library/NS_Provider_FR.ttcn 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index dc8e0ec..ec3386f 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -612,6 +612,13 @@ var PDU_NS rf; var ASP_Event evt; + [] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_DOWN}) { + log("Provider Link went down"); + Tns_test.stop; + Tns_alive.stop; + f_change_state(NSVC_S_DEAD_BLOCKED); + } + [] NS_SP.receive(NsCtrlRequest:DisableReq) { /* To make NS-VCG remove us from list of active NS-VC */ f_change_state(NSVC_S_DEAD_BLOCKED); diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn index 1cb02dd..5138d82 100644 --- a/library/NS_Provider_FR.ttcn +++ b/library/NS_Provider_FR.ttcn @@ -62,6 +62,7 @@ } [] FR.receive(FRemu_Event:{link_status:=FR_LINK_STS_UNAVAILABLE}) -> value rx_frevt { link_available := false; + pvc_active := false; NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_DOWN}); } [] FR.receive(tr_FRemu_PvcStatusAct(config.provider.fr.dlci, true)) -> value rx_frevt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22667 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: I7409079f5e2b77cc08ccc93d1b0baa72720cefb8 Gerrit-Change-Number: 22667 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Support up to 64 BVCs with 64 users each In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 ) Change subject: BSSGP_Emulation: Support up to 64 BVCs with 64 users each ...................................................................... BSSGP_Emulation: Support up to 64 BVCs with 64 users each Increase this from the previous limit of 16 BVC with 16 users each Change-Id: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 7996f96..4af5f82 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -253,7 +253,7 @@ /* port to per-BVC components */ port BSSGP_BVC_SP_PT BVC; /* per-BVC state table */ - var BvcEntity BvcTable[16]; + var BvcEntity BvcTable[64]; }; /* one element in the per-BVC state table */ @@ -722,7 +722,7 @@ var BssgpCause g_last_block_cause; var BssgpCause g_last_reset_cause; - var ClientEntity ClientTable[16]; + var ClientEntity ClientTable[64]; }; /* port between global BSSGP_CT and per-BVC BSSGP_BVC_CT */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22663 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: I8abca1c020d0ba4b89a6045e99d3a9eb7bcc4648 Gerrit-Change-Number: 22663 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Don't wait indefinitely, but wait until all UE components terminate In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659 ) Change subject: fr: Don't wait indefinitely, but wait until all UE components terminate ...................................................................... fr: Don't wait indefinitely, but wait until all UE components terminate Change-Id: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e --- M fr/FR_Tests.ttcn 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index f3652a3..973f262 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -85,6 +85,7 @@ timer g_Tguard; var LLC_Entities llc; } +type record of UE_CT ro_ue; type record UE_Pars { hexstring imsi, @@ -120,7 +121,7 @@ } function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 30.0) -runs on test_CT +runs on test_CT return UE_CT { var UE_CT ue_comp; var UE_Pars ue_pars := { @@ -133,10 +134,13 @@ connect(ue_comp:BSSGP_SIG[0], bvc_comp:BSSGP_SP_SIG); connect(ue_comp:BSSGP_PROC[0], bvc_comp:BSSGP_PROC); ue_comp.start(f_handler_init(fn, id, ue_pars)); + + return ue_comp; } testcase TC_foo() runs on test_CT { + var ro_ue ues := {}; for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { g_gb[i].cfg := { @@ -151,20 +155,26 @@ log("Initializing Gb interface ", i, ": NSEI=", g_gb[i].cfg.nsei); f_init_gb(g_gb[i], "gb", i); } + for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { for (var integer j := 0; j < mp_num_bvc; j := j+1) { var BSSGP_BVC_CT bvc_comp := f_bssgp_get_bvci_ct(g_gb[i].cfg.bvc[j].bvci, BSSGP_PROC[i]); for (var integer k := 0; k < mp_num_ue_in_bvc; k := k+1) { var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k); - f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); + var UE_CT ue; + ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); + ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ f_sleep(0.05); } } } - while (true) { - f_sleep(100.0); + + /* wait for all UE components to terminate */ + for (var integer i := 0; i < lengthof(ues); i := i + 1) { + ues[i].done; } + setverdict(pass); } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22659 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: Ifdf9c7fb625ccdb467b3b87f79431da18fea5f2e Gerrit-Change-Number: 22659 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Implement per-UE guard timeout In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22660 ) Change subject: fr: Implement per-UE guard timeout ...................................................................... fr: Implement per-UE guard timeout Change-Id: Ie52b1923ca81f7717be446891df1bfdb67ed7ed7 --- M fr/FR_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 973f262..5777856 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -89,15 +89,25 @@ type record UE_Pars { hexstring imsi, - OCT4 tlli + OCT4 tlli, + float tguard }; type function void_fn(charstring id) runs on UE_CT; +private altstep as_ue_tguard() runs on UE_CT { +[] g_Tguard.timeout { + setverdict(fail, "Tguard timeout after ", g_pars.tguard); + self.stop; + } +} + function f_handler_init(void_fn fn, charstring id, UE_Pars pars) runs on UE_CT { g_pars := pars; llc := f_llc_create(false); f_bssgp_client_register(g_pars.imsi, g_pars.tlli); + g_Tguard.start(g_pars.tguard); + activate(as_ue_tguard()); fn.apply(id); f_bssgp_client_unregister(g_pars.imsi); @@ -126,7 +136,8 @@ var UE_CT ue_comp; var UE_Pars ue_pars := { imsi := f_gen_imsi(imsi_suffix), - tlli := f_gprs_tlli_random() + tlli := f_gprs_tlli_random(), + tguard := t_guard }; ue_comp := UE_CT.create(id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22660 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: Ie52b1923ca81f7717be446891df1bfdb67ed7ed7 Gerrit-Change-Number: 22660 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Make TC_foo() actually terminate In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22661 ) Change subject: fr: Make TC_foo() actually terminate ...................................................................... fr: Make TC_foo() actually terminate Rather than running in an endless loop (useful for manual tets), terminate each UE_CT after sending 50 packets. Also adjust the ramping and timeouts in a way that it manages to terminate ahead of the guard timeout. Change-Id: I7f40f5c59d399d528072986d067b5014fbd085c4 --- M fr/FR_Tests.ttcn 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 5777856..23c8e26 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -122,7 +122,7 @@ } log ("Entering main loop"); - while (true) { + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { var integer ran_index := 0; //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) @@ -130,7 +130,7 @@ } } -function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 30.0) +function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) runs on test_CT return UE_CT { var UE_CT ue_comp; @@ -176,7 +176,11 @@ ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ - f_sleep(0.05); + f_sleep(0.005); + /* FIXME: as the BSSGP emulation is already running, we must not + * take too long to start the UE components. If we do, the + * BVC_S_UNBLOCKED notification will arrive before the components + * all are running, meaning we never get that one :( */ } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22661 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: I7f40f5c59d399d528072986d067b5014fbd085c4 Gerrit-Change-Number: 22661 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22662 ) Change subject: fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK ...................................................................... fr: Add component id in logs; add 15s timeout waiting for BVC-UNBLOCK Change-Id: If62d54517ee9af828d6fa56d83073260ceced1e8 --- M fr/FR_Tests.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 23c8e26..2bac1f8 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -115,19 +115,28 @@ function f_ul_ud(charstring id) runs on UE_CT { - log("Waiting for BVC-UNBLOCK"); + log(id, " Waiting for BVC-UNBLOCK"); + timer T := 15.0; + T.start; alt { [] BSSGP[0].receive(BssgpStatusIndication:{*,?,BVC_S_UNBLOCKED}) { } [] BSSGP[0].receive { repeat; } + [] T.timeout { + setverdict(fail, id, " Timeout waiting for BVC-UNBLOCK"); + self.stop; + } } - log ("Entering main loop"); + log (id, " Entering main loop"); for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { var integer ran_index := 0; //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) f_sleep(0.5); + /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ + /* at 100 UE that ends up about 870 kBps */ } + log (id, "Leaving main loop"); } function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22662 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: If62d54517ee9af828d6fa56d83073260ceced1e8 Gerrit-Change-Number: 22662 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Generalize and document functions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22664 ) Change subject: fr: Generalize and document functions ...................................................................... fr: Generalize and document functions This prepares a lot of the FR_Tests functionality to be re-used in more test cases. Change-Id: I95b759ad85d9d1cba1533122672e7ff5628bc014 --- M fr/FR_Tests.ttcn 1 file changed, 36 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 2bac1f8..7ef5f1f 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -9,8 +9,11 @@ import from LLC_Templates all; modulepar { + /* number of BVCs to bring up in one Gb instance */ integer mp_num_bvc := 10; + /* number of UEs to start in each PTP BVC */ integer mp_num_ue_in_bvc := 10; + /* NS configurations; one per NSE; each with any number of NSVC */ NSConfigurations mp_nsconfig := { { nsei := 123, @@ -47,6 +50,7 @@ port BSSGP_CT_PROC_PT BSSGP_PROC[16]; }; +/* initialize one Gb interface */ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { var charstring id_idx := id & int2str(offset); gb.vc_NS := NS_CT.create(id_idx & "-NSemu"); @@ -57,7 +61,8 @@ gb.vc_BSSGP.start(BssgpStart(gb.cfg, testcasename())); } -function f_gen_bvc(integer base, integer idx) return BssgpBvcConfig { +/* generate a BVC dynamically, using distinct number ranges for BVCI, CID, LAC, ... */ +private function f_gen_bvc(integer base, integer idx) return BssgpBvcConfig { var BssgpBvcConfig bvc := { bvci := base + 100 + idx, cell_id := { @@ -102,6 +107,7 @@ } } +/* first function executed in UE_CT; creates LLC context, registers with BSSGP, starts Tguard */ function f_handler_init(void_fn fn, charstring id, UE_Pars pars) runs on UE_CT { g_pars := pars; llc := f_llc_create(false); @@ -109,12 +115,6 @@ g_Tguard.start(g_pars.tguard); activate(as_ue_tguard()); - fn.apply(id); - f_bssgp_client_unregister(g_pars.imsi); -} - -function f_ul_ud(charstring id) runs on UE_CT { - log(id, " Waiting for BVC-UNBLOCK"); timer T := 15.0; T.start; @@ -128,17 +128,12 @@ } log (id, " Entering main loop"); - for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { - var integer ran_index := 0; - //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); - BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) - f_sleep(0.5); - /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ - /* at 100 UE that ends up about 870 kBps */ - } + fn.apply(id); log (id, "Leaving main loop"); + f_bssgp_client_unregister(g_pars.imsi); } +/* start a single UE component; connect it to BSSGP */ function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) runs on test_CT return UE_CT { @@ -159,7 +154,9 @@ } -testcase TC_foo() runs on test_CT { +/* main test case body function; start Gb instances, start UE_CTs on top; wait for termination */ +private function f_tc_body(void_fn ue_fn, integer ue_per_bvc := mp_num_ue_in_bvc, + float delay_between_ue := 0.005, float ue_tguard := 40.0) runs on test_CT { var ro_ue ues := {}; for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { @@ -179,13 +176,14 @@ for (var integer i := 0; i < lengthof(mp_nsconfig); i := i+1) { for (var integer j := 0; j < mp_num_bvc; j := j+1) { var BSSGP_BVC_CT bvc_comp := f_bssgp_get_bvci_ct(g_gb[i].cfg.bvc[j].bvci, BSSGP_PROC[i]); - for (var integer k := 0; k < mp_num_ue_in_bvc; k := k+1) { + for (var integer k := 0; k < ue_per_bvc; k := k+1) { var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k); var UE_CT ue; - ue := f_start_ue(refers(f_ul_ud), id, g_gb[i], i*10000+j*100+k, bvc_comp); + ue := f_start_ue(ue_fn, id, g_gb[i], i*10000+j*100+k, bvc_comp, +ue_tguard); ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ - f_sleep(0.005); + f_sleep(delay_between_ue); /* FIXME: as the BSSGP emulation is already running, we must not * take too long to start the UE components. If we do, the * BVC_S_UNBLOCKED notification will arrive before the components @@ -201,8 +199,26 @@ setverdict(pass); } +private function f_ul_ud(charstring id) runs on UE_CT +{ + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { + var integer ran_index := 0; + //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[ran_index], llc_enc)); + BSSGP[ran_index].send(ts_LLC_UI(f_rnd_octstring(512), '0000'B, '1'B, 0)) + f_sleep(0.5); + /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ + /* at 100 UE that ends up about 870 kBps */ + } +} +/* Generate uplink-unitdata traffic */ +testcase TC_ul_ud() runs on test_CT +{ + f_tc_body(refers(f_ul_ud)); +} + + control { - execute( TC_foo() ); + execute( TC_ul_ud() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22664 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: I95b759ad85d9d1cba1533122672e7ff5628bc014 Gerrit-Change-Number: 22664 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:00:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:00:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: TC_bvc_bringup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22665 ) Change subject: fr: TC_bvc_bringup ...................................................................... fr: TC_bvc_bringup Change-Id: I91d61e01158802496a1058748c51506f0472b24e --- M fr/FR_Tests.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 7ef5f1f..5f58bc3 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -217,7 +217,19 @@ } +/* test bring-up of all BVCs */ +private function f_pass(charstring id) runs on UE_CT +{ + setverdict(pass); +} +testcase TC_bvc_bringup() runs on test_CT +{ + f_tc_body(refers(f_pass), ue_per_bvc := 1, ue_tguard := 20.0); +} + + control { + execute( TC_bvc_bringup() ); execute( TC_ul_ud() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22665 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: I91d61e01158802496a1058748c51506f0472b24e Gerrit-Change-Number: 22665 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:21:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:21:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Makefile: add fr + fr-net References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22668 ) Change subject: Makefile: add fr + fr-net ...................................................................... Makefile: add fr + fr-net Change-Id: Ifc5ceca0fdaa697838de8c87e247a188e633a5cb --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/22668/1 diff --git a/Makefile b/Makefile index 481dfb9..2510e28 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS=bsc bsc-nat bts ccid gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ +SUBDIRS=bsc bsc-nat bts ccid fr fr-net gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ sccp selftest sgsn simtrace sip stp sysinfo smlc NPROC=$(shell nproc 2>/dev/null) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22668 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: Ifc5ceca0fdaa697838de8c87e247a188e633a5cb Gerrit-Change-Number: 22668 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:23:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:23:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Makefile: add fr + fr-net In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22668 ) Change subject: Makefile: add fr + fr-net ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22668 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: Ifc5ceca0fdaa697838de8c87e247a188e633a5cb Gerrit-Change-Number: 22668 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 19:23:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 19:23:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 19:23:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Makefile: add fr + fr-net In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22668 ) Change subject: Makefile: add fr + fr-net ...................................................................... Makefile: add fr + fr-net Change-Id: Ifc5ceca0fdaa697838de8c87e247a188e633a5cb --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile b/Makefile index 481dfb9..2510e28 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS=bsc bsc-nat bts ccid gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ +SUBDIRS=bsc bsc-nat bts ccid fr fr-net gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ sccp selftest sgsn simtrace sip stp sysinfo smlc NPROC=$(shell nproc 2>/dev/null) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22668 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: Ifc5ceca0fdaa697838de8c87e247a188e633a5cb Gerrit-Change-Number: 22668 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:14:01 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 21:14:01 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... gsm48: add compare function for struct gprs_ra_id Comparing struct gprs_ra_id using memcmp can be error prone, so lets add a compare function to compare two struct gprs_ra_id values reliably. Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Related: SYS#5103 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22669/1 diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index f772f4a..4f6c0dc 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -104,6 +104,7 @@ void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf); void gsm48_encode_ra(struct gsm48_ra_id *out, const struct gprs_ra_id *raid); int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid) OSMO_DEPRECATED("Use gsm48_encode_ra() instead"); +int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2); int gsm48_number_of_paging_subchannels(struct gsm48_control_channel_descr *chan_desc); diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index c497c74..97f031a 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1298,6 +1298,25 @@ return 6; } +/*! Compare a TS 04.08 Routing Area Identifier + * \param[in] raid1 first Routing Area ID to compare. + * \param[in] raid2 second Routing Area ID to compare. + * \returns 0 if raid1 and raid2 match, -1 otherwise. */ +int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2) +{ + if (raid1->mcc != raid2->mcc) + return -1; + if (raid1->mnc != raid2->mnc) + return -1; + if (raid1->mnc_3_digits != raid2->mnc_3_digits) + return -1; + if (raid1->lac != raid2->lac) + return -1; + if (raid1->rac != raid2->rac) + return -1; + return 0; +} + /*! Determine number of paging sub-channels * \param[in] chan_desc Control Channel Description * \returns number of paging sub-channels diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 584d761..426e281 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -326,6 +326,7 @@ gsm48_rr_msg_name; gsm48_cc_state_name; gsm48_construct_ra; +gsm48_compare_ra; gsm48_encode_ra; gsm48_hdr_gmm_cipherable; gsm48_decode_bcd_number; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:16:25 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 3 Feb 2021 21:16:25 +0000 Subject: Change in osmo-msc[master]: Add vty option to globally enable LCLS In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13421 ) Change subject: Add vty option to globally enable LCLS ...................................................................... Patch Set 15: > Patch Set 15: > > I've stumbled across this old patch. As far as I can see, it makes LCLS disable-able. The question is: Do we wnat that? @keith, do you remember the context of this patch? The context is possibly explained in https://osmocom.org/issues/2487 There were 3 patches in Max's original patchset. This one, the one I voted down, (I don't think we need it) and https://gerrit.osmocom.org/c/osmo-msc/+/13422/18 which is marked WIP but should not be, as I removed the MNCC version change that @neels rightly objected to in the latest patchset. The two proposed patches require further patchsets to become operable which depend on deciding how to encode the LCLS CGR (Global Call Reference) in SIP so that we transfer to/from the SIP connector. Part of these further patch sets (prepared but not yet submitted) bump the MNCC version in both MSC and SIP connector. In forwarding porting this and the other above mentioned patch, I have tried to deviate as little as possible from the original functional changes and intention of Max's patch. - see commit message "That's experimental patch to facilitate _TESTING_ ......" so that they can be merged and then expanded on. As I commented on gerrit 13422, I guess the other option is to abandon this and write a new patchset, but for the moment I decided to leave these and go ahead with the follow up patches that complete the functionality. > > If we merge it, I would rather say it is "permit lcls" than "enable lcls", as whether or not LCLS can be used depends on a lot of other conditions, not just this newly introduced flag. Renaming it works for me. As for whether we want the flag, I think that enable lcls 0 or disable or whatever would then not send the LCLS params on the A interface. Would we want that ever with a 3rd party BSC? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibb587e6ae47cff71f5bf2e2d22c1da86cd7e1762 Gerrit-Change-Number: 13421 Gerrit-PatchSet: 15 Gerrit-Owner: Max Gerrit-Assignee: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: Hoernchen Gerrit-Comment-Date: Wed, 03 Feb 2021 21:16:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:23:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 21:23:26 +0000 Subject: Change in docker-playground[master]: New ttcn3-fr-test container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22670 ) Change subject: New ttcn3-fr-test container ...................................................................... New ttcn3-fr-test container Change-Id: I32433871e25de46ef58b70af46400cbb4dc0dbc5 --- A ttcn3-fr-test/Dockerfile A ttcn3-fr-test/FRNET_Tests.cfg A ttcn3-fr-test/FR_Tests.cfg A ttcn3-fr-test/Makefile A ttcn3-fr-test/docker-entrypoint.sh A ttcn3-fr-test/jenkins.sh A ttcn3-fr-test/netdev-to-docker.sh A ttcn3-fr-test/pipework 8 files changed, 647 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/22670/1 diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile new file mode 100644 index 0000000..2363f18 --- /dev/null +++ b/ttcn3-fr-test/Dockerfile @@ -0,0 +1,34 @@ +ARG USER +FROM $USER/debian-stretch-titan + +RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUN cd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN cd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout $OSMO_TTCN3_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make fr fr-net + +VOLUME /data + +RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / + +COPY FR_Tests.cfg /data/FR_Tests.cfg +COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg +COPY pipework /usr/bin/pipework +COPY docker-entrypoint.sh /docker-entrypoint.sh + +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/ttcn3-fr-test/FRNET_Tests.cfg b/ttcn3-fr-test/FRNET_Tests.cfg new file mode 100644 index 0000000..cd208e6 --- /dev/null +++ b/ttcn3-fr-test/FRNET_Tests.cfg @@ -0,0 +1,16 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"/osmo-ttcn3-hacks/Common.cfg" +# testsuite specific configuration, not expected to change +"/osmo-ttcn3-hacks/fr-net/FRNET_Tests.default" + +[LOGGING] + +[MODULE_PARAMETERS] + +[TESTPORT_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +FRNET_Tests.control diff --git a/ttcn3-fr-test/FR_Tests.cfg b/ttcn3-fr-test/FR_Tests.cfg new file mode 100644 index 0000000..d2cff40 --- /dev/null +++ b/ttcn3-fr-test/FR_Tests.cfg @@ -0,0 +1,17 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"/osmo-ttcn3-hacks/Common.cfg" +# testsuite specific configuration, not expected to change +"/osmo-ttcn3-hacks/fr/FR_Tests.default" + +[LOGGING] +ConsoleMask := ERROR | WARNING | TESTCASE | USER + +[MODULE_PARAMETERS] + +[TESTPORT_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +FR_Tests.control diff --git a/ttcn3-fr-test/Makefile b/ttcn3-fr-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-fr-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-fr-test/docker-entrypoint.sh b/ttcn3-fr-test/docker-entrypoint.sh new file mode 100755 index 0000000..132c73c --- /dev/null +++ b/ttcn3-fr-test/docker-entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -eou pipefail + +SUBDIR=$1 +SUITE=$2 + +if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then + /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} +fi + +cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/$SUBDIR/$SUITE; \ +exit_code=$? + +/osmo-ttcn3-hacks/log_merge.sh $SUITE --rm + +exit $exit_code diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh new file mode 100755 index 0000000..faf8170 --- /dev/null +++ b/ttcn3-fr-test/jenkins.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "ttcn3-fr-test" + +SUBNET=26 +network_create $SUBNET + +mkdir $VOL_BASE_DIR/fr-tester +# if we don't change permissions, dumpcap fails to write (despite starting it as root!) +chmod a+w $VOL_BASE_DIR/fr-tester + +cp FR_Tests.cfg $VOL_BASE_DIR/fr-tester/ + +mkdir $VOL_BASE_DIR/frnet +cp FRNET_Tests.cfg $VOL_BASE_DIR/frnet/ + +# Disable features not in latest yet +if [ "$IMAGE_SUFFIX" = "latest" ]; then + true; +fi + +mkdir $VOL_BASE_DIR/unix + +echo Starting container with FRNET +docker run --rm \ + --cap-add=NET_RAW --cap-add=SYS_RAWIO \ + $(docker_network_params $SUBNET 10) \ + --ulimit core=-1 \ + -e "WAIT_FOR_NETDEV=hdlcnet8" \ + -v $VOL_BASE_DIR/frnet:/data \ + --name ${BUILD_TAG}-frnet -d \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-fr-test fr-net FRNET_Tests + +# move all hdlcnetX net-devices into container +for i in `seq 1 8`; do + DEV="hdlcnet$i" + #sudo sethdlc ${DEV} fr lmi none + sudo ./netdev-to-docker.sh ${DEV} ${BUILD_TAG}-frnet +done + +echo Starting container with FR testsuite +docker run --rm \ + --cap-add=NET_RAW --cap-add=SYS_RAWIO \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -e "WAIT_FOR_NETDEV=hdlc8" \ + -v $VOL_BASE_DIR/fr-tester:/data \ + --name ${BUILD_TAG}-ttcn3-fr-test -d \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-fr-test fr FR_Tests + +# move all hdlcnetX net-devices into container +for i in `seq 1 8`; do + DEV="hdlc$i" + #sudo sethdlc ${DEV} fr lmi none + sudo ./netdev-to-docker.sh ${DEV} ${BUILD_TAG}-ttcn3-fr-test +done + +# emulate running container in foreground, which is no longer possible as we +# must shift the net-devices into the container _after_ it is started +docker logs -f ${BUILD_TAG}-ttcn3-fr-test + + +echo Stopping containers +docker container kill ${BUILD_TAG}-frnet + +network_remove +collect_logs diff --git a/ttcn3-fr-test/netdev-to-docker.sh b/ttcn3-fr-test/netdev-to-docker.sh new file mode 120000 index 0000000..3ae2cf8 --- /dev/null +++ b/ttcn3-fr-test/netdev-to-docker.sh @@ -0,0 +1 @@ +../ttcn3-gbproxy-test-fr/netdev-to-docker.sh \ No newline at end of file diff --git a/ttcn3-fr-test/pipework b/ttcn3-fr-test/pipework new file mode 100755 index 0000000..97ce66b --- /dev/null +++ b/ttcn3-fr-test/pipework @@ -0,0 +1,489 @@ +#!/bin/sh +# This code should (try to) follow Google's Shell Style Guide +# (https://google.github.io/styleguide/shell.xml) +set -e + +case "$1" in + --wait) + WAIT=1 + ;; + --direct-phys) + DIRECT_PHYS=1 + shift + ;; +esac + +IFNAME=$1 + +# default value set further down if not set here +CONTAINER_IFNAME= +if [ "$2" = "-i" ]; then + CONTAINER_IFNAME=$3 + shift 2 +fi + +if [ "$2" = "-l" ]; then + LOCAL_IFNAME=$3 + shift 2 +fi + +#inet or inet6 +FAMILY_FLAG="-4" +if [ "$2" = "-a" ]; then + FAMILY_FLAG="-$3" + shift 2 +fi + +GUESTNAME=$2 +IPADDR=$3 +MACADDR=$4 + +case "$MACADDR" in + *@*) + VLAN="${MACADDR#*@}" + VLAN="${VLAN%%@*}" + MACADDR="${MACADDR%%@*}" + ;; + *) + VLAN= + ;; +esac + +# did they ask to generate a custom MACADDR? +# generate the unique string +case "$MACADDR" in + U:*) + macunique="${MACADDR#*:}" + # now generate a 48-bit hash string from $macunique + MACADDR=$(echo $macunique|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/') + ;; +esac + + +[ "$IPADDR" ] || [ "$WAIT" ] || { + echo "Syntax:" + echo "pipework [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" + echo "pipework [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" + echo "pipework mac: [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" + echo "pipework mac: [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" + echo "pipework route " + echo "pipework rule " + echo "pipework tc " + echo "pipework --wait [-i containerinterface]" + exit 1 +} + +# Succeed if the given utility is installed. Fail otherwise. +# For explanations about `which` vs `type` vs `command`, see: +# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212 +# (Thanks to @chenhanxiao for pointing this out!) +installed () { + command -v "$1" >/dev/null 2>&1 +} + +# Google Styleguide says error messages should go to standard error. +warn () { + echo "$@" >&2 +} +die () { + status="$1" + shift + warn "$@" + exit "$status" +} + +if echo $IFNAME | grep -q '^mac:'; then + mac_address=$(echo $IFNAME | cut -c5-) + ifmatch= + for iftest in /sys/class/net/*; do + if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then + ifmatch="$(basename $iftest)" + break + fi + done + + if [ -z "$ifmatch" ]; then + die 1 "Mac address $mac_address specified for interface but no host interface matched." + else + IFNAME=$ifmatch + fi +fi + +# First step: determine type of first argument (bridge, physical interface...), +# Unless "--wait" is set (then skip the whole section) +if [ -z "$WAIT" ]; then + if [ -d "/sys/class/net/$IFNAME" ] + then + if [ -d "/sys/class/net/$IFNAME/bridge" ]; then + IFTYPE=bridge + BRTYPE=linux + elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then + IFTYPE=bridge + BRTYPE=openvswitch + elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 + IFTYPE=ipoib + # The IPoIB kernel module is fussy, set device name to ib0 if not overridden + CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} + PKEY=$VLAN + else IFTYPE=phys + fi + else + case "$IFNAME" in + br*) + IFTYPE=bridge + BRTYPE=linux + ;; + ovs*) + if ! installed ovs-vsctl; then + die 1 "Need OVS installed on the system to create an ovs bridge" + fi + IFTYPE=bridge + BRTYPE=openvswitch + ;; + route*) + IFTYPE=route + ;; + rule*) + IFTYPE=rule + ;; + tc*) + IFTYPE=tc + ;; + dummy*) + IFTYPE=dummy + ;; + *) die 1 "I do not know how to setup interface $IFNAME." ;; + esac + fi +fi + +# Set the default container interface name to eth1 if not already set +CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} + +[ "$WAIT" ] && { + while true; do + # This first method works even without `ip` or `ifconfig` installed, + # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. + grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break + # This method hopefully works on those older kernels. + ip link ls dev "$CONTAINER_IFNAME" && break + sleep 1 + done > /dev/null 2>&1 + exit 0 +} + +[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { + die 1 "VLAN configuration currently unsupported for Linux bridge." +} + +[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { + die 1 "MACADDR configuration unsupported for IPoIB interfaces." +} + +# Second step: find the guest (for now, we only support LXC containers) +while read _ mnt fstype options _; do + [ "$fstype" != "cgroup" ] && continue + echo "$options" | grep -qw devices || continue + CGROUPMNT=$mnt +done < /proc/mounts + +[ "$CGROUPMNT" ] || { + die 1 "Could not locate cgroup mount point." +} + +# Try to find a cgroup matching exactly the provided name. +M=$(find "$CGROUPMNT" -name "$GUESTNAME") +N=$(echo "$M" | wc -l) +if [ -z "$M" ] ; then + N=0 +fi +case "$N" in + 0) + # If we didn't find anything, try to lookup the container with Docker. + if installed docker; then + RETRIES=3 + while [ "$RETRIES" -gt 0 ]; do + DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") + DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") + DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") + + [ "$DOCKERPID" != 0 ] && break + sleep 1 + RETRIES=$((RETRIES - 1)) + done + + [ "$DOCKERPID" = 0 ] && { + die 1 "Docker inspect returned invalid PID 0" + } + + [ "$DOCKERPID" = "" ] && { + die 1 "Container $GUESTNAME not found, and unknown to Docker." + } + else + die 1 "Container $GUESTNAME not found, and Docker not installed." + fi + ;; + 1) true ;; + 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. + echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." + ;; + *) die 1 "Found more than one container matching $GUESTNAME." ;; +esac + +# only check IPADDR if we are not in a route mode +[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { + case "$IPADDR" in + # Let's check first if the user asked for DHCP allocation. + dhcp|dhcp:*) + # Use Docker-specific strategy to run the DHCP client + # from the busybox image, in the network namespace of + # the container. + if ! [ "$DOCKERPID" ]; then + warn "You asked for a Docker-specific DHCP method." + warn "However, $GUESTNAME doesn't seem to be a Docker container." + warn "Try to replace 'dhcp' with another option?" + die 1 "Aborting." + fi + DHCP_CLIENT=${IPADDR%%:*} + ;; + udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) + DHCP_CLIENT=${IPADDR%%:*} + # did they ask for the client to remain? + DHCP_FOREGROUND= + [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { + DHCP_FOREGROUND=true + } + DHCP_CLIENT=${DHCP_CLIENT%-f} + if ! installed "$DHCP_CLIENT"; then + die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." + fi + ;; + # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. + */*@*) + GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" + IPADDR="${IPADDR%%@*}" + ;; + # No gateway? We need at least a subnet, anyway! + */*) : ;; + # ... No? Then stop right here. + *) + warn "The IP address should include a netmask." + die 1 "Maybe you meant $IPADDR/24 ?" + ;; + esac +} + +# If a DHCP method was specified, extract the DHCP options. +if [ "$DHCP_CLIENT" ]; then + case "$IPADDR" in + *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; + esac +fi + +if [ "$DOCKERPID" ]; then + NSPID=$DOCKERPID +else + NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") + [ "$NSPID" ] || { + # it is an alternative way to get the pid + NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') + [ "$NSPID" ] || { + die 1 "Could not find a process inside container $GUESTNAME." + } + } +fi + +# Check if an incompatible VLAN device already exists +[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { + ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { + die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" + } +} + +[ ! -d /var/run/netns ] && mkdir -p /var/run/netns +rm -f "/var/run/netns/$NSPID" +ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" + +# Check if we need to create a bridge. +[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { + [ "$BRTYPE" = linux ] && { + (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") + ip link set "$IFNAME" up + } + [ "$BRTYPE" = openvswitch ] && { + ovs-vsctl add-br "$IFNAME" + } +} + +[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') + +# If it's a bridge, we need to create a veth pair +[ "$IFTYPE" = bridge ] && { + if [ -z "$LOCAL_IFNAME" ]; then + LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" + fi + GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" + # Does the link already exist? + if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then + # link exists, is it in use? + if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then + echo "Link $LOCAL_IFNAME exists and is up" + exit 1 + fi + # delete the link so we can re-add it afterwards + ip link del "$LOCAL_IFNAME" + fi + ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" + case "$BRTYPE" in + linux) + (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") + ;; + openvswitch) + if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then + ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ + -- set Interface "$LOCAL_IFNAME" \ + external-ids:pipework.interface="$LOCAL_IFNAME" \ + external-ids:pipework.bridge="$IFNAME" \ + ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ + ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ + ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ + ${VLAN:+external-ids:pipework.vlan="$VLAN"} + fi + ;; + esac + ip link set "$LOCAL_IFNAME" up +} + +# If it's a physical interface, create a macvlan subinterface +[ "$IFTYPE" = phys ] && { + [ "$VLAN" ] && { + [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { + ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" + } + ip link set "$IFNAME" up + IFNAME=$IFNAME.$VLAN + } + + if [ ! -z "$DIRECT_PHYS" ]; then + GUEST_IFNAME=$IFNAME + else + GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME + ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge + fi + + ip link set "$IFNAME" up +} + +# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB +# equivalent of a macvlan device) +# +# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an +# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of +# InfiniBand, without an intermediate Ethernet layer. +[ "$IFTYPE" = ipoib ] && { + GUEST_IFNAME="${IFNAME}.${NSPID}" + + # If a partition key is provided, use it + [ "$PKEY" ] && { + GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" + PKEY="pkey 0x$PKEY" + } + + ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY + ip link set "$IFNAME" up +} + +# If its a dummy interface, create a dummy interface. +[ "$IFTYPE" = dummy ] && { + GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME + ip link add dev "$GUEST_IFNAME" type dummy +} + +# If the `route` command was specified ... +if [ "$IFTYPE" = route ]; then + # ... discard the first two arguments and pass the rest to the route command. + shift 2 + ip netns exec "$NSPID" ip route "$@" +elif [ "$IFTYPE" = rule ] ; then + shift 2 + ip netns exec "$NSPID" ip rule "$@" +elif [ "$IFTYPE" = tc ] ; then + shift 2 + ip netns exec "$NSPID" tc "$@" +else + # Otherwise, run normally. + ip link set "$GUEST_IFNAME" netns "$NSPID" + ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" + [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" + + # When using any of the DHCP methods, we start a DHCP client in the + # network namespace of the container. With the 'dhcp' method, the + # client used is taken from the Docker busybox image (therefore + # requiring no specific client installed on the host). Other methods + # use a locally installed client. + case "$DHCP_CLIENT" in + dhcp) + docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ + busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ + $DHCP_OPTIONS \ + >/dev/null + ;; + udhcpc) + DHCP_Q="-q" + [ "$DHCP_FOREGROUND" ] && { + DHCP_OPTIONS="$DHCP_OPTIONS -f" + } + ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ + -x "hostname:$GUESTNAME" \ + -p "/var/run/udhcpc.$GUESTNAME.pid" \ + $DHCP_OPTIONS + [ ! "$DHCP_FOREGROUND" ] && { + rm "/var/run/udhcpc.$GUESTNAME.pid" + } + ;; + dhclient) + ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ + -pf "/var/run/dhclient.$GUESTNAME.pid" \ + -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ + $DHCP_OPTIONS + # kill dhclient after get ip address to prevent device be used after container close + [ ! "$DHCP_FOREGROUND" ] && { + kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" + rm "/var/run/dhclient.$GUESTNAME.pid" + } + ;; + dhcpcd) + ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" + ;; + "") + if installed ipcalc; then + eval $(ipcalc -b $IPADDR) + ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" + else + ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" + fi + + [ "$GATEWAY" ] && { + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true + } + ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up + [ "$GATEWAY" ] && { + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" + } + ;; + esac + + # Give our ARP neighbors a nudge about the new interface + if installed arping; then + IPADDR=$(echo "$IPADDR" | cut -d/ -f1) + ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true + else + echo "Warning: arping not found; interface may not be immediately reachable" + fi +fi +# Remove NSPID to avoid `ip netns` catch it. +rm -f "/var/run/netns/$NSPID" + +# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I32433871e25de46ef58b70af46400cbb4dc0dbc5 Gerrit-Change-Number: 22670 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:23:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 21:23:40 +0000 Subject: Change in docker-playground[master]: New ttcn3-fr-test container In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22670 ) Change subject: New ttcn3-fr-test container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I32433871e25de46ef58b70af46400cbb4dc0dbc5 Gerrit-Change-Number: 22670 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 21:23:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:23:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 3 Feb 2021 21:23:48 +0000 Subject: Change in docker-playground[master]: New ttcn3-fr-test container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22670 ) Change subject: New ttcn3-fr-test container ...................................................................... New ttcn3-fr-test container Change-Id: I32433871e25de46ef58b70af46400cbb4dc0dbc5 --- A ttcn3-fr-test/Dockerfile A ttcn3-fr-test/FRNET_Tests.cfg A ttcn3-fr-test/FR_Tests.cfg A ttcn3-fr-test/Makefile A ttcn3-fr-test/docker-entrypoint.sh A ttcn3-fr-test/jenkins.sh A ttcn3-fr-test/netdev-to-docker.sh A ttcn3-fr-test/pipework 8 files changed, 647 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile new file mode 100644 index 0000000..2363f18 --- /dev/null +++ b/ttcn3-fr-test/Dockerfile @@ -0,0 +1,34 @@ +ARG USER +FROM $USER/debian-stretch-titan + +RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUN cd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN cd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout $OSMO_TTCN3_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make fr fr-net + +VOLUME /data + +RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / + +COPY FR_Tests.cfg /data/FR_Tests.cfg +COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg +COPY pipework /usr/bin/pipework +COPY docker-entrypoint.sh /docker-entrypoint.sh + +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/ttcn3-fr-test/FRNET_Tests.cfg b/ttcn3-fr-test/FRNET_Tests.cfg new file mode 100644 index 0000000..cd208e6 --- /dev/null +++ b/ttcn3-fr-test/FRNET_Tests.cfg @@ -0,0 +1,16 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"/osmo-ttcn3-hacks/Common.cfg" +# testsuite specific configuration, not expected to change +"/osmo-ttcn3-hacks/fr-net/FRNET_Tests.default" + +[LOGGING] + +[MODULE_PARAMETERS] + +[TESTPORT_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +FRNET_Tests.control diff --git a/ttcn3-fr-test/FR_Tests.cfg b/ttcn3-fr-test/FR_Tests.cfg new file mode 100644 index 0000000..d2cff40 --- /dev/null +++ b/ttcn3-fr-test/FR_Tests.cfg @@ -0,0 +1,17 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"/osmo-ttcn3-hacks/Common.cfg" +# testsuite specific configuration, not expected to change +"/osmo-ttcn3-hacks/fr/FR_Tests.default" + +[LOGGING] +ConsoleMask := ERROR | WARNING | TESTCASE | USER + +[MODULE_PARAMETERS] + +[TESTPORT_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +FR_Tests.control diff --git a/ttcn3-fr-test/Makefile b/ttcn3-fr-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-fr-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-fr-test/docker-entrypoint.sh b/ttcn3-fr-test/docker-entrypoint.sh new file mode 100755 index 0000000..132c73c --- /dev/null +++ b/ttcn3-fr-test/docker-entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -eou pipefail + +SUBDIR=$1 +SUITE=$2 + +if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then + /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} +fi + +cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/$SUBDIR/$SUITE; \ +exit_code=$? + +/osmo-ttcn3-hacks/log_merge.sh $SUITE --rm + +exit $exit_code diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh new file mode 100755 index 0000000..faf8170 --- /dev/null +++ b/ttcn3-fr-test/jenkins.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "ttcn3-fr-test" + +SUBNET=26 +network_create $SUBNET + +mkdir $VOL_BASE_DIR/fr-tester +# if we don't change permissions, dumpcap fails to write (despite starting it as root!) +chmod a+w $VOL_BASE_DIR/fr-tester + +cp FR_Tests.cfg $VOL_BASE_DIR/fr-tester/ + +mkdir $VOL_BASE_DIR/frnet +cp FRNET_Tests.cfg $VOL_BASE_DIR/frnet/ + +# Disable features not in latest yet +if [ "$IMAGE_SUFFIX" = "latest" ]; then + true; +fi + +mkdir $VOL_BASE_DIR/unix + +echo Starting container with FRNET +docker run --rm \ + --cap-add=NET_RAW --cap-add=SYS_RAWIO \ + $(docker_network_params $SUBNET 10) \ + --ulimit core=-1 \ + -e "WAIT_FOR_NETDEV=hdlcnet8" \ + -v $VOL_BASE_DIR/frnet:/data \ + --name ${BUILD_TAG}-frnet -d \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-fr-test fr-net FRNET_Tests + +# move all hdlcnetX net-devices into container +for i in `seq 1 8`; do + DEV="hdlcnet$i" + #sudo sethdlc ${DEV} fr lmi none + sudo ./netdev-to-docker.sh ${DEV} ${BUILD_TAG}-frnet +done + +echo Starting container with FR testsuite +docker run --rm \ + --cap-add=NET_RAW --cap-add=SYS_RAWIO \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -e "WAIT_FOR_NETDEV=hdlc8" \ + -v $VOL_BASE_DIR/fr-tester:/data \ + --name ${BUILD_TAG}-ttcn3-fr-test -d \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-fr-test fr FR_Tests + +# move all hdlcnetX net-devices into container +for i in `seq 1 8`; do + DEV="hdlc$i" + #sudo sethdlc ${DEV} fr lmi none + sudo ./netdev-to-docker.sh ${DEV} ${BUILD_TAG}-ttcn3-fr-test +done + +# emulate running container in foreground, which is no longer possible as we +# must shift the net-devices into the container _after_ it is started +docker logs -f ${BUILD_TAG}-ttcn3-fr-test + + +echo Stopping containers +docker container kill ${BUILD_TAG}-frnet + +network_remove +collect_logs diff --git a/ttcn3-fr-test/netdev-to-docker.sh b/ttcn3-fr-test/netdev-to-docker.sh new file mode 120000 index 0000000..3ae2cf8 --- /dev/null +++ b/ttcn3-fr-test/netdev-to-docker.sh @@ -0,0 +1 @@ +../ttcn3-gbproxy-test-fr/netdev-to-docker.sh \ No newline at end of file diff --git a/ttcn3-fr-test/pipework b/ttcn3-fr-test/pipework new file mode 100755 index 0000000..97ce66b --- /dev/null +++ b/ttcn3-fr-test/pipework @@ -0,0 +1,489 @@ +#!/bin/sh +# This code should (try to) follow Google's Shell Style Guide +# (https://google.github.io/styleguide/shell.xml) +set -e + +case "$1" in + --wait) + WAIT=1 + ;; + --direct-phys) + DIRECT_PHYS=1 + shift + ;; +esac + +IFNAME=$1 + +# default value set further down if not set here +CONTAINER_IFNAME= +if [ "$2" = "-i" ]; then + CONTAINER_IFNAME=$3 + shift 2 +fi + +if [ "$2" = "-l" ]; then + LOCAL_IFNAME=$3 + shift 2 +fi + +#inet or inet6 +FAMILY_FLAG="-4" +if [ "$2" = "-a" ]; then + FAMILY_FLAG="-$3" + shift 2 +fi + +GUESTNAME=$2 +IPADDR=$3 +MACADDR=$4 + +case "$MACADDR" in + *@*) + VLAN="${MACADDR#*@}" + VLAN="${VLAN%%@*}" + MACADDR="${MACADDR%%@*}" + ;; + *) + VLAN= + ;; +esac + +# did they ask to generate a custom MACADDR? +# generate the unique string +case "$MACADDR" in + U:*) + macunique="${MACADDR#*:}" + # now generate a 48-bit hash string from $macunique + MACADDR=$(echo $macunique|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/') + ;; +esac + + +[ "$IPADDR" ] || [ "$WAIT" ] || { + echo "Syntax:" + echo "pipework [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" + echo "pipework [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" + echo "pipework mac: [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" + echo "pipework mac: [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" + echo "pipework route " + echo "pipework rule " + echo "pipework tc " + echo "pipework --wait [-i containerinterface]" + exit 1 +} + +# Succeed if the given utility is installed. Fail otherwise. +# For explanations about `which` vs `type` vs `command`, see: +# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212 +# (Thanks to @chenhanxiao for pointing this out!) +installed () { + command -v "$1" >/dev/null 2>&1 +} + +# Google Styleguide says error messages should go to standard error. +warn () { + echo "$@" >&2 +} +die () { + status="$1" + shift + warn "$@" + exit "$status" +} + +if echo $IFNAME | grep -q '^mac:'; then + mac_address=$(echo $IFNAME | cut -c5-) + ifmatch= + for iftest in /sys/class/net/*; do + if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then + ifmatch="$(basename $iftest)" + break + fi + done + + if [ -z "$ifmatch" ]; then + die 1 "Mac address $mac_address specified for interface but no host interface matched." + else + IFNAME=$ifmatch + fi +fi + +# First step: determine type of first argument (bridge, physical interface...), +# Unless "--wait" is set (then skip the whole section) +if [ -z "$WAIT" ]; then + if [ -d "/sys/class/net/$IFNAME" ] + then + if [ -d "/sys/class/net/$IFNAME/bridge" ]; then + IFTYPE=bridge + BRTYPE=linux + elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then + IFTYPE=bridge + BRTYPE=openvswitch + elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 + IFTYPE=ipoib + # The IPoIB kernel module is fussy, set device name to ib0 if not overridden + CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} + PKEY=$VLAN + else IFTYPE=phys + fi + else + case "$IFNAME" in + br*) + IFTYPE=bridge + BRTYPE=linux + ;; + ovs*) + if ! installed ovs-vsctl; then + die 1 "Need OVS installed on the system to create an ovs bridge" + fi + IFTYPE=bridge + BRTYPE=openvswitch + ;; + route*) + IFTYPE=route + ;; + rule*) + IFTYPE=rule + ;; + tc*) + IFTYPE=tc + ;; + dummy*) + IFTYPE=dummy + ;; + *) die 1 "I do not know how to setup interface $IFNAME." ;; + esac + fi +fi + +# Set the default container interface name to eth1 if not already set +CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} + +[ "$WAIT" ] && { + while true; do + # This first method works even without `ip` or `ifconfig` installed, + # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. + grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break + # This method hopefully works on those older kernels. + ip link ls dev "$CONTAINER_IFNAME" && break + sleep 1 + done > /dev/null 2>&1 + exit 0 +} + +[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { + die 1 "VLAN configuration currently unsupported for Linux bridge." +} + +[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { + die 1 "MACADDR configuration unsupported for IPoIB interfaces." +} + +# Second step: find the guest (for now, we only support LXC containers) +while read _ mnt fstype options _; do + [ "$fstype" != "cgroup" ] && continue + echo "$options" | grep -qw devices || continue + CGROUPMNT=$mnt +done < /proc/mounts + +[ "$CGROUPMNT" ] || { + die 1 "Could not locate cgroup mount point." +} + +# Try to find a cgroup matching exactly the provided name. +M=$(find "$CGROUPMNT" -name "$GUESTNAME") +N=$(echo "$M" | wc -l) +if [ -z "$M" ] ; then + N=0 +fi +case "$N" in + 0) + # If we didn't find anything, try to lookup the container with Docker. + if installed docker; then + RETRIES=3 + while [ "$RETRIES" -gt 0 ]; do + DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") + DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") + DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") + + [ "$DOCKERPID" != 0 ] && break + sleep 1 + RETRIES=$((RETRIES - 1)) + done + + [ "$DOCKERPID" = 0 ] && { + die 1 "Docker inspect returned invalid PID 0" + } + + [ "$DOCKERPID" = "" ] && { + die 1 "Container $GUESTNAME not found, and unknown to Docker." + } + else + die 1 "Container $GUESTNAME not found, and Docker not installed." + fi + ;; + 1) true ;; + 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. + echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." + ;; + *) die 1 "Found more than one container matching $GUESTNAME." ;; +esac + +# only check IPADDR if we are not in a route mode +[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { + case "$IPADDR" in + # Let's check first if the user asked for DHCP allocation. + dhcp|dhcp:*) + # Use Docker-specific strategy to run the DHCP client + # from the busybox image, in the network namespace of + # the container. + if ! [ "$DOCKERPID" ]; then + warn "You asked for a Docker-specific DHCP method." + warn "However, $GUESTNAME doesn't seem to be a Docker container." + warn "Try to replace 'dhcp' with another option?" + die 1 "Aborting." + fi + DHCP_CLIENT=${IPADDR%%:*} + ;; + udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) + DHCP_CLIENT=${IPADDR%%:*} + # did they ask for the client to remain? + DHCP_FOREGROUND= + [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { + DHCP_FOREGROUND=true + } + DHCP_CLIENT=${DHCP_CLIENT%-f} + if ! installed "$DHCP_CLIENT"; then + die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." + fi + ;; + # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. + */*@*) + GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" + IPADDR="${IPADDR%%@*}" + ;; + # No gateway? We need at least a subnet, anyway! + */*) : ;; + # ... No? Then stop right here. + *) + warn "The IP address should include a netmask." + die 1 "Maybe you meant $IPADDR/24 ?" + ;; + esac +} + +# If a DHCP method was specified, extract the DHCP options. +if [ "$DHCP_CLIENT" ]; then + case "$IPADDR" in + *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; + esac +fi + +if [ "$DOCKERPID" ]; then + NSPID=$DOCKERPID +else + NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") + [ "$NSPID" ] || { + # it is an alternative way to get the pid + NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') + [ "$NSPID" ] || { + die 1 "Could not find a process inside container $GUESTNAME." + } + } +fi + +# Check if an incompatible VLAN device already exists +[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { + ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { + die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" + } +} + +[ ! -d /var/run/netns ] && mkdir -p /var/run/netns +rm -f "/var/run/netns/$NSPID" +ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" + +# Check if we need to create a bridge. +[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { + [ "$BRTYPE" = linux ] && { + (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") + ip link set "$IFNAME" up + } + [ "$BRTYPE" = openvswitch ] && { + ovs-vsctl add-br "$IFNAME" + } +} + +[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') + +# If it's a bridge, we need to create a veth pair +[ "$IFTYPE" = bridge ] && { + if [ -z "$LOCAL_IFNAME" ]; then + LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" + fi + GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" + # Does the link already exist? + if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then + # link exists, is it in use? + if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then + echo "Link $LOCAL_IFNAME exists and is up" + exit 1 + fi + # delete the link so we can re-add it afterwards + ip link del "$LOCAL_IFNAME" + fi + ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" + case "$BRTYPE" in + linux) + (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") + ;; + openvswitch) + if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then + ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ + -- set Interface "$LOCAL_IFNAME" \ + external-ids:pipework.interface="$LOCAL_IFNAME" \ + external-ids:pipework.bridge="$IFNAME" \ + ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ + ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ + ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ + ${VLAN:+external-ids:pipework.vlan="$VLAN"} + fi + ;; + esac + ip link set "$LOCAL_IFNAME" up +} + +# If it's a physical interface, create a macvlan subinterface +[ "$IFTYPE" = phys ] && { + [ "$VLAN" ] && { + [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { + ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" + } + ip link set "$IFNAME" up + IFNAME=$IFNAME.$VLAN + } + + if [ ! -z "$DIRECT_PHYS" ]; then + GUEST_IFNAME=$IFNAME + else + GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME + ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge + fi + + ip link set "$IFNAME" up +} + +# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB +# equivalent of a macvlan device) +# +# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an +# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of +# InfiniBand, without an intermediate Ethernet layer. +[ "$IFTYPE" = ipoib ] && { + GUEST_IFNAME="${IFNAME}.${NSPID}" + + # If a partition key is provided, use it + [ "$PKEY" ] && { + GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" + PKEY="pkey 0x$PKEY" + } + + ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY + ip link set "$IFNAME" up +} + +# If its a dummy interface, create a dummy interface. +[ "$IFTYPE" = dummy ] && { + GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME + ip link add dev "$GUEST_IFNAME" type dummy +} + +# If the `route` command was specified ... +if [ "$IFTYPE" = route ]; then + # ... discard the first two arguments and pass the rest to the route command. + shift 2 + ip netns exec "$NSPID" ip route "$@" +elif [ "$IFTYPE" = rule ] ; then + shift 2 + ip netns exec "$NSPID" ip rule "$@" +elif [ "$IFTYPE" = tc ] ; then + shift 2 + ip netns exec "$NSPID" tc "$@" +else + # Otherwise, run normally. + ip link set "$GUEST_IFNAME" netns "$NSPID" + ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" + [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" + + # When using any of the DHCP methods, we start a DHCP client in the + # network namespace of the container. With the 'dhcp' method, the + # client used is taken from the Docker busybox image (therefore + # requiring no specific client installed on the host). Other methods + # use a locally installed client. + case "$DHCP_CLIENT" in + dhcp) + docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ + busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ + $DHCP_OPTIONS \ + >/dev/null + ;; + udhcpc) + DHCP_Q="-q" + [ "$DHCP_FOREGROUND" ] && { + DHCP_OPTIONS="$DHCP_OPTIONS -f" + } + ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ + -x "hostname:$GUESTNAME" \ + -p "/var/run/udhcpc.$GUESTNAME.pid" \ + $DHCP_OPTIONS + [ ! "$DHCP_FOREGROUND" ] && { + rm "/var/run/udhcpc.$GUESTNAME.pid" + } + ;; + dhclient) + ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ + -pf "/var/run/dhclient.$GUESTNAME.pid" \ + -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ + $DHCP_OPTIONS + # kill dhclient after get ip address to prevent device be used after container close + [ ! "$DHCP_FOREGROUND" ] && { + kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" + rm "/var/run/dhclient.$GUESTNAME.pid" + } + ;; + dhcpcd) + ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" + ;; + "") + if installed ipcalc; then + eval $(ipcalc -b $IPADDR) + ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" + else + ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" + fi + + [ "$GATEWAY" ] && { + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true + } + ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up + [ "$GATEWAY" ] && { + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" + } + ;; + esac + + # Give our ARP neighbors a nudge about the new interface + if installed arping; then + IPADDR=$(echo "$IPADDR" | cut -d/ -f1) + ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true + else + echo "Warning: arping not found; interface may not be immediately reachable" + fi +fi +# Remove NSPID to avoid `ip netns` catch it. +rm -f "/var/run/netns/$NSPID" + +# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I32433871e25de46ef58b70af46400cbb4dc0dbc5 Gerrit-Change-Number: 22670 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:25:04 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 3 Feb 2021 21:25:04 +0000 Subject: Change in osmo-msc[master]: Add vty option to globally enable LCLS In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13421 ) Change subject: Add vty option to globally enable LCLS ...................................................................... Patch Set 15: A couple of further thoughts. The follow up patch sets are also somewhat stalled because I need to figure out how to map SIP re_INVITES to LCLS Connection Control and Status Change (TS 123.284) IIUC. And previous to this, It might be a good idea to visit @neels long outstanding patchset that moves SDP parsing inside the MSC. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibb587e6ae47cff71f5bf2e2d22c1da86cd7e1762 Gerrit-Change-Number: 13421 Gerrit-PatchSet: 15 Gerrit-Owner: Max Gerrit-Assignee: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: Hoernchen Gerrit-Comment-Date: Wed, 03 Feb 2021 21:25:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:26:41 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 3 Feb 2021 21:26:41 +0000 Subject: Change in osmo-msc[master]: Add vty option to globally enable LCLS In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13421 ) Change subject: Add vty option to globally enable LCLS ...................................................................... Patch Set 15: https://gerrit.osmocom.org/c/osmo-msc/+/15953 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibb587e6ae47cff71f5bf2e2d22c1da86cd7e1762 Gerrit-Change-Number: 13421 Gerrit-PatchSet: 15 Gerrit-Owner: Max Gerrit-Assignee: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: Hoernchen Gerrit-Comment-Date: Wed, 03 Feb 2021 21:26:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:45:47 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 21:45:47 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer:Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#3) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer:Add Function to get gbproxy cell by cell id ...................................................................... gb_proxy_peer:Add Function to get gbproxy cell by cell id Depends: libosmocore I4d7558c04d9d01761516526086be5104bb2eeada Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy_peer.c 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/52/22652/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:46:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 21:46:34 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#3) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: Simplify raid data storage ...................................................................... Simplify raid data storage Instead of storing the raw ra_id in gbproxy_bvc and gbproxy_cell store the decoded ra_id plus cell id in gbproxy cell and use it from there. Related: OS#4894 Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 18 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:46:51 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 21:46:51 +0000 Subject: Change in osmo-gbproxy[master]: Simplify raid data storage In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: Simplify raid data storage ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/include/osmocom/sgsn/gb_proxy.h at 115 PS2, Line 115: struct { > There's already struct osmo_cgi_ps in case you want to reuse it. [?] I would suggest to keep it like it is as in struct bssgp_rim_routing_info we also use the same constellation. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c File src/gb_proxy_ctrl.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c at 96 PS2, Line 96: cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", > Not related to this patch, but it would be better using the "%u-%u-%u" notation (as per specs) for R [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 03 Feb 2021 21:46:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:58:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 21:58:55 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: Simplify raid data storage In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#4) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: Simplify raid data storage ...................................................................... gb_proxy: Simplify raid data storage Instead of storing the raw ra_id in gbproxy_bvc and gbproxy_cell store the decoded ra_id plus cell id in gbproxy cell and use it from there. Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Related: OS#4894 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 18 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 21:58:56 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 21:58:56 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c 3 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/71/22671/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 871ba68..f838354 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -222,7 +222,7 @@ LOGPBVC_CAT(BVC, DGPRS, LEVEL, FMT, ## ARGS) #define LOGPCELL_CAT(CELL, SUBSYS, LEVEL, FMT, ARGS...) \ - LOGP(SUBSYS, LEVEL, "CELL(%05u) " FMT, (CELL)->bvci, ## ARGS) + LOGP(SUBSYS, LEVEL, "CELL(%05u/%05u) " FMT, (CELL)->bvci, (CELL)->id.cid, ## ARGS) #define LOGPCELL(CELL, LEVEL, FMT, ARGS...) \ LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS) @@ -263,7 +263,7 @@ void gbproxy_bvc_free(struct gbproxy_bvc *bvc); int gbproxy_cleanup_bvcs(struct gbproxy_nse *nse, uint16_t bvci); -struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci); +struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci, const struct gprs_ra_id *raid, uint16_t cid); struct gbproxy_cell *gbproxy_cell_by_bvci(struct gbproxy_config *cfg, uint16_t bvci); struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid); void gbproxy_cell_free(struct gbproxy_cell *cell); diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 04ebaf6..2dee5b2 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -669,9 +669,8 @@ * for this BVC. We need to create the 'cell' data structure and the SGSN-side * BVC counterparts */ - bvc->cell = gbproxy_cell_alloc(cfg, bvci); + bvc->cell = gbproxy_cell_alloc(cfg, bvci, ra_id, cell_id); OSMO_ASSERT(bvc->cell); - memcpy(&bvc->cell->id.raid, ra_id, sizeof(*ra_id)); /* link us to the cell and vice-versa */ bvc->cell->bss_bvc = bvc; diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index ac1c981..2b19c8b 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -163,7 +163,8 @@ ***********************************************************************/ /* Allocate a new 'cell' object */ -struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci) +struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci, + const struct gprs_ra_id *raid, uint16_t cid) { struct gbproxy_cell *cell; OSMO_ASSERT(cfg); @@ -174,6 +175,8 @@ cell->cfg = cfg; cell->bvci = bvci; + cell->id.cid = cid; + memcpy(&cell->id.raid, raid, sizeof(cell->id.raid)); hash_add(cfg->cells, &cell->list, cell->bvci); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 3 22:03:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 3 Feb 2021 22:03:38 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22672 ) Change subject: gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new ...................................................................... gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new Change-Id: I43ec049540c10c8ded5a668229447ab1acb6c832 Related: SYS#5103 --- M src/gb_proxy_peer.c 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/72/22672/1 diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 2b19c8b..d152de2 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -197,18 +197,6 @@ return NULL; } -struct gbproxy_cell *gbproxy_cell_by_bvci_or_new(struct gbproxy_config *cfg, uint16_t bvci) -{ - struct gbproxy_cell *cell; - OSMO_ASSERT(cfg); - - cell = gbproxy_cell_by_bvci(cfg, bvci); - if (!cell) - cell = gbproxy_cell_alloc(cfg, bvci); - - return cell; -} - struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid) { int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I43ec049540c10c8ded5a668229447ab1acb6c832 Gerrit-Change-Number: 22672 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Feb 4 01:54:34 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 01:54:34 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <601b53ecc9150_35c82afc5c9a25f84232a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 148s] [COMPILING apps/dfu/main.c] [ 148s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 148s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 148s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 148s] Memory region Used Size Region Size %age Used [ 148s] rom: 16580 B 16 KB 101.20% [ 148s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 148s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 148s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 148s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 148s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 148s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 148s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 148s] collect2: error: ld returned 1 exit status [ 148s] % [ 148s] make[2]: *** [Makefile:234: flash] Error 1 [ 148s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 148s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 148s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 148s] dh_auto_build: error: make -j1 returned exit code 2 [ 148s] make: *** [debian/rules:16: build] Error 25 [ 148s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 148s] ### VM INTERACTION START ### [ 151s] [ 133.289626] sysrq: Power Off [ 151s] [ 133.291935] reboot: Power down [ 152s] ### VM INTERACTION END ### [ 152s] [ 152s] old-atreju3 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 4 01:54:18 UTC 2021. [ 152s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:03:26 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:03:26 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <601b560b8fa14_35c82afc5c9a25f84241d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 287s] Making all in src [ 287s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 287s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/aarch64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 287s] In file included from internal.h:8:0, [ 287s] from cbc_main.c:47: [ 287s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 287s] #include [ 287s] ^ [ 287s] compilation terminated. [ 287s] Makefile:455: recipe for target 'cbc_main.o' failed [ 287s] make[3]: *** [cbc_main.o] Error 1 [ 287s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 287s] Makefile:420: recipe for target 'all-recursive' failed [ 287s] make[2]: *** [all-recursive] Error 1 [ 287s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 287s] Makefile:367: recipe for target 'all' failed [ 287s] make[1]: *** [all] Error 2 [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] dh_auto_build: make -j1 returned exit code 2 [ 287s] debian/rules:45: recipe for target 'build' failed [ 287s] make: *** [build] Error 2 [ 287s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 287s] ### VM INTERACTION START ### [ 290s] [ 268.792146] sysrq: Power Off [ 290s] [ 268.794345] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] armbuild26 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:03:14 UTC 2021. [ 290s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:03:43 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:03:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <601b560c93ae5_35c82afc5c9a25f842421e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 200s] Making all in src [ 200s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 200s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 200s] In file included from internal.h:8:0, [ 200s] from cbc_main.c:47: [ 200s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 200s] #include [ 200s] ^ [ 200s] compilation terminated. [ 200s] Makefile:455: recipe for target 'cbc_main.o' failed [ 200s] make[3]: *** [cbc_main.o] Error 1 [ 200s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 200s] Makefile:420: recipe for target 'all-recursive' failed [ 200s] make[2]: *** [all-recursive] Error 1 [ 200s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 200s] Makefile:367: recipe for target 'all' failed [ 200s] make[1]: *** [all] Error 2 [ 200s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 200s] dh_auto_build: make -j1 returned exit code 2 [ 200s] debian/rules:45: recipe for target 'build' failed [ 200s] make: *** [build] Error 2 [ 200s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 200s] ### VM INTERACTION START ### [ 203s] [ 185.156673] sysrq: Power Off [ 203s] [ 185.160804] reboot: Power down [ 203s] ### VM INTERACTION END ### [ 203s] [ 203s] lamb52 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:03:31 UTC 2021. [ 203s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:04:17 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:04:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <601b5628df50f_35c82afc5c9a25f8424439@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_20.10/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 231s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 231s] echo 0.2.0 > .version-t && mv .version-t .version [ 231s] make all-recursive [ 231s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 231s] Making all in src [ 231s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 231s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 231s] In file included from internal.h:8, [ 231s] from cbc_main.c:47: [ 231s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 231s] 6 | #include [ 231s] | ^~~~~~~~~~~~~~~~~~~~~ [ 231s] compilation terminated. [ 231s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 231s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 231s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 231s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 231s] make[1]: *** [Makefile:367: all] Error 2 [ 231s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 231s] dh_auto_build: error: make -j1 returned exit code 2 [ 231s] make: *** [debian/rules:45: build] Error 25 [ 231s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 231s] ### VM INTERACTION START ### [ 232s] Powering off. [ 232s] [ 215.619973] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] build78 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:04:01 UTC 2021. [ 232s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:04:17 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:04:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <601b5629819ec_35c82afc5c9a25f842452@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/i586 Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 290s] Making all in src [ 290s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 290s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 290s] In file included from internal.h:8:0, [ 290s] from cbc_main.c:47: [ 290s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 290s] #include [ 290s] ^ [ 290s] compilation terminated. [ 290s] Makefile:455: recipe for target 'cbc_main.o' failed [ 290s] make[3]: *** [cbc_main.o] Error 1 [ 290s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 290s] Makefile:420: recipe for target 'all-recursive' failed [ 290s] make[2]: *** [all-recursive] Error 1 [ 290s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 290s] Makefile:367: recipe for target 'all' failed [ 290s] make[1]: *** [all] Error 2 [ 290s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 290s] dh_auto_build: make -j1 returned exit code 2 [ 290s] debian/rules:45: recipe for target 'build' failed [ 290s] make: *** [build] Error 2 [ 290s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 290s] ### VM INTERACTION START ### [ 293s] [ 235.017780] sysrq: Power Off [ 293s] [ 235.048904] reboot: Power down [ 293s] ### VM INTERACTION END ### [ 293s] [ 293s] cloud126 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:04:05 UTC 2021. [ 293s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:04:34 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:04:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <601b56443ed78_35c82afc5c9a25f842473c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 291s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 291s] echo 0.2.0 > .version-t && mv .version-t .version [ 291s] make all-recursive [ 291s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 291s] Making all in src [ 291s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 291s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 291s] In file included from internal.h:8, [ 291s] from cbc_main.c:47: [ 291s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 291s] #include [ 291s] ^~~~~~~~~~~~~~~~~~~~~ [ 291s] compilation terminated. [ 291s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 291s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 291s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 291s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 291s] make[1]: *** [Makefile:367: all] Error 2 [ 291s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 291s] dh_auto_build: make -j1 returned exit code 2 [ 291s] make: *** [debian/rules:45: build] Error 2 [ 291s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 291s] ### VM INTERACTION START ### [ 295s] [ 275.235049] sysrq: Power Off [ 295s] [ 275.242144] reboot: Power down [ 295s] ### VM INTERACTION END ### [ 295s] [ 295s] lamb52 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:04:22 UTC 2021. [ 295s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:04:34 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:04:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/aarch64 In-Reply-To: References: Message-ID: <601b5644d3567_35c82afc5c9a25f8424844@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/aarch64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 370s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 370s] echo 0.2.0 > .version-t && mv .version-t .version [ 370s] make all-recursive [ 370s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 370s] Making all in src [ 370s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 370s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/aarch64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 370s] In file included from internal.h:8, [ 370s] from cbc_main.c:47: [ 370s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 370s] #include [ 370s] ^~~~~~~~~~~~~~~~~~~~~ [ 370s] compilation terminated. [ 370s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 370s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 370s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 370s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 370s] make[1]: *** [Makefile:367: all] Error 2 [ 370s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 370s] dh_auto_build: make -j1 returned exit code 2 [ 370s] make: *** [debian/rules:45: build] Error 2 [ 370s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 370s] ### VM INTERACTION START ### [ 374s] [ 346.733753] sysrq: Power Off [ 374s] [ 346.784760] reboot: Power down [ 374s] ### VM INTERACTION END ### [ 374s] [ 374s] obs-arm-9 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:04:25 UTC 2021. [ 374s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:05:08 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:05:08 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <601b566645d66_35c82afc5c9a25f84249e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 275s] Making all in src [ 275s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 275s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 275s] In file included from internal.h:8:0, [ 275s] from cbc_main.c:47: [ 275s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 275s] #include [ 275s] ^~~~~~~~~~~~~~~~~~~~~ [ 275s] compilation terminated. [ 275s] Makefile:455: recipe for target 'cbc_main.o' failed [ 275s] make[3]: *** [cbc_main.o] Error 1 [ 275s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 275s] Makefile:420: recipe for target 'all-recursive' failed [ 275s] make[2]: *** [all-recursive] Error 1 [ 275s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 275s] Makefile:367: recipe for target 'all' failed [ 275s] make[1]: *** [all] Error 2 [ 275s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 275s] dh_auto_build: make -j1 returned exit code 2 [ 275s] debian/rules:45: recipe for target 'build' failed [ 275s] make: *** [build] Error 2 [ 275s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 275s] ### VM INTERACTION START ### [ 278s] [ 260.988155] sysrq: Power Off [ 278s] [ 260.995816] reboot: Power down [ 278s] ### VM INTERACTION END ### [ 278s] [ 278s] lamb64 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:05:06 UTC 2021. [ 278s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:05:43 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:05:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601b56849e678_35c82afc5c9a25f842508d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_20.04/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 321s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 321s] echo 0.2.0 > .version-t && mv .version-t .version [ 321s] make all-recursive [ 321s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 321s] Making all in src [ 321s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 321s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 321s] In file included from internal.h:8, [ 321s] from cbc_main.c:47: [ 321s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 321s] 6 | #include [ 321s] | ^~~~~~~~~~~~~~~~~~~~~ [ 321s] compilation terminated. [ 321s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 321s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 321s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 321s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 321s] make[1]: *** [Makefile:367: all] Error 2 [ 321s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 321s] dh_auto_build: error: make -j1 returned exit code 2 [ 321s] make: *** [debian/rules:45: build] Error 25 [ 321s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 321s] ### VM INTERACTION START ### [ 324s] [ 300.147270] sysrq: Power Off [ 324s] [ 300.150540] reboot: Power down [ 324s] ### VM INTERACTION END ### [ 324s] [ 324s] build72 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:05:39 UTC 2021. [ 324s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:06:00 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:06:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <601b569fd7362_35c82afc5c9a25f8425112@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_19.10/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 347s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 347s] echo 0.2.0 > .version-t && mv .version-t .version [ 347s] make all-recursive [ 347s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 347s] Making all in src [ 347s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 348s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 348s] In file included from internal.h:8, [ 348s] from cbc_main.c:47: [ 348s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 348s] 6 | #include [ 348s] | ^~~~~~~~~~~~~~~~~~~~~ [ 348s] compilation terminated. [ 348s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 348s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 348s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 348s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 348s] make[1]: *** [Makefile:367: all] Error 2 [ 348s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 348s] dh_auto_build: make -j1 returned exit code 2 [ 348s] make: *** [debian/rules:45: build] Error 255 [ 348s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 348s] ### VM INTERACTION START ### [ 351s] [ 331.011946] sysrq: Power Off [ 351s] [ 331.030148] reboot: Power down [ 351s] ### VM INTERACTION END ### [ 351s] [ 351s] lamb61 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:05:52 UTC 2021. [ 351s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:06:16 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:06:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/i586 In-Reply-To: References: Message-ID: <601b56a318a8_35c82afc5c9a25f842535f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/i586 Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 380s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 380s] echo 0.2.0 > .version-t && mv .version-t .version [ 380s] make all-recursive [ 380s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 380s] Making all in src [ 380s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 380s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 380s] In file included from internal.h:8, [ 380s] from cbc_main.c:47: [ 380s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 380s] #include [ 380s] ^~~~~~~~~~~~~~~~~~~~~ [ 380s] compilation terminated. [ 380s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 380s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 380s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 380s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 380s] make[1]: *** [Makefile:367: all] Error 2 [ 380s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 380s] dh_auto_build: make -j1 returned exit code 2 [ 380s] make: *** [debian/rules:45: build] Error 2 [ 380s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 380s] ### VM INTERACTION START ### [ 383s] [ 325.107455] sysrq: Power Off [ 383s] [ 325.113924] reboot: Power down [ 383s] ### VM INTERACTION END ### [ 383s] [ 383s] cloud130 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:06:01 UTC 2021. [ 383s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:06:52 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:06:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <601b56df4eb9d_35c82afc5c9a25f8425630@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 365s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 365s] echo 0.2.0 > .version-t && mv .version-t .version [ 365s] make all-recursive [ 365s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 365s] Making all in src [ 365s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 365s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 365s] In file included from internal.h:8, [ 365s] from cbc_main.c:47: [ 365s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 365s] #include [ 365s] ^~~~~~~~~~~~~~~~~~~~~ [ 365s] compilation terminated. [ 365s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 365s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 365s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 365s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 365s] make[1]: *** [Makefile:367: all] Error 2 [ 365s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 365s] dh_auto_build: make -j1 returned exit code 2 [ 365s] make: *** [debian/rules:45: build] Error 2 [ 365s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 365s] ### VM INTERACTION START ### [ 368s] [ 264.370082] sysrq: Power Off [ 368s] [ 264.382445] reboot: Power down [ 368s] ### VM INTERACTION END ### [ 368s] [ 368s] cloud118 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:06:40 UTC 2021. [ 368s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:07:43 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:07:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <601b5700d7983_35c82afc5c9a25f8425814@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 479s] Making all in src [ 479s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 479s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 479s] In file included from internal.h:8:0, [ 479s] from cbc_main.c:47: [ 479s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 479s] #include [ 479s] ^ [ 479s] compilation terminated. [ 479s] Makefile:455: recipe for target 'cbc_main.o' failed [ 479s] make[3]: *** [cbc_main.o] Error 1 [ 479s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 479s] Makefile:420: recipe for target 'all-recursive' failed [ 479s] make[2]: *** [all-recursive] Error 1 [ 479s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 479s] Makefile:367: recipe for target 'all' failed [ 479s] make[1]: *** [all] Error 2 [ 479s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 479s] dh_auto_build: make -j1 returned exit code 2 [ 479s] debian/rules:45: recipe for target 'build' failed [ 479s] make: *** [build] Error 2 [ 479s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 479s] ### VM INTERACTION START ### [ 483s] [ 409.311815] sysrq: SysRq : Power Off [ 483s] [ 409.313166] reboot: Power down [ 483s] ### VM INTERACTION END ### [ 483s] [ 483s] armbuild02 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:07:34 UTC 2021. [ 483s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:08:17 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:08:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <601b571aa9cad_35c82afc5c9a25f842607a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 473s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 473s] echo 0.2.0 > .version-t && mv .version-t .version [ 473s] make all-recursive [ 473s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 473s] Making all in src [ 473s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 473s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 473s] In file included from internal.h:8, [ 473s] from cbc_main.c:47: [ 473s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 473s] 6 | #include [ 473s] | ^~~~~~~~~~~~~~~~~~~~~ [ 473s] compilation terminated. [ 473s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 473s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 473s] make[2]: *** [Makefile:422: all-recursive] Error 1 [ 473s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 473s] make[1]: *** [Makefile:369: all] Error 2 [ 473s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 473s] dh_auto_build: error: make -j1 returned exit code 2 [ 473s] make: *** [debian/rules:45: build] Error 25 [ 473s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 473s] ### VM INTERACTION START ### [ 474s] Powering off. [ 474s] [ 449.161791] reboot: Power down [ 474s] ### VM INTERACTION END ### [ 474s] [ 475s] lamb56 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:08:07 UTC 2021. [ 475s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:08:17 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:08:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <601b571b67950_35c82afc5c9a25f84261b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 584s] Making all in src [ 584s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 584s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 584s] In file included from internal.h:8:0, [ 584s] from cbc_main.c:47: [ 584s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 584s] #include [ 584s] ^ [ 584s] compilation terminated. [ 584s] Makefile:455: recipe for target 'cbc_main.o' failed [ 584s] make[3]: *** [cbc_main.o] Error 1 [ 584s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 584s] Makefile:420: recipe for target 'all-recursive' failed [ 584s] make[2]: *** [all-recursive] Error 1 [ 584s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 584s] Makefile:367: recipe for target 'all' failed [ 584s] make[1]: *** [all] Error 2 [ 584s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 584s] dh_auto_build: make -j1 returned exit code 2 [ 584s] debian/rules:45: recipe for target 'build' failed [ 584s] make: *** [build] Error 2 [ 584s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 584s] ### VM INTERACTION START ### [ 587s] [ 540.203372] sysrq: SysRq : Power Off [ 587s] [ 540.207074] reboot: Power down [ 588s] ### VM INTERACTION END ### [ 588s] [ 588s] obs-arm-5 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:08:08 UTC 2021. [ 588s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:08:18 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:08:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <601b571e20177_35c82afc5c9a25f84262d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 458s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 458s] echo 0.2.0 > .version-t && mv .version-t .version [ 458s] make all-recursive [ 458s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 458s] Making all in src [ 458s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 458s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 458s] In file included from internal.h:8, [ 458s] from cbc_main.c:47: [ 458s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 458s] #include [ 458s] ^~~~~~~~~~~~~~~~~~~~~ [ 458s] compilation terminated. [ 458s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 458s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 458s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 458s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 458s] make[1]: *** [Makefile:367: all] Error 2 [ 458s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 458s] dh_auto_build: make -j1 returned exit code 2 [ 458s] make: *** [debian/rules:45: build] Error 2 [ 458s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 458s] ### VM INTERACTION START ### [ 461s] [ 390.228148] sysrq: Power Off [ 461s] [ 390.236011] reboot: Power down [ 461s] ### VM INTERACTION END ### [ 461s] [ 461s] cloud123 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:08:15 UTC 2021. [ 461s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:10:17 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:10:17 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601b578fcf497_35c82afc5c9a25f84267a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 180s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 180s] [COMPILING libboard/qmod/source/card_pres.c] [ 180s] [COMPILING libboard/qmod/source/wwan_led.c] [ 180s] [COMPILING libboard/qmod/source/i2c.c] [ 180s] [COMPILING libboard/qmod/source/board_qmod.c] [ 180s] [COMPILING apps/dfu/main.c] [ 180s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 181s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 181s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 181s] Memory region Used Size Region Size %age Used [ 181s] rom: 16588 B 16 KB 101.25% [ 181s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 181s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 181s] collect2: error: ld returned 1 exit status [ 181s] % [ 181s] make[2]: *** [Makefile:234: flash] Error 1 [ 181s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 181s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 181s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 181s] dh_auto_build: error: make -j1 returned exit code 2 [ 181s] make: *** [debian/rules:16: build] Error 25 [ 181s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 181s] ### VM INTERACTION START ### [ 184s] [ 167.480928] sysrq: Power Off [ 184s] [ 167.487236] reboot: Power down [ 184s] ### VM INTERACTION END ### [ 184s] [ 184s] lamb07 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 4 02:10:05 UTC 2021. [ 184s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:11:25 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:11:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <601b57e96cede_35c82afc5c9a25f84270e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 634s] Making all in src [ 634s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 634s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 634s] In file included from internal.h:8:0, [ 634s] from cbc_main.c:47: [ 634s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 634s] #include [ 634s] ^~~~~~~~~~~~~~~~~~~~~ [ 634s] compilation terminated. [ 634s] Makefile:455: recipe for target 'cbc_main.o' failed [ 634s] make[3]: *** [cbc_main.o] Error 1 [ 634s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 634s] Makefile:420: recipe for target 'all-recursive' failed [ 634s] make[2]: *** [all-recursive] Error 1 [ 634s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 634s] Makefile:367: recipe for target 'all' failed [ 634s] make[1]: *** [all] Error 2 [ 634s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 634s] dh_auto_build: make -j1 returned exit code 2 [ 634s] debian/rules:45: recipe for target 'build' failed [ 634s] make: *** [build] Error 2 [ 634s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 634s] ### VM INTERACTION START ### [ 637s] [ 503.637437] sysrq: Power Off [ 637s] [ 503.653238] reboot: Power down [ 637s] ### VM INTERACTION END ### [ 637s] [ 637s] cloud116 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:11:17 UTC 2021. [ 637s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:20:52 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:20:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <601b5a09d4007_35c82afc5c9a25f842981a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Raspbian_10/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 735s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 735s] echo 0.2.0 > .version-t && mv .version-t .version [ 735s] make all-recursive [ 735s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 736s] Making all in src [ 736s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 736s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 736s] In file included from internal.h:8, [ 736s] from cbc_main.c:47: [ 736s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 736s] #include [ 736s] ^~~~~~~~~~~~~~~~~~~~~ [ 736s] compilation terminated. [ 736s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 736s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 736s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 736s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 736s] make[1]: *** [Makefile:367: all] Error 2 [ 736s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 736s] dh_auto_build: make -j1 returned exit code 2 [ 736s] make: *** [debian/rules:45: build] Error 2 [ 736s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 736s] ### VM INTERACTION START ### [ 739s] [ 699.430302] sysrq: SysRq : Power Off [ 739s] [ 699.439177] reboot: Power down [ 741s] ### VM INTERACTION END ### [ 741s] [ 741s] obs-arm-5 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:20:40 UTC 2021. [ 741s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:23:59 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:23:59 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/armv7l In-Reply-To: References: Message-ID: <601b5addaf8ab_35c82afc5c9a25f84306aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 936s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 936s] echo 0.2.0 > .version-t && mv .version-t .version [ 936s] make all-recursive [ 936s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 936s] Making all in src [ 936s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 936s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 936s] In file included from internal.h:8, [ 936s] from cbc_main.c:47: [ 936s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 936s] #include [ 936s] ^~~~~~~~~~~~~~~~~~~~~ [ 936s] compilation terminated. [ 936s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 936s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 936s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 936s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 936s] make[1]: *** [Makefile:367: all] Error 2 [ 936s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 936s] dh_auto_build: make -j1 returned exit code 2 [ 936s] make: *** [debian/rules:45: build] Error 2 [ 936s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 936s] ### VM INTERACTION START ### [ 939s] [ 872.586386] sysrq: SysRq : Power Off [ 939s] [ 872.598603] reboot: Power down [ 941s] ### VM INTERACTION END ### [ 941s] [ 941s] obs-arm-6 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:23:47 UTC 2021. [ 941s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 02:33:43 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 02:33:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <601b5d149eeee_35c82afc5c9a25f84344b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 663s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 663s] echo 0.2.0 > .version-t && mv .version-t .version [ 663s] make all-recursive [ 663s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 663s] Making all in src [ 663s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 663s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 663s] In file included from internal.h:8, [ 663s] from cbc_main.c:47: [ 663s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 663s] 6 | #include [ 663s] | ^~~~~~~~~~~~~~~~~~~~~ [ 663s] compilation terminated. [ 663s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 663s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 663s] make[2]: *** [Makefile:422: all-recursive] Error 1 [ 663s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 663s] make[1]: *** [Makefile:369: all] Error 2 [ 663s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 663s] dh_auto_build: error: make -j1 returned exit code 2 [ 663s] make: *** [debian/rules:45: build] Error 25 [ 663s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 663s] ### VM INTERACTION START ### [ 664s] Powering off. [ 664s] [ 455.085473] reboot: Power down [ 664s] ### VM INTERACTION END ### [ 664s] [ 664s] cloud108 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 02:33:27 UTC 2021. [ 664s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 4 03:50:04 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 04 Feb 2021 03:50:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <601b6f016e319_35c82afc5c9a25f845153c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 666s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 666s] echo 0.2.0 > .version-t && mv .version-t .version [ 666s] make all-recursive [ 666s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 666s] Making all in src [ 666s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 666s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.0\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.0\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.0\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -c -o cbc_main.o cbc_main.c [ 666s] In file included from internal.h:8, [ 666s] from cbc_main.c:47: [ 666s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 666s] 6 | #include [ 666s] | ^~~~~~~~~~~~~~~~~~~~~ [ 666s] compilation terminated. [ 666s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 666s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 666s] make[2]: *** [Makefile:422: all-recursive] Error 1 [ 666s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 666s] make[1]: *** [Makefile:369: all] Error 2 [ 666s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 666s] dh_auto_build: error: make -j1 returned exit code 2 [ 666s] make: *** [debian/rules:45: build] Error 25 [ 666s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 667s] ### VM INTERACTION START ### [ 668s] Powering off. [ 668s] [ 626.505216] reboot: Power down [ 668s] ### VM INTERACTION END ### [ 668s] [ 668s] lamb03 failed "build osmo-cbc_0.2.0.dsc" at Thu Feb 4 03:49:57 UTC 2021. [ 668s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:27:01 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 09:27:01 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... Patch Set 1: (1 comment) Thanks for taking this on! https://gerrit.osmocom.org/c/libosmocore/+/22669/1/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/c/libosmocore/+/22669/1/src/gsm/gsm48.c at 1305 PS1, Line 1305: int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2) I think checking for equality like you did is okay in this case, but I would rename the function since compare usually returns an ordering of the arguments (<0/0/>0). Something like gsm48_ra_equals() which returns true or false. I think it would be even more useful to have a function that returns an enum indicating where a raid mismatched so you could use this function even if you only care about the lac. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-Comment-Date: Thu, 04 Feb 2021 09:27:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:28:44 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 09:28:44 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer:Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer:Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 3: This be rebased onto I4d7558c04d9d01761516526086be5104bb2eeada -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 09:28:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:35:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:35:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr-net: Don't generate junit-xml output. It's not a test suite References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22673 ) Change subject: fr-net: Don't generate junit-xml output. It's not a test suite ...................................................................... fr-net: Don't generate junit-xml output. It's not a test suite Change-Id: Id296e62fb86731492d42370173a48f217b2fbdc0 --- M fr-net/FRNET_Tests.cfg M fr-net/FRNET_Tests.default 2 files changed, 14 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/22673/1 diff --git a/fr-net/FRNET_Tests.cfg b/fr-net/FRNET_Tests.cfg index dedd828..555b260 100644 --- a/fr-net/FRNET_Tests.cfg +++ b/fr-net/FRNET_Tests.cfg @@ -1,6 +1,8 @@ [ORDERED_INCLUDE] -# Common configuration, shared between test suites -"../Common.cfg" +# We cannot include Common.cfg, as this includes the LoggerPlugins configuration +# for junit-xml generation. However, we don't want to generate any junit-xml, +# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests +# can execute # testsuite specific configuration, not expected to change "./FRNET_Tests.default" diff --git a/fr-net/FRNET_Tests.default b/fr-net/FRNET_Tests.default index d694d98..9ec4a0c 100644 --- a/fr-net/FRNET_Tests.default +++ b/fr-net/FRNET_Tests.default @@ -1,10 +1,16 @@ [ORDERED_INCLUDE] -# Common configuration, shared between test suites -"../Common.cfg" +# We cannot include Common.cfg, as this includes the LoggerPlugins configuration +# for junit-xml generation. However, we don't want to generate any junit-xml, +# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests +# can execute [LOGGING] -#*.FileMask := LOG_ALL -ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER +LogFile := "%e-%c-%h-%r.%s" +AppendFile := Yes; +SourceInfoFormat := Single; +LogSourceInfo := Yes; +FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP; [MODULE_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22673 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: Id296e62fb86731492d42370173a48f217b2fbdc0 Gerrit-Change-Number: 22673 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:37:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:37:51 +0000 Subject: Change in docker-playground[master]: gbproxy-fr: Wait for interface to be _up_ not just its existance References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22674 ) Change subject: gbproxy-fr: Wait for interface to be _up_ not just its existance ...................................................................... gbproxy-fr: Wait for interface to be _up_ not just its existance I've seen at least one instance where -EIFDOWN was returned when the test suite was coming up. This is a race condition, as we first have to move the netdev into the namespace and only then can configure it. "pipework wait" only waits for its existence, not until it is up. We cannot revert the order, as the netdev looses its state when it is moved to a different netns. Change-Id: I1bfb6eb925bca4e4e1901e06eed831152cddbbe2 --- M ttcn3-fr-test/docker-entrypoint.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/74/22674/1 diff --git a/ttcn3-fr-test/docker-entrypoint.sh b/ttcn3-fr-test/docker-entrypoint.sh index 132c73c..1215f6a 100755 --- a/ttcn3-fr-test/docker-entrypoint.sh +++ b/ttcn3-fr-test/docker-entrypoint.sh @@ -5,7 +5,21 @@ SUITE=$2 if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then + echo Waiting for ${WAIT_FOR_NETDEV} to appear + # this unfortunately only waits until the device exists /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} + # here we have to wait until it is up + while true; do + if [ ! -f /sys/class/net/${WAIT_FOR_NETDEV}/operstate ]; then + exit 23 + fi + OPSTATE=`cat /sys/class/net/${WAIT_FOR_NETDEV}/operstate` + if [ "$OPSTATE" == "up" ]; then + break + fi + echo Waiting for ${WAIT_FOR_NETDEV} to become operational + sleep 1 + done fi cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/$SUBDIR/$SUITE; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bfb6eb925bca4e4e1901e06eed831152cddbbe2 Gerrit-Change-Number: 22674 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:37:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:37:52 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22675 ) Change subject: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests ...................................................................... ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests FRNET_Tests is not a test suite, but just a stub against which we execute FR_Tests. Hence, we don't want it to generate a junit-xml, as that doesn't contain any errors and only upsets our jenkins test results analyzer, assuming the tests have failed. Change-Id: Idec2bf8da30ccd211b21901d56979143ce3a172f Requires: osmo-ttcn3-hacks.git Id296e62fb86731492d42370173a48f217b2fbdc0 --- M ttcn3-fr-test/FRNET_Tests.cfg 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/22675/1 diff --git a/ttcn3-fr-test/FRNET_Tests.cfg b/ttcn3-fr-test/FRNET_Tests.cfg index cd208e6..df2a27c 100644 --- a/ttcn3-fr-test/FRNET_Tests.cfg +++ b/ttcn3-fr-test/FRNET_Tests.cfg @@ -1,6 +1,8 @@ [ORDERED_INCLUDE] -# Common configuration, shared between test suites -"/osmo-ttcn3-hacks/Common.cfg" +# We cannot include Common.cfg, as this includes the LoggerPlugins configuration +# for junit-xml generation. However, we don't want to generate any junit-xml, +# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests +# can execute # testsuite specific configuration, not expected to change "/osmo-ttcn3-hacks/fr-net/FRNET_Tests.default" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idec2bf8da30ccd211b21901d56979143ce3a172f Gerrit-Change-Number: 22675 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:38:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:38:58 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22675 ) Change subject: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idec2bf8da30ccd211b21901d56979143ce3a172f Gerrit-Change-Number: 22675 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 09:38:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:39:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:39:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr-net: Don't generate junit-xml output. It's not a test suite In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22673 ) Change subject: fr-net: Don't generate junit-xml output. It's not a test suite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22673 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: Id296e62fb86731492d42370173a48f217b2fbdc0 Gerrit-Change-Number: 22673 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 09:39:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:39:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:39:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr-net: Don't generate junit-xml output. It's not a test suite In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22673 ) Change subject: fr-net: Don't generate junit-xml output. It's not a test suite ...................................................................... fr-net: Don't generate junit-xml output. It's not a test suite Change-Id: Id296e62fb86731492d42370173a48f217b2fbdc0 --- M fr-net/FRNET_Tests.cfg M fr-net/FRNET_Tests.default 2 files changed, 14 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr-net/FRNET_Tests.cfg b/fr-net/FRNET_Tests.cfg index dedd828..555b260 100644 --- a/fr-net/FRNET_Tests.cfg +++ b/fr-net/FRNET_Tests.cfg @@ -1,6 +1,8 @@ [ORDERED_INCLUDE] -# Common configuration, shared between test suites -"../Common.cfg" +# We cannot include Common.cfg, as this includes the LoggerPlugins configuration +# for junit-xml generation. However, we don't want to generate any junit-xml, +# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests +# can execute # testsuite specific configuration, not expected to change "./FRNET_Tests.default" diff --git a/fr-net/FRNET_Tests.default b/fr-net/FRNET_Tests.default index d694d98..9ec4a0c 100644 --- a/fr-net/FRNET_Tests.default +++ b/fr-net/FRNET_Tests.default @@ -1,10 +1,16 @@ [ORDERED_INCLUDE] -# Common configuration, shared between test suites -"../Common.cfg" +# We cannot include Common.cfg, as this includes the LoggerPlugins configuration +# for junit-xml generation. However, we don't want to generate any junit-xml, +# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests +# can execute [LOGGING] -#*.FileMask := LOG_ALL -ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER +LogFile := "%e-%c-%h-%r.%s" +AppendFile := Yes; +SourceInfoFormat := Single; +LogSourceInfo := Yes; +FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP; [MODULE_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22673 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: Id296e62fb86731492d42370173a48f217b2fbdc0 Gerrit-Change-Number: 22673 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:39:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:39:28 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22675 ) Change subject: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idec2bf8da30ccd211b21901d56979143ce3a172f Gerrit-Change-Number: 22675 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 09:39:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:39:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:39:30 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22675 ) Change subject: ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests ...................................................................... ttcn3-fr-tests: Disable junit-xml generation for FRNET_Tests FRNET_Tests is not a test suite, but just a stub against which we execute FR_Tests. Hence, we don't want it to generate a junit-xml, as that doesn't contain any errors and only upsets our jenkins test results analyzer, assuming the tests have failed. Change-Id: Idec2bf8da30ccd211b21901d56979143ce3a172f Requires: osmo-ttcn3-hacks.git Id296e62fb86731492d42370173a48f217b2fbdc0 --- M ttcn3-fr-test/FRNET_Tests.cfg 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-fr-test/FRNET_Tests.cfg b/ttcn3-fr-test/FRNET_Tests.cfg index cd208e6..df2a27c 100644 --- a/ttcn3-fr-test/FRNET_Tests.cfg +++ b/ttcn3-fr-test/FRNET_Tests.cfg @@ -1,6 +1,8 @@ [ORDERED_INCLUDE] -# Common configuration, shared between test suites -"/osmo-ttcn3-hacks/Common.cfg" +# We cannot include Common.cfg, as this includes the LoggerPlugins configuration +# for junit-xml generation. However, we don't want to generate any junit-xml, +# as FRNET_Tests really is not a test suite, but just a stub against which FR_Tests +# can execute # testsuite specific configuration, not expected to change "/osmo-ttcn3-hacks/fr-net/FRNET_Tests.default" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idec2bf8da30ccd211b21901d56979143ce3a172f Gerrit-Change-Number: 22675 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 09:48:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 09:48:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr/fr-net: Use four parallel FR NS-VC instead of just one References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 ) Change subject: fr/fr-net: Use four parallel FR NS-VC instead of just one ...................................................................... fr/fr-net: Use four parallel FR NS-VC instead of just one Related: OS#4974 Change-Id: I366ceea525c09236f5432ba043a757e593d4ed0e --- M fr-net/FRNET_Tests.ttcn M fr/FR_Tests.ttcn 2 files changed, 52 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/22676/1 diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn index 3943ff1..bc6e513 100644 --- a/fr-net/FRNET_Tests.ttcn +++ b/fr-net/FRNET_Tests.ttcn @@ -19,10 +19,34 @@ provider := { fr := { netdev := "hdlcnet1", - dlci := 123 + dlci := 1 } }, - nsvci := 123 + nsvci := 101 + }, { + provider := { + fr := { + netdev := "hdlcnet2", + dlci := 2 + } + }, + nsvci := 102 + }, { + provider := { + fr := { + netdev := "hdlcnet3", + dlci := 3 + } + }, + nsvci := 103 + }, { + provider := { + fr := { + netdev := "hdlcnet4", + dlci := 4 + } + }, + nsvci := 104 } } } diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 5f58bc3..311cab6 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -24,10 +24,34 @@ provider := { fr := { netdev := "hdlc1", - dlci := 123 + dlci := 1 } }, - nsvci := 123 + nsvci := 101 + }, { + provider := { + fr := { + netdev := "hdlc2", + dlci := 2 + } + }, + nsvci := 102 + }, { + provider := { + fr := { + netdev := "hdlc3", + dlci := 3 + } + }, + nsvci := 103 + }, { + provider := { + fr := { + netdev := "hdlc4", + dlci := 4 + } + }, + nsvci := 104 } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 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: I366ceea525c09236f5432ba043a757e593d4ed0e Gerrit-Change-Number: 22676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 10:25:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 10:25:54 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22669/1/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/c/libosmocore/+/22669/1/src/gsm/gsm48.c at 1305 PS1, Line 1305: int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2) > I think checking for equality like you did is okay in this case, but I would rename the function sin [?] Agree, either call it _equal() and return bool or _cmp() and return -1|0|1. If you want to compare only the LAI bits, I'd add an extra API gsm48_ra_cmp_lai() which at the same time can be reused by gsm48_ra_cmp() internally. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Comment-Date: Thu, 04 Feb 2021 10:25:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 10:27:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 10:27:41 +0000 Subject: Change in docker-playground[master]: gbproxy-fr: Wait for interface to be _up_ not just its existance In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22674 ) Change subject: gbproxy-fr: Wait for interface to be _up_ not just its existance ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bfb6eb925bca4e4e1901e06eed831152cddbbe2 Gerrit-Change-Number: 22674 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 10:27:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 10:29:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 10:29:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr/fr-net: Use four parallel FR NS-VC instead of just one In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 ) Change subject: fr/fr-net: Use four parallel FR NS-VC instead of just one ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 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: I366ceea525c09236f5432ba043a757e593d4ed0e Gerrit-Change-Number: 22676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 10:29:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 10:55:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 10:55:20 +0000 Subject: Change in osmo-bts[master]: pcu_sock: fix uninitalized returncode value References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22677 ) Change subject: pcu_sock: fix uninitalized returncode value ...................................................................... pcu_sock: fix uninitalized returncode value In function pcu_tx_si_all(), the variable rc is not initalized. If pcu_tx_si() fails, then rc is populated with value -EINVAL, but if all si transmissions succeed, which is the normal case, rc remains uninitalized. Change-Id: I571fdb4f175fb259b77f989554f569fc2230dfe6 Related: CID#216932 --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/22677/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fb32773..9f96c9d 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -771,7 +771,7 @@ enum osmo_sysinfo_type si_types[3] = { SYSINFO_TYPE_1, SYSINFO_TYPE_3, SYSINFO_TYPE_13 }; unsigned int i; - int rc; + int rc = 0; for (i = 0; i < ARRAY_SIZE(si_types); i++) { if (GSM_BTS_HAS_SI(bts, si_types[i])) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I571fdb4f175fb259b77f989554f569fc2230dfe6 Gerrit-Change-Number: 22677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:08:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 11:08:43 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix possible null pointer dereference References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22678 ) Change subject: assignment_fsm: fix possible null pointer dereference ...................................................................... assignment_fsm: fix possible null pointer dereference It assignment_success(), conn_get_bts() is called to get the BTS struct from the connection. However, it is not checked whether the function actually returned a pointer. The bts struct is used to check if it is a siemens BTS using is_siemens_bts(), so lets just check before we pass on the bts pointer. Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Related: CID#216933 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/22678/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index e5ef1c5..88083ba 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -232,7 +232,7 @@ conn->assignment.new_lchan = NULL; bts = conn_get_bts(conn); - if (is_siemens_bts(bts) && ts_is_tch(conn->lchan->ts)) { + if (bts && is_siemens_bts(bts) && ts_is_tch(conn->lchan->ts)) { /* HACK: store the actual Classmark 2 LV from the subscriber and use it here! */ uint8_t cm2_lv[] = { 0x02, 0x00, 0x00 }; send_siemens_mrpci(conn->lchan, cm2_lv); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Gerrit-Change-Number: 22678 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:41:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:41:17 +0000 Subject: Change in osmo-bts[master]: pcu_sock: fix uninitalized returncode value In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22677 ) Change subject: pcu_sock: fix uninitalized returncode value ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I571fdb4f175fb259b77f989554f569fc2230dfe6 Gerrit-Change-Number: 22677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 11:41:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:42:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:42:13 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix possible null pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22678 ) Change subject: assignment_fsm: fix possible null pointer dereference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Gerrit-Change-Number: 22678 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 11:42:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:42:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:42:32 +0000 Subject: Change in libosmocore[master]: Fix struct bitfields on big endian systems References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22679 ) Change subject: Fix struct bitfields on big endian systems ...................................................................... Fix struct bitfields on big endian systems Changes done by contrib/struct_endianess.py. Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 --- M include/osmocom/gprs/protocol/gsm_08_18.h M include/osmocom/gsm/protocol/gsm_23_032.h M src/gb/frame_relay.c 3 files changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/22679/1 diff --git a/include/osmocom/gprs/protocol/gsm_08_18.h b/include/osmocom/gprs/protocol/gsm_08_18.h index c10c244..0d002b5 100644 --- a/include/osmocom/gprs/protocol/gsm_08_18.h +++ b/include/osmocom/gprs/protocol/gsm_08_18.h @@ -4,6 +4,7 @@ #pragma once #include +#include /*! Fixed BVCI definitions (Section 5.4.1) */ #define BVCI_SIGNALLING 0x0000 diff --git a/include/osmocom/gsm/protocol/gsm_23_032.h b/include/osmocom/gsm/protocol/gsm_23_032.h index 5be98a2..a4c0506 100644 --- a/include/osmocom/gsm/protocol/gsm_23_032.h +++ b/include/osmocom/gsm/protocol/gsm_23_032.h @@ -50,8 +50,13 @@ }; struct gad_raw_head { +#if OSMO_IS_LITTLE_ENDIAN uint8_t spare:4, type:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t type:4, spare:4; +#endif } __attribute__ ((packed)); struct gad_raw_ell_point { @@ -61,14 +66,23 @@ } __attribute__ ((packed)); struct gad_raw_ell_point_unc_circle { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_CIRCLE */ uint8_t lat[3]; uint8_t lon[3]; uint8_t unc:7, spare2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t spare2:1, unc:7; +#endif } __attribute__ ((packed)); struct gad_raw_ell_point_unc_ellipse { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_ELLIPSE */ uint8_t lat[3]; uint8_t lon[3]; @@ -79,12 +93,27 @@ uint8_t major_ori; uint8_t confidence:7, spare3:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t spare1:1, unc_semi_major:7; + uint8_t spare2:1, unc_semi_minor:7; + uint8_t major_ori; + uint8_t spare3:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_polygon { struct { +#if OSMO_IS_LITTLE_ENDIAN uint8_t num_points:4; uint8_t type:4; /*!< type = GAD_TYPE_POLYGON */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t type:4, num_points:4; +#endif } h; struct { uint8_t lat[3]; @@ -100,6 +129,7 @@ } __attribute__ ((packed)); struct gad_raw_ell_point_alt_unc_ell { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_ALT_UNC_ELL */ uint8_t lat[3]; uint8_t lon[3]; @@ -113,9 +143,22 @@ spare3:1; uint8_t confidence:7, spare4:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t alt[2]; + uint8_t spare1:1, unc_semi_major:7; + uint8_t spare2:1, unc_semi_minor:7; + uint8_t major_ori; + uint8_t spare3:1, unc_alt:7; + uint8_t spare4:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_ell_arc { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_ARC */ uint8_t lat[3]; uint8_t lon[3]; @@ -126,9 +169,21 @@ uint8_t incl_angle; uint8_t confidence:7, spare2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t inner_r[2]; + uint8_t spare1:1, unc_r:7; + uint8_t ofs_angle; + uint8_t incl_angle; + uint8_t spare2:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_ha_ell_point_unc_ell { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE */ uint8_t lat[4]; uint8_t lon[4]; @@ -138,9 +193,21 @@ uint8_t major_ori; uint8_t confidence:7, spare1:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[4]; + uint8_t lon[4]; + uint8_t alt[3]; + uint8_t unc_semi_major; + uint8_t unc_semi_minor; + uint8_t major_ori; + uint8_t spare1:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_ha_ell_point_alt_unc_ell { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_ALT_UNC_ELL */ uint8_t lat[4]; uint8_t lon[4]; @@ -153,6 +220,19 @@ uint8_t unc_alt; uint8_t v_confidence:7, spare2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[4]; + uint8_t lon[4]; + uint8_t alt[3]; + uint8_t unc_semi_major; + uint8_t unc_semi_minor; + uint8_t major_ori; + uint8_t spare1:1, h_confidence:7; + uint8_t unc_alt; + uint8_t spare2:1, v_confidence:7; +#endif } __attribute__ ((packed)); /*! GAD PDU in network-byte-order according to 3GPP TS 23.032 GAD: Universal Geographical Area Description. */ diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 96f51cf..cdf9ee8 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -123,6 +123,7 @@ /* Value part of the Q.933 Annex A.3.3 IE */ struct q933_a_pvc_sts { +#if OSMO_IS_LITTLE_ENDIAN uint8_t dlci_msb:6, spare:1, ext0:1; @@ -136,6 +137,12 @@ spare2:3, ext2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ext0:1, spare:1, dlci_msb:6; + uint8_t ext1:1, dlci_lsb:4, space1:3; + uint8_t ext2:1, spare2:3, new:1, delete:1, active:1, reserved:1; +#endif } __attribute__((packed)); /* RX Message: 14 [ 00 01 03 08 00 75 95 01 01 00 03 02 01 00 ] */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 Gerrit-Change-Number: 22679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:45:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:45:02 +0000 Subject: Change in libgtpnl[HEAD]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/22680 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/80/22680/1 diff --git a/.gitignore b/.gitignore index ede9b4e..738b3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .deps .libs .dirstamp +*~ # Generated by autoconf/configure Makefile -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: HEAD Gerrit-Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 Gerrit-Change-Number: 22680 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:45:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:45:07 +0000 Subject: Change in libgtpnl[master]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/22681 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/81/22681/1 diff --git a/.gitignore b/.gitignore index ede9b4e..738b3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .deps .libs .dirstamp +*~ # Generated by autoconf/configure Makefile -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 Gerrit-Change-Number: 22681 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:45:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:45:59 +0000 Subject: Change in libsmpp34[master]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/22682 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Ibdc5bd9ec0e4d95aa9e358502035806ade5a9521 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/82/22682/1 diff --git a/.gitignore b/.gitignore index 602e974..474a5d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ autom4te.cache aux_config .*.swp +*~ configure INSTALL Makefile -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/22682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ibdc5bd9ec0e4d95aa9e358502035806ade5a9521 Gerrit-Change-Number: 22682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:46:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:46:37 +0000 Subject: Change in osmo-hlr[master]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22683 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: I155e9fd644263a8b47301f6b0986b9beb5a45d0f --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/83/22683/1 diff --git a/.gitignore b/.gitignore index 3d9c81b..fe53f71 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ *.m4 missing .deps +*~ *.pc .libs -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I155e9fd644263a8b47301f6b0986b9beb5a45d0f Gerrit-Change-Number: 22683 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:48:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:48:41 +0000 Subject: Change in osmo-sgsn[master]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22684 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: I20b03d40214fe1822aab8df01e3c79404a795f01 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/84/22684/1 diff --git a/.gitignore b/.gitignore index 546d5df..466a744 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ *.pyc *.gcda *.gcno +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I20b03d40214fe1822aab8df01e3c79404a795f01 Gerrit-Change-Number: 22684 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:49:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:49:45 +0000 Subject: Change in osmo-sgsn[master]: sndcp: Fix struct bit fields on big endian References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22685 ) Change subject: sndcp: Fix struct bit fields on big endian ...................................................................... sndcp: Fix struct bit fields on big endian Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7 --- M src/sgsn/gprs_sndcp.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/85/22685/1 diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index 19d8712..b237bf9 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -164,27 +165,43 @@ /* Chapter 7.2: SN-PDU Formats */ struct sndcp_common_hdr { +#if OSMO_IS_LITTLE_ENDIAN /* octet 1 */ uint8_t nsapi:4; uint8_t more:1; uint8_t type:1; uint8_t first:1; uint8_t spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, first:1, type:1, more:1, nsapi:4; +#endif } __attribute__((packed)); /* PCOMP / DCOMP only exist in first fragment */ struct sndcp_comp_hdr { +#if OSMO_IS_LITTLE_ENDIAN /* octet 2 */ uint8_t pcomp:4; uint8_t dcomp:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t dcomp:4, pcomp:4; +#endif } __attribute__((packed)); struct sndcp_udata_hdr { +#if OSMO_IS_LITTLE_ENDIAN /* octet 3 */ uint8_t npdu_high:4; uint8_t seg_nr:4; /* octet 4 */ uint8_t npdu_low; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t seg_nr:4, npdu_high:4; + uint8_t npdu_low; +#endif } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:50:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:50:32 +0000 Subject: Change in osmo-mgw[master]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/22686 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: I792f5cd80bee6572ee60269ac44a12d10b5e3a5f --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/22686/1 diff --git a/.gitignore b/.gitignore index d3324bb..5175438 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.gcda *.gcno *.pc +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/22686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I792f5cd80bee6572ee60269ac44a12d10b5e3a5f Gerrit-Change-Number: 22686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:51:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:51:44 +0000 Subject: Change in osmo-msc[master]: .gitignore: Ignore new autofoo tmp files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22687 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Ifb9dfe84575451fdfc9d059bab428da82b448107 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/87/22687/1 diff --git a/.gitignore b/.gitignore index ece4ee7..eaff7cd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ *.pyc *.gcda *.gcno +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifb9dfe84575451fdfc9d059bab428da82b448107 Gerrit-Change-Number: 22687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 11:59:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 11:59:55 +0000 Subject: Change in osmo-pcu[master]: rlc.h: Fix struct bit fields on big endian systems References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22688 ) Change subject: rlc.h: Fix struct bit fields on big endian systems ...................................................................... rlc.h: Fix struct bit fields on big endian systems Related: OS#5003 Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883 --- M src/rlc.h 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/22688/1 diff --git a/src/rlc.h b/src/rlc.h index bcc738c..45cbb95 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -377,8 +377,8 @@ extern "C" { /* TS 44.060 10.2.2 */ -#if OSMO_IS_LITTLE_ENDIAN struct rlc_ul_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -389,9 +389,16 @@ spare:1; uint8_t e:1, bsn:7; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t pt:2, cv:4, si:1, r:1; + uint8_t spare:1, pi:1, tfi:5, ti:1; + uint8_t bsn:7, e:1; +#endif } __attribute__ ((packed)); struct rlc_dl_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, s_p:1, rrbp:2, @@ -401,21 +408,34 @@ pr:2; uint8_t e:1, bsn:7; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t pt:2, rrbp:2, s_p:1, usf:3; + uint8_t pr:2, tfi:5, fbi:1; + uint8_t bsn:7, e:1; +#endif } __attribute__ ((packed)); struct rlc_li_field { +#if OSMO_IS_LITTLE_ENDIAN uint8_t e:1, m:1, li:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t li:6, m:1, e:1; +#endif } __attribute__ ((packed)); struct rlc_li_field_egprs { +#if OSMO_IS_LITTLE_ENDIAN uint8_t e:1, li:7; -} __attribute__ ((packed)); -#else -# error "Only little endian headers are supported yet. TODO: add missing structs" +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t li:7, e:1; #endif +} __attribute__ ((packed)); } inline bool gprs_rlc_v_b::is_state(int bsn, const gprs_rlc_dl_bsn_state type) const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883 Gerrit-Change-Number: 22688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 12:40:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 4 Feb 2021 12:40:41 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): make 'si_types' const References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22689 ) Change subject: pcu_sock: pcu_tx_si_all(): make 'si_types' const ...................................................................... pcu_sock: pcu_tx_si_all(): make 'si_types' const Change-Id: I0a6b0191187af2e14c9264c571afe53fc256d8ce --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/22689/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fb32773..454f921 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -768,7 +768,7 @@ static int pcu_tx_si_all(struct gsm_bts *bts) { - enum osmo_sysinfo_type si_types[3] = + const enum osmo_sysinfo_type si_types[3] = { SYSINFO_TYPE_1, SYSINFO_TYPE_3, SYSINFO_TYPE_13 }; unsigned int i; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a6b0191187af2e14c9264c571afe53fc256d8ce Gerrit-Change-Number: 22689 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 12:40:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 4 Feb 2021 12:40:42 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): cosmetic coding style change References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22690 ) Change subject: pcu_sock: pcu_tx_si_all(): cosmetic coding style change ...................................................................... pcu_sock: pcu_tx_si_all(): cosmetic coding style change Change-Id: I11f60ecdd3cfa2132d58fd3034bfe7419df0edb6 --- M src/common/pcu_sock.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/22690/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 454f921..d7092f9 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -778,10 +778,11 @@ rc = pcu_tx_si(bts, si_types[i], true); if (rc < 0) rc = -EINVAL; - } else + } else { LOGP(DPCU, LOGL_INFO, "SI%s is not available on PCU connection\n", get_value_string(osmo_sitype_strs, si_types[i])); + } } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I11f60ecdd3cfa2132d58fd3034bfe7419df0edb6 Gerrit-Change-Number: 22690 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 12:40:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 4 Feb 2021 12:40:42 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22691 ) Change subject: pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc ...................................................................... pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc Change-Id: Ic78614bebade701db14439aa64ecf89c7104a639 Fixes: CID#216932 --- M src/common/pcu_sock.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/22691/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index d7092f9..250491f 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -777,7 +777,7 @@ if (GSM_BTS_HAS_SI(bts, si_types[i])) { rc = pcu_tx_si(bts, si_types[i], true); if (rc < 0) - rc = -EINVAL; + return rc; } else { LOGP(DPCU, LOGL_INFO, "SI%s is not available on PCU connection\n", @@ -785,7 +785,7 @@ } } - return rc; + return 0; } static int pcu_rx_txt_ind(struct gsm_bts *bts, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic78614bebade701db14439aa64ecf89c7104a639 Gerrit-Change-Number: 22691 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:24:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 4 Feb 2021 13:24:07 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: assert the result of conn_get_bts() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22692 ) Change subject: assignment_fsm: assert the result of conn_get_bts() ...................................................................... assignment_fsm: assert the result of conn_get_bts() Change-Id: I036f2d895e3569bd050ce574759f8371bd19cec9 Fixes: CID#216933 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/22692/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index e5ef1c5..8bb879f 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -231,7 +231,7 @@ gscon_change_primary_lchan(conn, conn->assignment.new_lchan); conn->assignment.new_lchan = NULL; - bts = conn_get_bts(conn); + OSMO_ASSERT((bts = conn_get_bts(conn)) != NULL); if (is_siemens_bts(bts) && ts_is_tch(conn->lchan->ts)) { /* HACK: store the actual Classmark 2 LV from the subscriber and use it here! */ uint8_t cm2_lv[] = { 0x02, 0x00, 0x00 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I036f2d895e3569bd050ce574759f8371bd19cec9 Gerrit-Change-Number: 22692 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:44:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 4 Feb 2021 13:44:40 +0000 Subject: Change in osmo-pcu[master]: rlc.h: Fix struct bit fields on big endian systems In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22688 ) Change subject: rlc.h: Fix struct bit fields on big endian systems ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883 Gerrit-Change-Number: 22688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 04 Feb 2021 13:44:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:58:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 13:58:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: UE_CT: Store BVCI + CellId in each UE References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22693 ) Change subject: fr: UE_CT: Store BVCI + CellId in each UE ...................................................................... fr: UE_CT: Store BVCI + CellId in each UE Change-Id: I1a25a03e17b3d957763512dc4acda134338df3be --- M fr/FR_Tests.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/22693/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 311cab6..a2c5e82 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -119,7 +119,9 @@ type record UE_Pars { hexstring imsi, OCT4 tlli, - float tguard + float tguard, + BssgpBvci bvci, + BssgpCellId cell_id }; type function void_fn(charstring id) runs on UE_CT; @@ -158,14 +160,16 @@ } /* start a single UE component; connect it to BSSGP */ -function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) +function f_start_ue(void_fn fn, charstring id, BssgpBvcConfig bvc, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) runs on test_CT return UE_CT { var UE_CT ue_comp; var UE_Pars ue_pars := { imsi := f_gen_imsi(imsi_suffix), tlli := f_gprs_tlli_random(), - tguard := t_guard + tguard := t_guard, + bvci := bvc.bvci, + cell_id := bvc.cell_id }; ue_comp := UE_CT.create(id); @@ -203,7 +207,7 @@ for (var integer k := 0; k < ue_per_bvc; k := k+1) { var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k); var UE_CT ue; - ue := f_start_ue(ue_fn, id, g_gb[i], i*10000+j*100+k, bvc_comp, + ue := f_start_ue(ue_fn, id, g_gb[i].cfg.bvc[j], i*10000+j*100+k, bvc_comp, ue_tguard); ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22693 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: I1a25a03e17b3d957763512dc4acda134338df3be Gerrit-Change-Number: 22693 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:58:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 13:58:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22694 ) Change subject: fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used ...................................................................... fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used This allows us to have bi-directional tests Change-Id: I7637ee5f1a7cce0ed282c972b9cd0702ba86cbaa --- M fr-net/FRNET_Tests.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/22694/1 diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn index bc6e513..c3ec468 100644 --- a/fr-net/FRNET_Tests.ttcn +++ b/fr-net/FRNET_Tests.ttcn @@ -6,6 +6,8 @@ import from NS_Emulation all; import from BSSGP_Emulation all; +import from LLC_Types all; +import from LLC_Templates all; modulepar { integer mp_num_bvc := 10; @@ -69,7 +71,19 @@ private function CreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli, BssgpDecoded dec) runs on BSSGP_BVC_CT { - /* simply ignore any inbound traffic for now */ + if (ischosen(dec.bssgp.pDU_BSSGP_UL_UNITDATA)) { + var PDU_LLC llc_rx := dec_PDU_LLC(dec.bssgp.pDU_BSSGP_UL_UNITDATA.lLC_PDU.lLC_PDU) + select (llc_rx) { + case (tr_LLC_UI(sapi := '0010'B)) { + //log("BVCI=", bvci, ", CellId=", cell_id, ", TLLI=", tlli, ", BSSGP=", dec); + /* mirror back as DL-UNITDATA */ + BVC.send(ts_ptp_BnsUdReq(ts_BSSGP_DL_UD(tlli, dec.bssgp.pDU_BSSGP_UL_UNITDATA.lLC_PDU.lLC_PDU), bvci, oct2int(tlli))); + } + case else { + /* simply ignore any inbound traffic for now */ + } + } + } } private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22694 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: I7637ee5f1a7cce0ed282c972b9cd0702ba86cbaa Gerrit-Change-Number: 22694 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:58:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 13:58:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Don't respond to NS-STATUS with NS-STATUS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22695 ) Change subject: NS_Emulation: Don't respond to NS-STATUS with NS-STATUS ...................................................................... NS_Emulation: Don't respond to NS-STATUS with NS-STATUS Change-Id: Id9544ed1a7686fe113c4f6671e482bffc84bd2cc --- M library/NS_Emulation.ttcnpp 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/22695/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index ec3386f..34bbcd9 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -662,6 +662,10 @@ [g_config.handle_sns and ischosen(g_nsvc_config.provider.ip)] as_nsvc_sns(); + /* log + ignore NS-STATUS; must not create another NS-STATUS in response */ + [] NSCP.receive(tr_NS_STATUS(?)) -> value rf { + log("Rx NS-STATUS ", rf," in state ", vc_state); + } /* default case of handling unknown PDUs */ [] NSCP.receive(PDU_NS: ?) -> value rf { log("Rx Unexpected NS PDU ", rf," in state ", vc_state); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22695 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: Id9544ed1a7686fe113c4f6671e482bffc84bd2cc Gerrit-Change-Number: 22695 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:58:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 13:58:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Add TC_ul2dl_ud References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22696 ) Change subject: fr: Add TC_ul2dl_ud ...................................................................... fr: Add TC_ul2dl_ud This test case tests NS-UL-UNITDATA transmit and expectes the exact same LLC PDU to be sent back as NS-DL-UNITDATA. This way we can verify that both uplink and downlink paths are working, and that no messages are lost. It works stable here on my laptop, showing that if we test the TTCN3 NS + BSSGP code over a E1 line against another instance (fr against fr-net) works reliable. Change-Id: Ic115af02207c9b9f4c84fa75890048acb6856c79 --- M fr/FR_Tests.ttcn 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/22696/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index a2c5e82..974765e 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -6,6 +6,7 @@ import from NS_Emulation all; import from BSSGP_Emulation all; +import from LLC_Types all; import from LLC_Templates all; modulepar { @@ -256,9 +257,50 @@ } +private function f_ul2dl_ud(charstring id) runs on UE_CT +{ + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { + var integer ran_index := 0; + var template (value) PDU_LLC llc_tx; + var template (present) PDU_LLC llc_rx_exp; + var PDU_LLC llc_rx; + timer T := 5.0; + + /* SAPI '0010'B is looped back by FRNET_Tests.ttcn */ + llc_tx := ts_LLC_UI(f_rnd_octstring(512), '0010'B, '1'B, 0); + llc_rx_exp := llc_tx; + llc_rx_exp.pDU_LLC_UI.fCS := ?; + + //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.cell_id, llc_enc)); + BSSGP[ran_index].send(llc_tx); + T.start; + alt { + [] BSSGP[ran_index].receive(llc_rx_exp) -> value llc_rx { } + [] BSSGP[ran_index].receive(PDU_LLC:?) -> value llc_rx { + setverdict(fail, "Unexpected LLC: ", llc_rx); + break; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", llc_rx_exp); + break; + } + } + //f_sleep(0.1); + /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ + /* at 100 UE that ends up about 870 kBps */ + } +} +/* Generate uplink-unitdata traffic */ +testcase TC_ul2dl_ud() runs on test_CT +{ + f_tc_body(refers(f_ul2dl_ud), ue_tguard := 100.0); +} + + control { execute( TC_bvc_bringup() ); execute( TC_ul_ud() ); + execute( TC_ul2dl_ud() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22696 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: Ic115af02207c9b9f4c84fa75890048acb6856c79 Gerrit-Change-Number: 22696 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:58:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 13:58:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Randomize packet size used in TC_ul2dl_ud() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22697 ) Change subject: fr: Randomize packet size used in TC_ul2dl_ud() ...................................................................... fr: Randomize packet size used in TC_ul2dl_ud() This allows us to test with a variety of packet sizes up to [close to] the MTU of the underlying transport (configurable by modulepar) Change-Id: I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b --- M fr/FR_Tests.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/22697/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 974765e..5e4f9e8 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -10,6 +10,8 @@ import from LLC_Templates all; modulepar { + /* NS transport layer MTU (NS header and anything after it) */ + integer mp_ns_mtu := 1500; /* number of BVCs to bring up in one Gb instance */ integer mp_num_bvc := 10; /* number of UEs to start in each PTP BVC */ @@ -59,6 +61,15 @@ }; } +/* 4 bytes NS-UNITDATA, + * >= 12 Bytes DL-UNITDATA or 18 bytes BSSGP UL-UNITDATA + * 3 bytes LLC UI header + * 3 bytes LLC FCS + * <= 3 bytes optional padding + * --> at least 31 bytes required + */ +const integer c_LLC_BSSGP_NS_overhead := 40; + type record GbInstance { NS_CT vc_NS, BSSGP_CT vc_BSSGP, @@ -259,15 +270,18 @@ private function f_ul2dl_ud(charstring id) runs on UE_CT { + var integer max_llc_payload_len := mp_ns_mtu - c_LLC_BSSGP_NS_overhead; + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { var integer ran_index := 0; var template (value) PDU_LLC llc_tx; var template (present) PDU_LLC llc_rx_exp; + var octetstring llc_payload := f_rnd_octstring(f_rnd_int(max_llc_payload_len)); var PDU_LLC llc_rx; timer T := 5.0; /* SAPI '0010'B is looped back by FRNET_Tests.ttcn */ - llc_tx := ts_LLC_UI(f_rnd_octstring(512), '0010'B, '1'B, 0); + llc_tx := ts_LLC_UI(llc_payload, '0010'B, '1'B, 0); llc_rx_exp := llc_tx; llc_rx_exp.pDU_LLC_UI.fCS := ?; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22697 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: I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b Gerrit-Change-Number: 22697 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 13:58:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 13:58:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Don't write TIMEROP_START to ConsoleLog References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22698 ) Change subject: fr: Don't write TIMEROP_START to ConsoleLog ...................................................................... fr: Don't write TIMEROP_START to ConsoleLog There is quite a number of them, as we start 100 UE components plus associated structure underneath. Let's avoid spamming the console. Change-Id: I6621ac6094de310e974ce0438d01fca868719eb1 --- M fr/FR_Tests.default 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/22698/1 diff --git a/fr/FR_Tests.default b/fr/FR_Tests.default index d7afd31..df65d61 100644 --- a/fr/FR_Tests.default +++ b/fr/FR_Tests.default @@ -4,7 +4,7 @@ [LOGGING] #*.FileMask := LOG_ALL -ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER +ConsoleMask := ERROR | WARNING | TESTCASE | USER [MODULE_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22698 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: I6621ac6094de310e974ce0438d01fca868719eb1 Gerrit-Change-Number: 22698 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:02:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:02:27 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Configure MTU to 1700 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22699 ) Change subject: ttcn3-fr-tests: Configure MTU to 1700 ...................................................................... ttcn3-fr-tests: Configure MTU to 1700 On our deb10fr VMs we have the modified kernel HDLC module supporting the frame relay MTU up to 1700 bytes, so let's extend our tests to cover that. Mainline kernels only support 1500 bytes. Depends: osmo-ttcn3-hacks.git I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b Change-Id: Id25532edbf5e1a918ad038723da464723d6f03f0 --- M ttcn3-fr-test/FR_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/99/22699/1 diff --git a/ttcn3-fr-test/FR_Tests.cfg b/ttcn3-fr-test/FR_Tests.cfg index d2cff40..e2bf657 100644 --- a/ttcn3-fr-test/FR_Tests.cfg +++ b/ttcn3-fr-test/FR_Tests.cfg @@ -8,6 +8,7 @@ ConsoleMask := ERROR | WARNING | TESTCASE | USER [MODULE_PARAMETERS] +FR_Tests.mp_ns_mtu := 1700 [TESTPORT_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id25532edbf5e1a918ad038723da464723d6f03f0 Gerrit-Change-Number: 22699 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:03:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:03:40 +0000 Subject: Change in libgtpnl[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22681 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 Gerrit-Change-Number: 22681 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:03:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:03:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:03:42 +0000 Subject: Change in libgtpnl[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22681 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index ede9b4e..738b3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .deps .libs .dirstamp +*~ # Generated by autoconf/configure Makefile -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Iaf853783679815e74b6b8e5f3e8631c53ed20613 Gerrit-Change-Number: 22681 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:11 +0000 Subject: Change in libosmocore[master]: Fix struct bitfields on big endian systems In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22679 ) Change subject: Fix struct bitfields on big endian systems ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 Gerrit-Change-Number: 22679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:14 +0000 Subject: Change in libsmpp34[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/22682 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/22682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ibdc5bd9ec0e4d95aa9e358502035806ade5a9521 Gerrit-Change-Number: 22682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:16 +0000 Subject: Change in libsmpp34[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/22682 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Ibdc5bd9ec0e4d95aa9e358502035806ade5a9521 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 602e974..474a5d6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ autom4te.cache aux_config .*.swp +*~ configure INSTALL Makefile -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/22682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ibdc5bd9ec0e4d95aa9e358502035806ade5a9521 Gerrit-Change-Number: 22682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:18 +0000 Subject: Change in osmo-hlr[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22683 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I155e9fd644263a8b47301f6b0986b9beb5a45d0f Gerrit-Change-Number: 22683 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:20 +0000 Subject: Change in osmo-hlr[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22683 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: I155e9fd644263a8b47301f6b0986b9beb5a45d0f --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 3d9c81b..fe53f71 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ *.m4 missing .deps +*~ *.pc .libs -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I155e9fd644263a8b47301f6b0986b9beb5a45d0f Gerrit-Change-Number: 22683 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:22 +0000 Subject: Change in osmo-mgw[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/22686 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/22686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I792f5cd80bee6572ee60269ac44a12d10b5e3a5f Gerrit-Change-Number: 22686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:24 +0000 Subject: Change in osmo-mgw[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/22686 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: I792f5cd80bee6572ee60269ac44a12d10b5e3a5f --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index d3324bb..5175438 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.gcda *.gcno *.pc +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/22686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I792f5cd80bee6572ee60269ac44a12d10b5e3a5f Gerrit-Change-Number: 22686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:25 +0000 Subject: Change in osmo-sgsn[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22684 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I20b03d40214fe1822aab8df01e3c79404a795f01 Gerrit-Change-Number: 22684 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:27 +0000 Subject: Change in osmo-sgsn[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22684 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: I20b03d40214fe1822aab8df01e3c79404a795f01 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 546d5df..466a744 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ *.pyc *.gcda *.gcno +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I20b03d40214fe1822aab8df01e3c79404a795f01 Gerrit-Change-Number: 22684 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:38 +0000 Subject: Change in osmo-sgsn[master]: sndcp: Fix struct bit fields on big endian In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22685 ) Change subject: sndcp: Fix struct bit fields on big endian ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:41 +0000 Subject: Change in osmo-sgsn[master]: sndcp: Fix struct bit fields on big endian In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22685 ) Change subject: sndcp: Fix struct bit fields on big endian ...................................................................... sndcp: Fix struct bit fields on big endian Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7 --- M src/sgsn/gprs_sndcp.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index 19d8712..b237bf9 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -164,27 +165,43 @@ /* Chapter 7.2: SN-PDU Formats */ struct sndcp_common_hdr { +#if OSMO_IS_LITTLE_ENDIAN /* octet 1 */ uint8_t nsapi:4; uint8_t more:1; uint8_t type:1; uint8_t first:1; uint8_t spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, first:1, type:1, more:1, nsapi:4; +#endif } __attribute__((packed)); /* PCOMP / DCOMP only exist in first fragment */ struct sndcp_comp_hdr { +#if OSMO_IS_LITTLE_ENDIAN /* octet 2 */ uint8_t pcomp:4; uint8_t dcomp:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t dcomp:4, pcomp:4; +#endif } __attribute__((packed)); struct sndcp_udata_hdr { +#if OSMO_IS_LITTLE_ENDIAN /* octet 3 */ uint8_t npdu_high:4; uint8_t seg_nr:4; /* octet 4 */ uint8_t npdu_low; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t seg_nr:4, npdu_high:4; + uint8_t npdu_low; +#endif } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I30014bf84e7a69fa3d85d542d03e41d56506beb7 Gerrit-Change-Number: 22685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:42 +0000 Subject: Change in osmo-msc[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22687 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifb9dfe84575451fdfc9d059bab428da82b448107 Gerrit-Change-Number: 22687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:44 +0000 Subject: Change in osmo-msc[master]: .gitignore: Ignore new autofoo tmp files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22687 ) Change subject: .gitignore: Ignore new autofoo tmp files ...................................................................... .gitignore: Ignore new autofoo tmp files Change-Id: Ifb9dfe84575451fdfc9d059bab428da82b448107 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index ece4ee7..eaff7cd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ *.pyc *.gcda *.gcno +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifb9dfe84575451fdfc9d059bab428da82b448107 Gerrit-Change-Number: 22687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:04:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:04:57 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): make 'si_types' const In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22689 ) Change subject: pcu_sock: pcu_tx_si_all(): make 'si_types' const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a6b0191187af2e14c9264c571afe53fc256d8ce Gerrit-Change-Number: 22689 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:04:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:06 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): cosmetic coding style change In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22690 ) Change subject: pcu_sock: pcu_tx_si_all(): cosmetic coding style change ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I11f60ecdd3cfa2132d58fd3034bfe7419df0edb6 Gerrit-Change-Number: 22690 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:05:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:21 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22691 ) Change subject: pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic78614bebade701db14439aa64ecf89c7104a639 Gerrit-Change-Number: 22691 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:05:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:23 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): make 'si_types' const In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22689 ) Change subject: pcu_sock: pcu_tx_si_all(): make 'si_types' const ...................................................................... pcu_sock: pcu_tx_si_all(): make 'si_types' const Change-Id: I0a6b0191187af2e14c9264c571afe53fc256d8ce --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index fb32773..454f921 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -768,7 +768,7 @@ static int pcu_tx_si_all(struct gsm_bts *bts) { - enum osmo_sysinfo_type si_types[3] = + const enum osmo_sysinfo_type si_types[3] = { SYSINFO_TYPE_1, SYSINFO_TYPE_3, SYSINFO_TYPE_13 }; unsigned int i; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0a6b0191187af2e14c9264c571afe53fc256d8ce Gerrit-Change-Number: 22689 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:24 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): cosmetic coding style change In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22690 ) Change subject: pcu_sock: pcu_tx_si_all(): cosmetic coding style change ...................................................................... pcu_sock: pcu_tx_si_all(): cosmetic coding style change Change-Id: I11f60ecdd3cfa2132d58fd3034bfe7419df0edb6 --- M src/common/pcu_sock.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 454f921..d7092f9 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -778,10 +778,11 @@ rc = pcu_tx_si(bts, si_types[i], true); if (rc < 0) rc = -EINVAL; - } else + } else { LOGP(DPCU, LOGL_INFO, "SI%s is not available on PCU connection\n", get_value_string(osmo_sitype_strs, si_types[i])); + } } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I11f60ecdd3cfa2132d58fd3034bfe7419df0edb6 Gerrit-Change-Number: 22690 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:25 +0000 Subject: Change in osmo-bts[master]: pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22691 ) Change subject: pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc ...................................................................... pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc Change-Id: Ic78614bebade701db14439aa64ecf89c7104a639 Fixes: CID#216932 --- M src/common/pcu_sock.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index d7092f9..250491f 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -777,7 +777,7 @@ if (GSM_BTS_HAS_SI(bts, si_types[i])) { rc = pcu_tx_si(bts, si_types[i], true); if (rc < 0) - rc = -EINVAL; + return rc; } else { LOGP(DPCU, LOGL_INFO, "SI%s is not available on PCU connection\n", @@ -785,7 +785,7 @@ } } - return rc; + return 0; } static int pcu_rx_txt_ind(struct gsm_bts *bts, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic78614bebade701db14439aa64ecf89c7104a639 Gerrit-Change-Number: 22691 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:44 +0000 Subject: Change in osmo-pcu[master]: rlc.h: Fix struct bit fields on big endian systems In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22688 ) Change subject: rlc.h: Fix struct bit fields on big endian systems ...................................................................... rlc.h: Fix struct bit fields on big endian systems Related: OS#5003 Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883 --- M src/rlc.h 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/rlc.h b/src/rlc.h index bcc738c..45cbb95 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -377,8 +377,8 @@ extern "C" { /* TS 44.060 10.2.2 */ -#if OSMO_IS_LITTLE_ENDIAN struct rlc_ul_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -389,9 +389,16 @@ spare:1; uint8_t e:1, bsn:7; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t pt:2, cv:4, si:1, r:1; + uint8_t spare:1, pi:1, tfi:5, ti:1; + uint8_t bsn:7, e:1; +#endif } __attribute__ ((packed)); struct rlc_dl_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, s_p:1, rrbp:2, @@ -401,21 +408,34 @@ pr:2; uint8_t e:1, bsn:7; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t pt:2, rrbp:2, s_p:1, usf:3; + uint8_t pr:2, tfi:5, fbi:1; + uint8_t bsn:7, e:1; +#endif } __attribute__ ((packed)); struct rlc_li_field { +#if OSMO_IS_LITTLE_ENDIAN uint8_t e:1, m:1, li:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t li:6, m:1, e:1; +#endif } __attribute__ ((packed)); struct rlc_li_field_egprs { +#if OSMO_IS_LITTLE_ENDIAN uint8_t e:1, li:7; -} __attribute__ ((packed)); -#else -# error "Only little endian headers are supported yet. TODO: add missing structs" +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t li:7, e:1; #endif +} __attribute__ ((packed)); } inline bool gprs_rlc_v_b::is_state(int bsn, const gprs_rlc_dl_bsn_state type) const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883 Gerrit-Change-Number: 22688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:54 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: assert the result of conn_get_bts() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22692 ) Change subject: assignment_fsm: assert the result of conn_get_bts() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I036f2d895e3569bd050ce574759f8371bd19cec9 Gerrit-Change-Number: 22692 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:05:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:05:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:05:56 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: assert the result of conn_get_bts() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22692 ) Change subject: assignment_fsm: assert the result of conn_get_bts() ...................................................................... assignment_fsm: assert the result of conn_get_bts() Change-Id: I036f2d895e3569bd050ce574759f8371bd19cec9 Fixes: CID#216933 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index e5ef1c5..8bb879f 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -231,7 +231,7 @@ gscon_change_primary_lchan(conn, conn->assignment.new_lchan); conn->assignment.new_lchan = NULL; - bts = conn_get_bts(conn); + OSMO_ASSERT((bts = conn_get_bts(conn)) != NULL); if (is_siemens_bts(bts) && ts_is_tch(conn->lchan->ts)) { /* HACK: store the actual Classmark 2 LV from the subscriber and use it here! */ uint8_t cm2_lv[] = { 0x02, 0x00, 0x00 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I036f2d895e3569bd050ce574759f8371bd19cec9 Gerrit-Change-Number: 22692 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:06:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:06:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr/fr-net: Use four parallel FR NS-VC instead of just one In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 ) Change subject: fr/fr-net: Use four parallel FR NS-VC instead of just one ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 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: I366ceea525c09236f5432ba043a757e593d4ed0e Gerrit-Change-Number: 22676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:06:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:06:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:06:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: UE_CT: Store BVCI + CellId in each UE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22693 ) Change subject: fr: UE_CT: Store BVCI + CellId in each UE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22693 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: I1a25a03e17b3d957763512dc4acda134338df3be Gerrit-Change-Number: 22693 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:06:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:06:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:06:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22694 ) Change subject: fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22694 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: I7637ee5f1a7cce0ed282c972b9cd0702ba86cbaa Gerrit-Change-Number: 22694 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:06:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:06:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:06:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Don't respond to NS-STATUS with NS-STATUS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22695 ) Change subject: NS_Emulation: Don't respond to NS-STATUS with NS-STATUS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22695 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: Id9544ed1a7686fe113c4f6671e482bffc84bd2cc Gerrit-Change-Number: 22695 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:06:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:06:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:06:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Add TC_ul2dl_ud In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22696 ) Change subject: fr: Add TC_ul2dl_ud ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22696 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: Ic115af02207c9b9f4c84fa75890048acb6856c79 Gerrit-Change-Number: 22696 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:06:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Don't write TIMEROP_START to ConsoleLog In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22698 ) Change subject: fr: Don't write TIMEROP_START to ConsoleLog ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22698 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: I6621ac6094de310e974ce0438d01fca868719eb1 Gerrit-Change-Number: 22698 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:07:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Randomize packet size used in TC_ul2dl_ud() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22697 ) Change subject: fr: Randomize packet size used in TC_ul2dl_ud() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22697 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: I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b Gerrit-Change-Number: 22697 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:07:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr/fr-net: Use four parallel FR NS-VC instead of just one In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 ) Change subject: fr/fr-net: Use four parallel FR NS-VC instead of just one ...................................................................... fr/fr-net: Use four parallel FR NS-VC instead of just one Related: OS#4974 Change-Id: I366ceea525c09236f5432ba043a757e593d4ed0e --- M fr-net/FRNET_Tests.ttcn M fr/FR_Tests.ttcn 2 files changed, 52 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn index 3943ff1..bc6e513 100644 --- a/fr-net/FRNET_Tests.ttcn +++ b/fr-net/FRNET_Tests.ttcn @@ -19,10 +19,34 @@ provider := { fr := { netdev := "hdlcnet1", - dlci := 123 + dlci := 1 } }, - nsvci := 123 + nsvci := 101 + }, { + provider := { + fr := { + netdev := "hdlcnet2", + dlci := 2 + } + }, + nsvci := 102 + }, { + provider := { + fr := { + netdev := "hdlcnet3", + dlci := 3 + } + }, + nsvci := 103 + }, { + provider := { + fr := { + netdev := "hdlcnet4", + dlci := 4 + } + }, + nsvci := 104 } } } diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 5f58bc3..311cab6 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -24,10 +24,34 @@ provider := { fr := { netdev := "hdlc1", - dlci := 123 + dlci := 1 } }, - nsvci := 123 + nsvci := 101 + }, { + provider := { + fr := { + netdev := "hdlc2", + dlci := 2 + } + }, + nsvci := 102 + }, { + provider := { + fr := { + netdev := "hdlc3", + dlci := 3 + } + }, + nsvci := 103 + }, { + provider := { + fr := { + netdev := "hdlc4", + dlci := 4 + } + }, + nsvci := 104 } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22676 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: I366ceea525c09236f5432ba043a757e593d4ed0e Gerrit-Change-Number: 22676 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: UE_CT: Store BVCI + CellId in each UE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22693 ) Change subject: fr: UE_CT: Store BVCI + CellId in each UE ...................................................................... fr: UE_CT: Store BVCI + CellId in each UE Change-Id: I1a25a03e17b3d957763512dc4acda134338df3be --- M fr/FR_Tests.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 311cab6..a2c5e82 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -119,7 +119,9 @@ type record UE_Pars { hexstring imsi, OCT4 tlli, - float tguard + float tguard, + BssgpBvci bvci, + BssgpCellId cell_id }; type function void_fn(charstring id) runs on UE_CT; @@ -158,14 +160,16 @@ } /* start a single UE component; connect it to BSSGP */ -function f_start_ue(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) +function f_start_ue(void_fn fn, charstring id, BssgpBvcConfig bvc, integer imsi_suffix, BSSGP_BVC_CT bvc_comp, float t_guard := 40.0) runs on test_CT return UE_CT { var UE_CT ue_comp; var UE_Pars ue_pars := { imsi := f_gen_imsi(imsi_suffix), tlli := f_gprs_tlli_random(), - tguard := t_guard + tguard := t_guard, + bvci := bvc.bvci, + cell_id := bvc.cell_id }; ue_comp := UE_CT.create(id); @@ -203,7 +207,7 @@ for (var integer k := 0; k < ue_per_bvc; k := k+1) { var charstring id := "gb" & int2str(i) & "-bvc" & int2str(g_gb[i].cfg.bvc[j].bvci) & "-UEsim" & int2str(k); var UE_CT ue; - ue := f_start_ue(ue_fn, id, g_gb[i], i*10000+j*100+k, bvc_comp, + ue := f_start_ue(ue_fn, id, g_gb[i].cfg.bvc[j], i*10000+j*100+k, bvc_comp, ue_tguard); ues := ues & { ue }; /* a bit of staggering to ensure the timers above don't run all at the same time */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22693 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: I1a25a03e17b3d957763512dc4acda134338df3be Gerrit-Change-Number: 22693 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22694 ) Change subject: fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used ...................................................................... fr-net: Echo back DL-UD in UL-UD when LLC SAPI '0010'B is used This allows us to have bi-directional tests Change-Id: I7637ee5f1a7cce0ed282c972b9cd0702ba86cbaa --- M fr-net/FRNET_Tests.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn index bc6e513..c3ec468 100644 --- a/fr-net/FRNET_Tests.ttcn +++ b/fr-net/FRNET_Tests.ttcn @@ -6,6 +6,8 @@ import from NS_Emulation all; import from BSSGP_Emulation all; +import from LLC_Types all; +import from LLC_Templates all; modulepar { integer mp_num_bvc := 10; @@ -69,7 +71,19 @@ private function CreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli, BssgpDecoded dec) runs on BSSGP_BVC_CT { - /* simply ignore any inbound traffic for now */ + if (ischosen(dec.bssgp.pDU_BSSGP_UL_UNITDATA)) { + var PDU_LLC llc_rx := dec_PDU_LLC(dec.bssgp.pDU_BSSGP_UL_UNITDATA.lLC_PDU.lLC_PDU) + select (llc_rx) { + case (tr_LLC_UI(sapi := '0010'B)) { + //log("BVCI=", bvci, ", CellId=", cell_id, ", TLLI=", tlli, ", BSSGP=", dec); + /* mirror back as DL-UNITDATA */ + BVC.send(ts_ptp_BnsUdReq(ts_BSSGP_DL_UD(tlli, dec.bssgp.pDU_BSSGP_UL_UNITDATA.lLC_PDU.lLC_PDU), bvci, oct2int(tlli))); + } + case else { + /* simply ignore any inbound traffic for now */ + } + } + } } private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22694 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: I7637ee5f1a7cce0ed282c972b9cd0702ba86cbaa Gerrit-Change-Number: 22694 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Don't respond to NS-STATUS with NS-STATUS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22695 ) Change subject: NS_Emulation: Don't respond to NS-STATUS with NS-STATUS ...................................................................... NS_Emulation: Don't respond to NS-STATUS with NS-STATUS Change-Id: Id9544ed1a7686fe113c4f6671e482bffc84bd2cc --- M library/NS_Emulation.ttcnpp 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index ec3386f..34bbcd9 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -662,6 +662,10 @@ [g_config.handle_sns and ischosen(g_nsvc_config.provider.ip)] as_nsvc_sns(); + /* log + ignore NS-STATUS; must not create another NS-STATUS in response */ + [] NSCP.receive(tr_NS_STATUS(?)) -> value rf { + log("Rx NS-STATUS ", rf," in state ", vc_state); + } /* default case of handling unknown PDUs */ [] NSCP.receive(PDU_NS: ?) -> value rf { log("Rx Unexpected NS PDU ", rf," in state ", vc_state); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22695 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: Id9544ed1a7686fe113c4f6671e482bffc84bd2cc Gerrit-Change-Number: 22695 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Add TC_ul2dl_ud In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22696 ) Change subject: fr: Add TC_ul2dl_ud ...................................................................... fr: Add TC_ul2dl_ud This test case tests NS-UL-UNITDATA transmit and expectes the exact same LLC PDU to be sent back as NS-DL-UNITDATA. This way we can verify that both uplink and downlink paths are working, and that no messages are lost. It works stable here on my laptop, showing that if we test the TTCN3 NS + BSSGP code over a E1 line against another instance (fr against fr-net) works reliable. Change-Id: Ic115af02207c9b9f4c84fa75890048acb6856c79 --- M fr/FR_Tests.ttcn 1 file changed, 42 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index a2c5e82..974765e 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -6,6 +6,7 @@ import from NS_Emulation all; import from BSSGP_Emulation all; +import from LLC_Types all; import from LLC_Templates all; modulepar { @@ -256,9 +257,50 @@ } +private function f_ul2dl_ud(charstring id) runs on UE_CT +{ + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { + var integer ran_index := 0; + var template (value) PDU_LLC llc_tx; + var template (present) PDU_LLC llc_rx_exp; + var PDU_LLC llc_rx; + timer T := 5.0; + + /* SAPI '0010'B is looped back by FRNET_Tests.ttcn */ + llc_tx := ts_LLC_UI(f_rnd_octstring(512), '0010'B, '1'B, 0); + llc_rx_exp := llc_tx; + llc_rx_exp.pDU_LLC_UI.fCS := ?; + + //BSSGP[ran_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.cell_id, llc_enc)); + BSSGP[ran_index].send(llc_tx); + T.start; + alt { + [] BSSGP[ran_index].receive(llc_rx_exp) -> value llc_rx { } + [] BSSGP[ran_index].receive(PDU_LLC:?) -> value llc_rx { + setverdict(fail, "Unexpected LLC: ", llc_rx); + break; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", llc_rx_exp); + break; + } + } + //f_sleep(0.1); + /* 512 bytes + 32 bytes HDR every 0.5s (1088/s) means about 8704/s per UE */ + /* at 100 UE that ends up about 870 kBps */ + } +} +/* Generate uplink-unitdata traffic */ +testcase TC_ul2dl_ud() runs on test_CT +{ + f_tc_body(refers(f_ul2dl_ud), ue_tguard := 100.0); +} + + control { execute( TC_bvc_bringup() ); execute( TC_ul_ud() ); + execute( TC_ul2dl_ud() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22696 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: Ic115af02207c9b9f4c84fa75890048acb6856c79 Gerrit-Change-Number: 22696 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Randomize packet size used in TC_ul2dl_ud() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22697 ) Change subject: fr: Randomize packet size used in TC_ul2dl_ud() ...................................................................... fr: Randomize packet size used in TC_ul2dl_ud() This allows us to test with a variety of packet sizes up to [close to] the MTU of the underlying transport (configurable by modulepar) Change-Id: I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b --- M fr/FR_Tests.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 974765e..5e4f9e8 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -10,6 +10,8 @@ import from LLC_Templates all; modulepar { + /* NS transport layer MTU (NS header and anything after it) */ + integer mp_ns_mtu := 1500; /* number of BVCs to bring up in one Gb instance */ integer mp_num_bvc := 10; /* number of UEs to start in each PTP BVC */ @@ -59,6 +61,15 @@ }; } +/* 4 bytes NS-UNITDATA, + * >= 12 Bytes DL-UNITDATA or 18 bytes BSSGP UL-UNITDATA + * 3 bytes LLC UI header + * 3 bytes LLC FCS + * <= 3 bytes optional padding + * --> at least 31 bytes required + */ +const integer c_LLC_BSSGP_NS_overhead := 40; + type record GbInstance { NS_CT vc_NS, BSSGP_CT vc_BSSGP, @@ -259,15 +270,18 @@ private function f_ul2dl_ud(charstring id) runs on UE_CT { + var integer max_llc_payload_len := mp_ns_mtu - c_LLC_BSSGP_NS_overhead; + for (var integer num_pkts := 0; num_pkts < 50; num_pkts := num_pkts + 1) { var integer ran_index := 0; var template (value) PDU_LLC llc_tx; var template (present) PDU_LLC llc_rx_exp; + var octetstring llc_payload := f_rnd_octstring(f_rnd_int(max_llc_payload_len)); var PDU_LLC llc_rx; timer T := 5.0; /* SAPI '0010'B is looped back by FRNET_Tests.ttcn */ - llc_tx := ts_LLC_UI(f_rnd_octstring(512), '0010'B, '1'B, 0); + llc_tx := ts_LLC_UI(llc_payload, '0010'B, '1'B, 0); llc_rx_exp := llc_tx; llc_rx_exp.pDU_LLC_UI.fCS := ?; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22697 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: I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b Gerrit-Change-Number: 22697 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Don't write TIMEROP_START to ConsoleLog In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22698 ) Change subject: fr: Don't write TIMEROP_START to ConsoleLog ...................................................................... fr: Don't write TIMEROP_START to ConsoleLog There is quite a number of them, as we start 100 UE components plus associated structure underneath. Let's avoid spamming the console. Change-Id: I6621ac6094de310e974ce0438d01fca868719eb1 --- M fr/FR_Tests.default 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fr/FR_Tests.default b/fr/FR_Tests.default index d7afd31..df65d61 100644 --- a/fr/FR_Tests.default +++ b/fr/FR_Tests.default @@ -4,7 +4,7 @@ [LOGGING] #*.FileMask := LOG_ALL -ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | USER +ConsoleMask := ERROR | WARNING | TESTCASE | USER [MODULE_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22698 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: I6621ac6094de310e974ce0438d01fca868719eb1 Gerrit-Change-Number: 22698 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:52 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix possible null pointer dereference In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22678 ) Change subject: assignment_fsm: fix possible null pointer dereference ...................................................................... assignment_fsm: fix possible null pointer dereference In assignment_success(), conn_get_bts() is called to get the BTS struct from the connection. However, it is not checked whether the function actually returned a pointer. The bts struct is used to check if it is a siemens BTS using is_siemens_bts(), so lets just check before we pass on the bts pointer. Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Related: CID#216933 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/22678/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Gerrit-Change-Number: 22678 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:07:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:07:57 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix possible null pointer dereference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22678 ) Change subject: assignment_fsm: fix possible null pointer dereference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Gerrit-Change-Number: 22678 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:07:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:08:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:08:40 +0000 Subject: Change in osmo-bts[master]: pcu_sock: fix uninitalized returncode value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22677 ) Change subject: pcu_sock: fix uninitalized returncode value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I571fdb4f175fb259b77f989554f569fc2230dfe6 Gerrit-Change-Number: 22677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:08:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:08:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:08:42 +0000 Subject: Change in osmo-bts[master]: pcu_sock: fix uninitalized returncode value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22677 ) Change subject: pcu_sock: fix uninitalized returncode value ...................................................................... pcu_sock: fix uninitalized returncode value In function pcu_tx_si_all(), the variable rc is not initalized. If pcu_tx_si() fails, then rc is populated with value -EINVAL, but if all si transmissions succeed, which is the normal case, rc remains uninitalized. Change-Id: I571fdb4f175fb259b77f989554f569fc2230dfe6 Related: CID#216932 --- M src/common/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 250491f..ec7f876 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -771,7 +771,7 @@ const enum osmo_sysinfo_type si_types[3] = { SYSINFO_TYPE_1, SYSINFO_TYPE_3, SYSINFO_TYPE_13 }; unsigned int i; - int rc; + int rc = 0; for (i = 0; i < ARRAY_SIZE(si_types); i++) { if (GSM_BTS_HAS_SI(bts, si_types[i])) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I571fdb4f175fb259b77f989554f569fc2230dfe6 Gerrit-Change-Number: 22677 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:08:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:08:51 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Configure MTU to 1700 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22699 ) Change subject: ttcn3-fr-tests: Configure MTU to 1700 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id25532edbf5e1a918ad038723da464723d6f03f0 Gerrit-Change-Number: 22699 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:08:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:08:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 14:08:53 +0000 Subject: Change in docker-playground[master]: ttcn3-fr-tests: Configure MTU to 1700 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22699 ) Change subject: ttcn3-fr-tests: Configure MTU to 1700 ...................................................................... ttcn3-fr-tests: Configure MTU to 1700 On our deb10fr VMs we have the modified kernel HDLC module supporting the frame relay MTU up to 1700 bytes, so let's extend our tests to cover that. Mainline kernels only support 1500 bytes. Depends: osmo-ttcn3-hacks.git I8e38ecf6b270c81bd73ee43b1fa0b259a999c14b Change-Id: Id25532edbf5e1a918ad038723da464723d6f03f0 --- M ttcn3-fr-test/FR_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-fr-test/FR_Tests.cfg b/ttcn3-fr-test/FR_Tests.cfg index d2cff40..e2bf657 100644 --- a/ttcn3-fr-test/FR_Tests.cfg +++ b/ttcn3-fr-test/FR_Tests.cfg @@ -8,6 +8,7 @@ ConsoleMask := ERROR | WARNING | TESTCASE | USER [MODULE_PARAMETERS] +FR_Tests.mp_ns_mtu := 1700 [TESTPORT_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id25532edbf5e1a918ad038723da464723d6f03f0 Gerrit-Change-Number: 22699 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:11:48 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 14:11:48 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22669 to look at the new patch set (#2). Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... gsm48: add compare function for struct gprs_ra_id Comparing struct gprs_ra_id using memcmp can be error prone, so lets add a compare function to compare two struct gprs_ra_id values reliably. Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Related: SYS#5103 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22669/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:12:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 14:12:43 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22669/1/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/c/libosmocore/+/22669/1/src/gsm/gsm48.c at 1305 PS1, Line 1305: int gsm48_compare_ra(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2) > Agree, either call it _equal() and return bool or _cmp() and return -1|0|1. [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Comment-Date: Thu, 04 Feb 2021 14:12:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:17:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 14:17:55 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22669 to look at the new patch set (#3). Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... gsm48: add compare function for struct gprs_ra_id Comparing struct gprs_ra_id using memcmp can be error prone, so lets add a compare function to compare two struct gprs_ra_id values reliably. Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Related: SYS#5103 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22669/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:23:03 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 14:23:03 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:23:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:24:28 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 14:24:28 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer:Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer:Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 3: > Patch Set 3: > > This be rebased onto I4d7558c04d9d01761516526086be5104bb2eeada I am confused... -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:24:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:28:34 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 14:28:34 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: Simplify raid data storage In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: Simplify raid data storage ...................................................................... Patch Set 4: (2 comments) > Patch Set 2: > > I think this mixes two orthogonal topics: > > a) moving from a binary to a decoded ra_id > b) reducing redundancy between the multiple places of storage > > "a" is uncontroversial to me. "b" is dangerous, as without detailed review I would not be sure if bvc->cell always exists in all situations where we want to read or write the ra_id. re b I had a look and we should always have a cell for a given (ptp) bvc. The only place where I'm a bit unsure is when we get a ptp bvc reset from the sgsn. Do you want this commit split up then? https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/4//COMMIT_MSG at 7 PS4, Line 7: gb_proxy: Simplify raid data storage Not really needed anymore as this whole repository is about gbproxy https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c File src/gb_proxy_ctrl.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c at 96 PS2, Line 96: cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", > Done I'd rather have that in a separate commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 14:28:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:29:28 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 14:29:28 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 04 Feb 2021 14:29:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:29:49 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 14:29:49 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22672 ) Change subject: gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I43ec049540c10c8ded5a668229447ab1acb6c832 Gerrit-Change-Number: 22672 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 04 Feb 2021 14:29:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:31:41 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 4 Feb 2021 14:31:41 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... repo-install-test: osmo-gbproxy: disable ver check osmo-gbproxy was split into its own repository, and this repository doesn't have a tag yet. Therefore "osmo-gbproxy --version" returns UNKNOWN. Disable the check for osmo-gbproxy until we have a tagged version. Related: OS#5009 Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/22700/1 diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index f05f01c..0ea8f6e 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -339,11 +339,11 @@ test_binaries() { # Make sure that binares run at all and output a proper version + # osmo-gbproxy: disabled until version is tagged (OS#5009) test_binaries_version \ osmo-bsc \ osmo-bts-trx \ osmo-bts-virtual \ - osmo-gbproxy \ osmo-gtphub \ osmo-ggsn \ osmo-hlr \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:43:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 14:43:30 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:43:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:46:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 14:46:03 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/1/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/1/include/osmocom/sgsn/gb_proxy.h at 225 PS1, Line 225: LOGP(SUBSYS, LEVEL, "CELL(%05u/%05u) " FMT, (CELL)->bvci, (CELL)->id.cid, ## ARGS) is the CI enough to show the cell? I bet no. You should be printing the RAI+CI as "%u-%u-%u-..." -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:46:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 14:46:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 14:46:43 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: What about tagging a 0.0.1 version instead? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 14:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:00:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 15:00:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22701 ) Change subject: fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices ...................................................................... fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices Like GBProxy_Tests, we need to use dumpcap instead of tcpdump. Change-Id: I36d5524b11e10ac687c65345aedc4a99e7fda8d8 --- M fr/FR_Tests.default 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/22701/1 diff --git a/fr/FR_Tests.default b/fr/FR_Tests.default index df65d61..14c32b1 100644 --- a/fr/FR_Tests.default +++ b/fr/FR_Tests.default @@ -1,6 +1,6 @@ -[ORDERED_INCLUDE] -# Common configuration, shared between test suites -"../Common.cfg" +[DEFINE] +TCPDUMP_START := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-start.sh" +TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-stop.sh" [LOGGING] #*.FileMask := LOG_ALL -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22701 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: I36d5524b11e10ac687c65345aedc4a99e7fda8d8 Gerrit-Change-Number: 22701 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:00:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 15:00:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22701 ) Change subject: fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22701 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: I36d5524b11e10ac687c65345aedc4a99e7fda8d8 Gerrit-Change-Number: 22701 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 04 Feb 2021 15:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:00:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 15:00:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22701 ) Change subject: fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices ...................................................................... fr: Use dumpcap instead lf tcpdump to capture hdlc net-devices Like GBProxy_Tests, we need to use dumpcap instead of tcpdump. Change-Id: I36d5524b11e10ac687c65345aedc4a99e7fda8d8 --- M fr/FR_Tests.default 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/fr/FR_Tests.default b/fr/FR_Tests.default index df65d61..14c32b1 100644 --- a/fr/FR_Tests.default +++ b/fr/FR_Tests.default @@ -1,6 +1,6 @@ -[ORDERED_INCLUDE] -# Common configuration, shared between test suites -"../Common.cfg" +[DEFINE] +TCPDUMP_START := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-start.sh" +TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-dumpcap-stop.sh" [LOGGING] #*.FileMask := LOG_ALL -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22701 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: I36d5524b11e10ac687c65345aedc4a99e7fda8d8 Gerrit-Change-Number: 22701 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:41:50 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 4 Feb 2021 15:41:50 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: > Patch Set 1: > > What about tagging a 0.0.1 version instead? I think that makes it more confusing and breaks the expectation that latest tagged versions work with other latest tagged versions. But I don't have a strong opinion on that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 15:41:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:49:00 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 15:49:00 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22636 to look at the new patch set (#3). Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Add osmo-gbproxy-* container for osmo-gbproxy Uses the new repo split off of osmo-sgsn Related: OS#4992 Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 --- M make/Makefile M osmo-gbproxy-master/Dockerfile M osmo-gbproxy-master/Makefile A osmo-gbproxy-master/Release.key M osmo-gbproxy-master/osmo-gbproxy.cfg M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh 7 files changed, 107 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/22636/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:49:05 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 15:49:05 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 2: (6 comments) https://gerrit.osmocom.org/c/docker-playground/+/22636/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/22636/2//COMMIT_MSG at 10 PS2, Line 10: > Related: OS#4992 Done https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile File osmo-gbproxy-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-latest/Dockerfile at 34 PS1, Line 34: CMD ["/bin/sh", "-c", "/usr/bin/osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"] > It will take a few weeks at least. Ack, removing -latest https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile File osmo-gbproxy-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile at 34 PS1, Line 34: l > following dependencies not required (neither for debian nor for centos): gsup-client, libosmo-ranap, [?] Done, not sure if I did it correctly for centos. DISTRO=centos0 make seems to work https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile at 75 PS1, Line 75: ./configure --enable-iu && \ > is there iu stuff in gbproxy? No, thanks! https://gerrit.osmocom.org/c/docker-playground/+/22636/2/osmo-gbproxy-master/Dockerfile File osmo-gbproxy-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/2/osmo-gbproxy-master/Dockerfile at 3 PS2, Line 3: ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" > Unlike $USER and $DISTRO, $OSMOCOM_REPO_MIRROR isn't used in FROM. [?] Done https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/osmo-gbproxy.cfg File osmo-gbproxy-master/osmo-gbproxy.cfg: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/osmo-gbproxy.cfg at 22 PS1, Line 22: listen 127.0.0.1 23000 > Never sure what IPs to use here. Some use localhost, some 172.x.x.x [?] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 15:49:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:50:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 15:50:48 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > What about tagging a 0.0.1 version instead? > > I think that makes it more confusing and breaks the expectation that latest tagged versions work with other latest tagged versions. But I don't have a strong opinion on that. Well, at least THERE IS a tagged version. I'd go for doing this, then the sooner we have 1 release tag we can work with this project the same as with the other ones, and avoid adding specififics for this project everywhere. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 15:50:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 15:56:22 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 4 Feb 2021 15:56:22 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22636/3/osmo-gbproxy-master/Makefile File osmo-gbproxy-master/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/22636/3/osmo-gbproxy-master/Makefile at 1 PS3, Line 1: 22 Why is the IP changed here? Rest looks good! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 15:56:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:03:18 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 16:03:18 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: Simplify raid data storage In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#5) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: Simplify raid data storage ...................................................................... gb_proxy: Simplify raid data storage Instead of storing the raw ra_id in gbproxy_bvc and gbproxy_cell store the decoded ra_id plus cell id in gbproxy cell and use it from there. Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Related: OS#4894 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 23 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:03:53 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 16:03:53 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22636/3/osmo-gbproxy-master/Makefile File osmo-gbproxy-master/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/22636/3/osmo-gbproxy-master/Makefile at 1 PS3, Line 1: 22 > Why is the IP changed here? Rest looks good! Because 21 is used in osmo-sgsn-master. .22 was still free and the default config will try to connect to the sgsn as .21 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:03:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:07:44 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 16:07:44 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: Simplify raid data storage In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: Simplify raid data storage ...................................................................... Patch Set 5: (3 comments) > Patch Set 4: > > (2 comments) > > > Patch Set 2: > > > > I think this mixes two orthogonal topics: > > > > a) moving from a binary to a decoded ra_id > > b) reducing redundancy between the multiple places of storage > > > > "a" is uncontroversial to me. "b" is dangerous, as without detailed review I would not be sure if bvc->cell always exists in all situations where we want to read or write the ra_id. > > re b I had a look and we should always have a cell for a given (ptp) bvc. The only place where I'm a bit unsure is when we get a ptp bvc reset from the sgsn. > > Do you want this commit split up then? There is indeed a problem. I think splitting this is the right strategy. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/4//COMMIT_MSG at 7 PS4, Line 7: gb_proxy: Simplify raid data storage > Not really needed anymore as this whole repository is about gbproxy its the name of the module gb_proxy.c https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/5/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/5/src/gb_proxy.c at 1050 PS5, Line 1050: if (!bss_bvc->cell) There is indeed a problem with removing the redundancy, here I fixed a segfault/nullpointer-deref. osmo-gbproxy no longer crashes now in the TTCN3 tests but the test TC_paging_ps_sig_lac does not pass anymore. We definetly broke something, but I do not know what or where? The changes look good. Maybe we get on the ground of this when we split up the redundancy removal. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c File src/gb_proxy_ctrl.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/2/src/gb_proxy_ctrl.c at 96 PS2, Line 96: cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", > I'd rather have that in a separate commit. I will fix this with the next patchset (the next after the current one I just pushed) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 16:07:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:07:54 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 16:07:54 +0000 Subject: Change in libosmocore[master]: gsm48: add compare function for struct gprs_ra_id In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22669 ) Change subject: gsm48: add compare function for struct gprs_ra_id ...................................................................... gsm48: add compare function for struct gprs_ra_id Comparing struct gprs_ra_id using memcmp can be error prone, so lets add a compare function to compare two struct gprs_ra_id values reliably. Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Related: SYS#5103 --- M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index f772f4a..fdaa572 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -104,6 +104,7 @@ void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf); void gsm48_encode_ra(struct gsm48_ra_id *out, const struct gprs_ra_id *raid); int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid) OSMO_DEPRECATED("Use gsm48_encode_ra() instead"); +bool gsm48_ra_equal(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2); int gsm48_number_of_paging_subchannels(struct gsm48_control_channel_descr *chan_desc); diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index c497c74..e12fda5 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1298,6 +1298,25 @@ return 6; } +/*! Compare a TS 04.08 Routing Area Identifier + * \param[in] raid1 first Routing Area ID to compare. + * \param[in] raid2 second Routing Area ID to compare. + * \returns true if raid1 and raid2 match, false otherwise. */ +bool gsm48_ra_equal(const struct gprs_ra_id *raid1, const struct gprs_ra_id *raid2) +{ + if (raid1->mcc != raid2->mcc) + return false; + if (raid1->mnc != raid2->mnc) + return false; + if (raid1->mnc_3_digits != raid2->mnc_3_digits) + return false; + if (raid1->lac != raid2->lac) + return false; + if (raid1->rac != raid2->rac) + return false; + return true; +} + /*! Determine number of paging sub-channels * \param[in] chan_desc Control Channel Description * \returns number of paging sub-channels diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 584d761..efa23e6 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -326,6 +326,7 @@ gsm48_rr_msg_name; gsm48_cc_state_name; gsm48_construct_ra; +gsm48_ra_equal; gsm48_encode_ra; gsm48_hdr_gmm_cipherable; gsm48_decode_bcd_number; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d7558c04d9d01761516526086be5104bb2eeada Gerrit-Change-Number: 22669 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:11:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:11:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move "ro_integer" to Osmocom_Types References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702 ) Change subject: Move "ro_integer" to Osmocom_Types ...................................................................... Move "ro_integer" to Osmocom_Types We don't need several re-definitions of a "record of integer" type, plus associated helper functions. Let's move that to the shared Osmocom_Types.ttcn Change-Id: I6a68ab8180a40b93c540db9cb80941c39c2fb549 --- M gbproxy/GBProxy_Tests.ttcn M library/L1CTL_PortType.ttcn M library/NS_Emulation.ttcnpp M library/Osmocom_Types.ttcn 4 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/22702/1 diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 506ed38..ad8874c 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -498,19 +498,6 @@ f_vty_transceive(GBPVTY, "enable"); } -type record of integer ro_integer; - -private function ro_integer_contains(ro_integer r, integer x) return boolean { - for (var integer j := 0; j < lengthof(r); j := j+1) { - if (r[j] == x) { - return true; - } - } - return false; -} - -private type record of ro_integer roro_integer; - /* count the number of unblocked BVCI for each SGSN NSE */ private altstep as_count_unblocked4nse(integer sgsn_idx, inout roro_integer bvci_unblocked) runs on test_CT { diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 5c554c2..80e33a8 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -12,9 +12,9 @@ module L1CTL_PortType { import from L1CTL_Types all; import from UD_PortType all; + import from Socket_API_Definitions all; import from UD_Types all; import from Osmocom_Types all; - import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; import from L1CTL_PortType_CtrlFunct all; @@ -32,7 +32,7 @@ charstring m_l1ctl_sock_path := "/tmp/osmocom_l2"; } - function f_L1CTL_getMsgLen(in octetstring stream, inout ro_integer args) return integer { + function f_L1CTL_getMsgLen(in octetstring stream, inout Socket_API_Definitions.ro_integer args) return integer { var integer stream_len := lengthof(stream); var integer len; if (stream_len < 2) { diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 34bbcd9..ca44a02 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -217,8 +217,8 @@ /* references to the per-NSVC components */ var NsvcTable g_nsvcs := {}; /* list of indexes to g_nsvcs[] of currently unblocked NSVCs */ - var ro_integer g_unblocked_nsvcs_sig := {}; - var ro_integer g_unblocked_nsvcs_data := {}; + var Osmocom_Types.ro_integer g_unblocked_nsvcs_sig := {}; + var Osmocom_Types.ro_integer g_unblocked_nsvcs_data := {}; }; type record NsvcTableEntry { NSVCConfiguration cfg, @@ -226,7 +226,6 @@ NsvcState state }; type record of NsvcTableEntry NsvcTable; - type record of integer ro_integer; /* internal port from the NS-VC point of view */ type port NSint_SP_PT message { @@ -319,7 +318,7 @@ } } else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) { /* remove index to list of unblocked NSVCs */ - var ro_integer new_unblocked_nsvcs_sig := {}; + var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {}; for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) { if (g_unblocked_nsvcs_sig[j] != i) { new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j}; @@ -327,7 +326,7 @@ } g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig; - var ro_integer new_unblocked_nsvcs_data := {}; + var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {}; for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) { if (g_unblocked_nsvcs_data[j] != i) { new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j}; diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index e813a11..06920bf 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -283,5 +283,19 @@ return tmsi; } +type record of integer ro_integer; + +function ro_integer_contains(ro_integer r, integer x) return boolean { + for (var integer j := 0; j < lengthof(r); j := j+1) { + if (r[j] == x) { + return true; + } + } + return false; +} + +type record of ro_integer roro_integer; + + } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702 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: I6a68ab8180a40b93c540db9cb80941c39c2fb549 Gerrit-Change-Number: 22702 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:11:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:11:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703 ) Change subject: NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing ...................................................................... NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing Sometimes we run into situations where the g_unblocked_nsvcs_* is exceeding the number of NSVCs we have in g_nsvcs. This can only happen as we blindly append integers to the ro_integer fields, rather than checking if they are already contained. Let's factor out the add_unique and del functions (in Osmocom_Types) and use them from NS_Emulation. Change-Id: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14 --- M library/NS_Emulation.ttcnpp M library/Osmocom_Types.ttcn 2 files changed, 23 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/22703/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index ca44a02..6d8113c 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -310,30 +310,16 @@ /* add index to list of unblocked NSVCs */ if (not ischosen(g_nsvcs[i].cfg.provider.ip) or g_nsvcs[i].cfg.provider.ip.signalling_weight > 0) { - g_unblocked_nsvcs_sig := g_unblocked_nsvcs_sig & {i}; + ro_integer_add_unique(g_unblocked_nsvcs_sig, i); } if (not ischosen(g_nsvcs[i].cfg.provider.ip) or g_nsvcs[i].cfg.provider.ip.data_weight > 0) { - g_unblocked_nsvcs_data := g_unblocked_nsvcs_data & {i}; + ro_integer_add_unique(g_unblocked_nsvcs_data, i); } } else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) { /* remove index to list of unblocked NSVCs */ - var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {}; - for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) { - if (g_unblocked_nsvcs_sig[j] != i) { - new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j}; - } - } - g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig; - - var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {}; - for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) { - if (g_unblocked_nsvcs_data[j] != i) { - new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j}; - } - } - g_unblocked_nsvcs_data := new_unblocked_nsvcs_data; - + ro_integer_del(g_unblocked_nsvcs_sig, i); + ro_integer_del(g_unblocked_nsvcs_data, i); } g_nsvcs[i].state := state; } diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 06920bf..23f8fd9 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -294,6 +294,25 @@ return false; } +function ro_integer_add_unique(inout ro_integer roi, integer new_entry) +{ + if (ro_integer_contains(roi, new_entry)) { + return; + } + roi := roi & {new_entry}; +} + +function ro_integer_del(inout ro_integer roi, integer del_entry) +{ + var ro_integer tmp := {}; + for (var integer j := 0; j < lengthof(roi); j := j+1) { + if (roi[j] != del_entry) { + tmp := tmp & { roi[j] }; + } + } + roi := tmp; +} + type record of ro_integer roro_integer; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703 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: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14 Gerrit-Change-Number: 22703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:15:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:15:40 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:15:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:16:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:16:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move "ro_integer" to Osmocom_Types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702 ) Change subject: Move "ro_integer" to Osmocom_Types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702 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: I6a68ab8180a40b93c540db9cb80941c39c2fb549 Gerrit-Change-Number: 22702 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 16:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:16:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:16:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703 ) Change subject: NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703 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: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14 Gerrit-Change-Number: 22703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 16:16:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:16:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:16:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Move "ro_integer" to Osmocom_Types In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702 ) Change subject: Move "ro_integer" to Osmocom_Types ...................................................................... Move "ro_integer" to Osmocom_Types We don't need several re-definitions of a "record of integer" type, plus associated helper functions. Let's move that to the shared Osmocom_Types.ttcn Change-Id: I6a68ab8180a40b93c540db9cb80941c39c2fb549 --- M gbproxy/GBProxy_Tests.ttcn M library/L1CTL_PortType.ttcn M library/NS_Emulation.ttcnpp M library/Osmocom_Types.ttcn 4 files changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 506ed38..ad8874c 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -498,19 +498,6 @@ f_vty_transceive(GBPVTY, "enable"); } -type record of integer ro_integer; - -private function ro_integer_contains(ro_integer r, integer x) return boolean { - for (var integer j := 0; j < lengthof(r); j := j+1) { - if (r[j] == x) { - return true; - } - } - return false; -} - -private type record of ro_integer roro_integer; - /* count the number of unblocked BVCI for each SGSN NSE */ private altstep as_count_unblocked4nse(integer sgsn_idx, inout roro_integer bvci_unblocked) runs on test_CT { diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 5c554c2..80e33a8 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -12,9 +12,9 @@ module L1CTL_PortType { import from L1CTL_Types all; import from UD_PortType all; + import from Socket_API_Definitions all; import from UD_Types all; import from Osmocom_Types all; - import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; import from L1CTL_PortType_CtrlFunct all; @@ -32,7 +32,7 @@ charstring m_l1ctl_sock_path := "/tmp/osmocom_l2"; } - function f_L1CTL_getMsgLen(in octetstring stream, inout ro_integer args) return integer { + function f_L1CTL_getMsgLen(in octetstring stream, inout Socket_API_Definitions.ro_integer args) return integer { var integer stream_len := lengthof(stream); var integer len; if (stream_len < 2) { diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 34bbcd9..ca44a02 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -217,8 +217,8 @@ /* references to the per-NSVC components */ var NsvcTable g_nsvcs := {}; /* list of indexes to g_nsvcs[] of currently unblocked NSVCs */ - var ro_integer g_unblocked_nsvcs_sig := {}; - var ro_integer g_unblocked_nsvcs_data := {}; + var Osmocom_Types.ro_integer g_unblocked_nsvcs_sig := {}; + var Osmocom_Types.ro_integer g_unblocked_nsvcs_data := {}; }; type record NsvcTableEntry { NSVCConfiguration cfg, @@ -226,7 +226,6 @@ NsvcState state }; type record of NsvcTableEntry NsvcTable; - type record of integer ro_integer; /* internal port from the NS-VC point of view */ type port NSint_SP_PT message { @@ -319,7 +318,7 @@ } } else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) { /* remove index to list of unblocked NSVCs */ - var ro_integer new_unblocked_nsvcs_sig := {}; + var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {}; for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) { if (g_unblocked_nsvcs_sig[j] != i) { new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j}; @@ -327,7 +326,7 @@ } g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig; - var ro_integer new_unblocked_nsvcs_data := {}; + var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {}; for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) { if (g_unblocked_nsvcs_data[j] != i) { new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j}; diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index e813a11..06920bf 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -283,5 +283,19 @@ return tmsi; } +type record of integer ro_integer; + +function ro_integer_contains(ro_integer r, integer x) return boolean { + for (var integer j := 0; j < lengthof(r); j := j+1) { + if (r[j] == x) { + return true; + } + } + return false; +} + +type record of ro_integer roro_integer; + + } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22702 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: I6a68ab8180a40b93c540db9cb80941c39c2fb549 Gerrit-Change-Number: 22702 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:16:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:16:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703 ) Change subject: NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing ...................................................................... NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing Sometimes we run into situations where the g_unblocked_nsvcs_* is exceeding the number of NSVCs we have in g_nsvcs. This can only happen as we blindly append integers to the ro_integer fields, rather than checking if they are already contained. Let's factor out the add_unique and del functions (in Osmocom_Types) and use them from NS_Emulation. Change-Id: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14 --- M library/NS_Emulation.ttcnpp M library/Osmocom_Types.ttcn 2 files changed, 23 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index ca44a02..6d8113c 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -310,30 +310,16 @@ /* add index to list of unblocked NSVCs */ if (not ischosen(g_nsvcs[i].cfg.provider.ip) or g_nsvcs[i].cfg.provider.ip.signalling_weight > 0) { - g_unblocked_nsvcs_sig := g_unblocked_nsvcs_sig & {i}; + ro_integer_add_unique(g_unblocked_nsvcs_sig, i); } if (not ischosen(g_nsvcs[i].cfg.provider.ip) or g_nsvcs[i].cfg.provider.ip.data_weight > 0) { - g_unblocked_nsvcs_data := g_unblocked_nsvcs_data & {i}; + ro_integer_add_unique(g_unblocked_nsvcs_data, i); } } else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) { /* remove index to list of unblocked NSVCs */ - var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {}; - for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) { - if (g_unblocked_nsvcs_sig[j] != i) { - new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j}; - } - } - g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig; - - var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {}; - for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) { - if (g_unblocked_nsvcs_data[j] != i) { - new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j}; - } - } - g_unblocked_nsvcs_data := new_unblocked_nsvcs_data; - + ro_integer_del(g_unblocked_nsvcs_sig, i); + ro_integer_del(g_unblocked_nsvcs_data, i); } g_nsvcs[i].state := state; } diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 06920bf..23f8fd9 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -294,6 +294,25 @@ return false; } +function ro_integer_add_unique(inout ro_integer roi, integer new_entry) +{ + if (ro_integer_contains(roi, new_entry)) { + return; + } + roi := roi & {new_entry}; +} + +function ro_integer_del(inout ro_integer roi, integer del_entry) +{ + var ro_integer tmp := {}; + for (var integer j := 0; j < lengthof(roi); j := j+1) { + if (roi[j] != del_entry) { + tmp := tmp & { roi[j] }; + } + } + roi := tmp; +} + type record of ro_integer roro_integer; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703 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: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14 Gerrit-Change-Number: 22703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:17:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:17:24 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:17:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:17:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:17:36 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:19:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:19:25 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: > Patch Set 1: > I think that makes it more confusing and breaks the expectation that latest tagged versions work with other latest tagged versions. I don't think that specifically is a problem. However, we'd have a tagged version that doesn't build against any other tagged versions, at all. Also, it means that the configure.ac minimum version checks would all be bogus, as they depend on things that are not available in any library versions yet. One could of course add some historic versin tag, like the last omso-sgsn version tag. but then that would probably not build at all either, as that's the repository when it still contained all of osmo-sgsn. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:19:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:20:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 16:20:16 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > > Patch Set 1: > > > > > > What about tagging a 0.0.1 version instead? > > > > I think that makes it more confusing and breaks the expectation that latest tagged versions work with other latest tagged versions. But I don't have a strong opinion on that. > > Well, at least THERE IS a tagged version. I'd go for doing this, then the sooner we have 1 release tag we can work with this project the same as with the other ones, and avoid adding specififics for this project everywhere. Fully agreed. Unfortunately we _still_ are waiting for NS2 to finally have stable API and VTY, which is becoming more and more problematic. @lynxis, please hurry. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:31:07 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 16:31:07 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc, mnc, lac, rac References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 ) Change subject: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac ...................................................................... gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac The notation for the RAI used in the log is not compliant to the spec. Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Related: OS#4894 --- M src/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/04/22704/1 diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c index 794afd7..10d3727 100644 --- a/src/gb_proxy_ctrl.c +++ b/src/gb_proxy_ctrl.c @@ -94,7 +94,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(&raid, bvc->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u-%u-%u-%u,%s\n", nse_peer->nsei, bvc->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Gerrit-Change-Number: 22704 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:36:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 16:36:24 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc, mnc, lac, rac In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 ) Change subject: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac ...................................................................... Patch Set 1: Code-Review+1 Is there already a user of that API? if so, remember to update it. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Gerrit-Change-Number: 22704 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:36:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 16:53:11 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 16:53:11 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 16:53:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 17:20:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 17:20:23 +0000 Subject: Change in titan.TestPorts.AF_PACKET[master]: FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22705 ) Change subject: FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down ...................................................................... FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down In quickly repeated test case executions we have the problem that both the Q.933 LMI detection of link outage/interruption, as well as the NS-ALIVE mechanism are too slow to detect the outage, and in fact don't detect the outage. This leads to inconsistent state on both sides, with one side thinking NS-VCs are still ALIVE/UNBLOCKED, while the other side considers them DEAD. A Q.933 conforming transmittere would never send a sequece number of zero, but always start from one. This means we can use this as a flag to force the peer to assume a "service affecting condition" which will make it tell NS that the link went down, etc. Related: OS#4974 Change-Id: I3e38ade112e11c86db906da9846a966cb33ac1bd --- M src/FrameRelay_Emulation.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/titan.TestPorts.AF_PACKET refs/changes/05/22705/1 diff --git a/src/FrameRelay_Emulation.ttcn b/src/FrameRelay_Emulation.ttcn index 90cfd73..fbca3bd 100644 --- a/src/FrameRelay_Emulation.ttcn +++ b/src/FrameRelay_Emulation.ttcn @@ -207,7 +207,16 @@ /* handle incoming Link Integrity Verification IE */ private function q933_handle_rx_link_int(Q933_LinkIntegrityIE link_int) runs on FR_Emulation_CT { - if (q933em.tx_seq_nr != link_int.recv_seq_nr) { + if (link_int.recv_seq_nr == 0) { + /* The value '0' shall never be sent by a standards-conforming implementation, + * See Q.933 section A.4.2 (NOTE). In Osmocom we use it as "magic" value to + * artificially indicate a 'service affecting condition' */ + q933em.service_affecting_condition := true; + log("Detecting service affecting condition after zero receive sequence number"); + notify_all_clients(FRemu_Event:{link_status:=FR_LINK_STS_UNAVAILABLE}); + q933em.num_cycles := 0; + T392.stop; + } else if (q933em.tx_seq_nr != link_int.recv_seq_nr) { log("Link Integrity IE with discontiguous sequence numbers: expected=", q933em.tx_seq_nr, " received=", link_int.recv_seq_nr); fill_err_bucket(true); -- To view, visit https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: titan.TestPorts.AF_PACKET Gerrit-Branch: master Gerrit-Change-Id: I3e38ade112e11c86db906da9846a966cb33ac1bd Gerrit-Change-Number: 22705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 17:22:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 17:22:09 +0000 Subject: Change in titan.TestPorts.AF_PACKET[master]: FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22705 ) Change subject: FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: titan.TestPorts.AF_PACKET Gerrit-Branch: master Gerrit-Change-Id: I3e38ade112e11c86db906da9846a966cb33ac1bd Gerrit-Change-Number: 22705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 17:22:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 17:22:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 17:22:11 +0000 Subject: Change in titan.TestPorts.AF_PACKET[master]: FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22705 ) Change subject: FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down ...................................................................... FrameRelay_Emulation: Use Rx SeqNR == 0 to force link down In quickly repeated test case executions we have the problem that both the Q.933 LMI detection of link outage/interruption, as well as the NS-ALIVE mechanism are too slow to detect the outage, and in fact don't detect the outage. This leads to inconsistent state on both sides, with one side thinking NS-VCs are still ALIVE/UNBLOCKED, while the other side considers them DEAD. A Q.933 conforming transmittere would never send a sequece number of zero, but always start from one. This means we can use this as a flag to force the peer to assume a "service affecting condition" which will make it tell NS that the link went down, etc. Related: OS#4974 Change-Id: I3e38ade112e11c86db906da9846a966cb33ac1bd --- M src/FrameRelay_Emulation.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/src/FrameRelay_Emulation.ttcn b/src/FrameRelay_Emulation.ttcn index 90cfd73..fbca3bd 100644 --- a/src/FrameRelay_Emulation.ttcn +++ b/src/FrameRelay_Emulation.ttcn @@ -207,7 +207,16 @@ /* handle incoming Link Integrity Verification IE */ private function q933_handle_rx_link_int(Q933_LinkIntegrityIE link_int) runs on FR_Emulation_CT { - if (q933em.tx_seq_nr != link_int.recv_seq_nr) { + if (link_int.recv_seq_nr == 0) { + /* The value '0' shall never be sent by a standards-conforming implementation, + * See Q.933 section A.4.2 (NOTE). In Osmocom we use it as "magic" value to + * artificially indicate a 'service affecting condition' */ + q933em.service_affecting_condition := true; + log("Detecting service affecting condition after zero receive sequence number"); + notify_all_clients(FRemu_Event:{link_status:=FR_LINK_STS_UNAVAILABLE}); + q933em.num_cycles := 0; + T392.stop; + } else if (q933em.tx_seq_nr != link_int.recv_seq_nr) { log("Link Integrity IE with discontiguous sequence numbers: expected=", q933em.tx_seq_nr, " received=", link_int.recv_seq_nr); fill_err_bucket(true); -- To view, visit https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: titan.TestPorts.AF_PACKET Gerrit-Branch: master Gerrit-Change-Id: I3e38ade112e11c86db906da9846a966cb33ac1bd Gerrit-Change-Number: 22705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 17:30:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 17:30:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix decoding of dl data block with no llc block header byte References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 ) Change subject: RLCMAC: Fix decoding of dl data block with no llc block header byte ...................................................................... RLCMAC: Fix decoding of dl data block with no llc block header byte The value was marked as unbound while it should be marked as omitted: """ dl_block := { data := { cs := CS_1 (0), mac_hdr := { mac_hdr := { payload_type := MAC_PT_RLC_DATA (0), rrbp := RRBP_Nplus13_mod_2715648 (0), rrbp_valid := false, usf := 7 }, hdr_ext := { pr := PWR_RED_0_to_3dB (0), spare := '0'B, tfi := 0, fbi := false, bsn := 0, e := true } }, blocks := { { hdr := , payload := '0D0C8653110FFEF072972C5A790C0317299753B5'O } } } } } """ Change-Id: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b --- M library/RLCMAC_EncDec.cc 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/22706/1 diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index ac60b37..ac22def 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -505,6 +505,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data()); ttcn_buffer.increase_pos(length); ret_val.blocks()[0] = lb; @@ -663,6 +664,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data()); aligned_buffer.increase_pos(length); ret_val.blocks()[0] = lb; @@ -792,6 +794,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data()); ttcn_buffer.increase_pos(length); ret_val.blocks()[0] = lb; @@ -945,6 +948,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, aligned_buffer.get_read_data()); aligned_buffer.increase_pos(length); ret_val.blocks()[0] = lb; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 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: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b Gerrit-Change-Number: 22706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 17:54:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 4 Feb 2021 17:54:39 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 17:54:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:28:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:28:22 +0000 Subject: Change in libosmocore[master]: ns2: Don't queie Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22637 to look at the new patch set (#3). Change subject: ns2: Don't queie Q.933 LMI messages; only store most recent ones ...................................................................... ns2: Don't queie Q.933 LMI messages; only store most recent ones There's not really any point in storing multiple LMI messages, and then transmitting them in inverse order, as the existing code does. Instead, we shall store only the last (failed) LMI message and try to transmit that at highest priority, before any NS messages in the actual queue. Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 --- M src/gb/gprs_ns2_fr.c 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/22637/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:28:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:28:22 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Factor-out function to set link as dead References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22707 ) Change subject: gb: frame_relay: Factor-out function to set link as dead ...................................................................... gb: frame_relay: Factor-out function to set link as dead Change-Id: I624b6a1175cf7d59173dfff02d6197bb644b9072 --- M src/gb/frame_relay.c 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/22707/1 diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 96f51cf..679a315 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -343,6 +343,20 @@ } +static void link_set_failed(struct osmo_fr_link *link) +{ + struct osmo_fr_dlc *dlc; + + LOGPFRL(link, LOGL_NOTICE, "Link failed\n"); + link->state = false; + if (link->status_cb) + link->status_cb(link, link->cb_data, link->state); + + llist_for_each_entry(dlc, &link->dlc_list, list) { + dlc_set_active(dlc, false); + } +} + /* Q.933 */ static int rx_lmi_q933_status_enq(struct msgb *msg, struct tlv_parsed *tp) { @@ -427,14 +441,7 @@ if (!link->state) return; - LOGPFRL(link, LOGL_NOTICE, "Link failed\n"); - link->state = false; - if (link->status_cb) - link->status_cb(link, link->cb_data, link->state); - - llist_for_each_entry(dlc, &link->dlc_list, list) { - dlc_set_active(dlc, false); - } + link_set_failed(link); } else { /* good link */ if (link->state) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I624b6a1175cf7d59173dfff02d6197bb644b9072 Gerrit-Change-Number: 22707 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:28:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:28:22 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Detect link outage on "last receive seq nr == 0" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22708 ) Change subject: gb: frame_relay: Detect link outage on "last receive seq nr == 0" ...................................................................... gb: frame_relay: Detect link outage on "last receive seq nr == 0" this is a bit of a hack. Q.933 explicitly forbids either side from ever sending a sequence number of '0'. Values start from '1' and are modulo 256, but '0' is always skipped. So if the peer is sending us a "last received sequence number of '0' it means it has not yet received any packets from us, which in turn can only mean that it has just been restarted. Let's treat this as "service affecting condition" and notify upper layers. This helps particularly in recovering from rapidly re-starting peers, where the Q.933 nor NS have time to actually detect the connection was lost. Change-Id: I960a7b17f2550cb49a7b9d72ed87cd271bb64122 Related: OS#4974 --- M src/gb/frame_relay.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/22708/1 diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 679a315..7c75cd0 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -382,9 +382,19 @@ link_int_rx = TLVP_VAL(tp, Q933_IEI_LINK_INT_VERIF); link->last_rx_seq = link_int_rx[0]; + /* this is a bit of a hack. Q.933 explicitly forbids either side from ever + * sending a sequence number of '0'. Values start from '1' and are modulo 256, + * but '0' is always skipped. So if the peer is sending us a "last received + * sequence number of '0' it means it has not yet received any packets from us, + * which in turn can only mean that it has just been restarted. Let's treat + * this as "service affecting condition" and notify upper layers. This helps + * particularly in recovering from rapidly re-starting peers, where the Q.933 + * nor NS have time to actually detect the connection was lost. Se OS#4974 */ + if (link_int_rx[1] == 0) { + link_set_failed(link); /* the network checks the receive sequence number received from * the user equipment against its send sequence counter */ - if (link_int_rx[1] != link->last_tx_seq) { + } else if (link_int_rx[1] != link->last_tx_seq) { check_link_state(link, false); link->err_count++; } else { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960a7b17f2550cb49a7b9d72ed87cd271bb64122 Gerrit-Change-Number: 22708 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:28:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:28:23 +0000 Subject: Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22709 ) Change subject: ns2: Don't try to add packets to the backlog on real errors ...................................................................... ns2: Don't try to add packets to the backlog on real errors When writing to the AF_PACKET socket, we have to distinguish the pseudo-errors like -ENOBUFS (where we do want to add to the backlog) from real errors like -ENETDOWN, -EMSGSIZE, ... where we don't want to add the failed packet to the backlog. Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 --- M src/gb/gprs_ns2_fr.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/22709/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index b2b3cde..8421691 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -311,10 +311,14 @@ switch (errno) { case EAGAIN: case ENOBUFS: + /* not a real error, but more a normal event on AF_PACKET */ + /* don't free the message and let the caller re-enqueue */ return -errno; default: + /* an actual error, like -ENETDOWN, -EMSGSIZE */ LOGBIND(bind, LOGL_ERROR, "error during write to AF_PACKET: %s\n", strerror(errno)); - return -errno; + msgb_free(msg); + return 0; } } else { /* short write */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 Gerrit-Change-Number: 22709 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:28:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:28:23 +0000 Subject: Change in libosmocore[master]: ns2: Add rate_ctr_group for each bind References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22710 ) Change subject: ns2: Add rate_ctr_group for each bind ...................................................................... ns2: Add rate_ctr_group for each bind Those rate counters allow us to track statistics particularly about transmit related errors. We can see the rate and ration of overall transmit packets vs. those that failed to transmit, were short writes, had to be enqueued (FR only), ... Change-Id: Ic81f8de11b9b565e455dbecb34dddd1cb37d613b --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c 6 files changed, 66 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/22710/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index de27fb4..36c1c40 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -198,6 +198,23 @@ .class_id = OSMO_STATS_CLASS_PEER, }; +static const struct rate_ctr_desc nsbind_ctr_description[] = { + [NSBIND_CTR_PKTS_OUT] = { "packets:out", "Packets attempted (Out)" }, + [NSBIND_CTR_PKTS_OUT_DROP] = { "packets:out:drop", "Packets Dropped (Out)" }, + [NSBIND_CTR_PKTS_OUT_SHORT] = { "packets:out:short","Packets Short Write (Out)" }, + [NSBIND_CTR_PKTS_OUT_ENQ] = { "packets:out:enqueued", + "Packets Enqueued (Out)" }, + [NSBIND_CTR_PKTS_OUT_ERR] = { "packets:out:err", "Packets Error Write (Out)" }, +}; + +static const struct rate_ctr_group_desc nsbind_ctrg_desc = { + .group_name_prefix = "ns:bind", + .group_description = "NS Bind Statistics", + .num_ctr = ARRAY_SIZE(nsbind_ctr_description), + .ctr_desc = nsbind_ctr_description, + .class_id = OSMO_STATS_CLASS_PEER, +}; + const struct osmo_stat_item_desc nsbind_stat_description[] = { [NS2_BIND_STAT_BACKLOG_LEN] = { "tx_backlog_length", "Transmit backlog length", "packets", 16, 0 }, }; @@ -1397,16 +1414,16 @@ return -ENOMEM; bind->name = talloc_strdup(bind, name); - if (!bind->name) { - talloc_free(bind); - return -ENOMEM; - } + if (!bind->name) + goto err_free; + + bind->ctrg = rate_ctr_group_alloc(bind, &nsbind_ctrg_desc, nsi->bind_rate_ctr_idx); + if (!bind->ctrg) + goto err_free; bind->statg = osmo_stat_item_group_alloc(bind, &nsbind_statg_desc, nsi->bind_rate_ctr_idx); - if (!bind->statg) { - talloc_free(bind); - return -ENOMEM; - } + if (!bind->statg) + goto err_ctrg; bind->nsi = nsi; INIT_LLIST_HEAD(&bind->nsvc); @@ -1418,6 +1435,12 @@ *result = bind; return 0; + +err_ctrg: + rate_ctr_group_free(bind->ctrg); +err_free: + talloc_free(bind); + return -ENOMEM; } /*! @} */ diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 8421691..bf7deea 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -317,12 +318,14 @@ default: /* an actual error, like -ENETDOWN, -EMSGSIZE */ LOGBIND(bind, LOGL_ERROR, "error during write to AF_PACKET: %s\n", strerror(errno)); + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_ERR]); msgb_free(msg); return 0; } } else { /* short write */ LOGBIND(bind, LOGL_ERROR, "short write on AF_PACKET: %d < %d\n", rc, len); + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_SHORT]); msgb_free(msg); return 0; } @@ -378,6 +381,7 @@ /* always store only the last LMI message in the lmi_msg bucket */ msgb_free(priv->backlog.lmi_msg); priv->backlog.lmi_msg = msg; + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_ENQ]); return 0; default: /* there's no point in trying to enqueue messages if the interface is down */ @@ -395,12 +399,14 @@ /* enqueue BVCI=0 traffic at tail of queue */ if (bvci == BVCI_SIGNALLING) { enqueue_at_tail(bind, msg); + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_ENQ]); return 0; } break; default: /* enqueue NS signaling traffic at head of queue */ enqueue_at_head(bind, msg); + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_ENQ]); return 0; } break; @@ -408,6 +414,7 @@ out_free: /* drop everything that is not LMI, NS-signaling or BVCI-0 */ + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_DROP]); msgb_free(msg); return -1; } @@ -455,6 +462,8 @@ struct priv_bind *priv = bind->priv; int rc; + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT]); + if (llist_empty(&priv->backlog.list)) { /* attempt to transmit right now */ rc = fr_netif_write_one(bind, msg); diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 177aeb2..bd51712 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include "gprs_ns2_internal.h" @@ -486,9 +487,16 @@ int rc; struct priv_bind *priv = bind->priv; + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT]); + rc = sendto(priv->fd.fd, msg->data, msg->len, 0, &dest->u.sa, sizeof(*dest)); + if (rc < 0) + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_ERR]); + else if (rc < msg->len) + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_SHORT]); + msgb_free(msg); return rc; diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 6462907..2d77e16 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -107,6 +107,14 @@ NS_CTR_LOST_RESET, }; +enum nsbind_ctr { + NSBIND_CTR_PKTS_OUT, + NSBIND_CTR_PKTS_OUT_DROP, + NSBIND_CTR_PKTS_OUT_ENQ, + NSBIND_CTR_PKTS_OUT_ERR, + NSBIND_CTR_PKTS_OUT_SHORT, +}; + #define NSE_S_BLOCKED 0x0001 #define NSE_S_ALIVE 0x0002 #define NSE_S_RESET 0x0004 @@ -257,6 +265,7 @@ void (*dump_vty)(const struct gprs_ns2_vc_bind *bind, struct vty *vty, bool stats); + struct rate_ctr_group *ctrg; struct osmo_stat_item_group *statg; }; diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index e07f6d4..c8a6d0d 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "common_vty.h" @@ -144,9 +145,16 @@ int rc; struct priv_bind *priv = bind->priv; + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT]); + rc = sendto(priv->fd.fd, msg->data, msg->len, 0, &dest->u.sa, sizeof(*dest)); + if (rc < 0) + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_ERR]); + else if (rc < msg->len) + rate_ctr_inc(&bind->ctrg->ctr[NSBIND_CTR_PKTS_OUT_SHORT]); + msgb_free(msg); return rc; diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index a3aa6ee..d57b8b5 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1376,6 +1376,7 @@ bind->dump_vty(bind, vty, stats); if (stats) { + vty_out_rate_ctr_group(vty, " ", bind->ctrg); vty_out_stat_item_group(vty, " ", bind->statg); } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic81f8de11b9b565e455dbecb34dddd1cb37d613b Gerrit-Change-Number: 22710 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:30:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 18:30:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix unbound spb value in decoded egprs data blocks References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711 ) Change subject: RLCMAC: Fix unbound spb value in decoded egprs data blocks ...................................................................... RLCMAC: Fix unbound spb value in decoded egprs data blocks That field is only present in Header Type 3 blocks. Change-Id: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756 --- M library/RLCMAC_EncDec.cc M library/RLCMAC_Types.ttcn 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/22711/1 diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index ac22def..97bd0be 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -545,6 +545,7 @@ ret_val.bsn2__offset() = egprs1->bsn2_lo << 7 | egprs1->bsn2_hi; ret_val.pr() = egprs1->pr; ret_val.cps() = egprs1->cps; + ret_val.spb() = OMIT_VALUE; ttcn_buffer.increase_pos(sizeof(*egprs1)); return ret_val; @@ -571,6 +572,7 @@ ret_val.bsn2__offset() = 0; /*TODO: mark optional and not set ? */ ret_val.pr() = egprs2->pr; ret_val.cps() = egprs2->cps; + ret_val.spb() = OMIT_VALUE; ttcn_buffer.increase_pos(sizeof(*egprs2)); return ret_val; diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 3110a66..fe47231 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -238,9 +238,9 @@ uint11_t bsn1, uint8_t bsn2_offset, uint2_t pr, /* power reduction */ - uint2_t spb, + uint2_t spb optional, uint4_t cps - } with { variant "" }; + } with { variant (spb) "PRESENCE(header_type=RLCMAC_HDR_TYPE_3)" }; /* Manual C++ Decoder: */ type record RlcmacDlEgprsDataBlock { CodingScheme mcs, /* Provided by C++ Decoder */ @@ -295,9 +295,10 @@ uint4_t cps, boolean pfi_ind, BIT1 rsb, - BIT2 spb + BIT2 spb optional } with { variant (pfi_ind) "FIELDLENGTH(1)" + variant (spb) "PRESENCE(header_type=RLCMAC_HDR_TYPE_3)" }; /* Manual C++ Decoder: 10.3a.2.1 EGPRS Uplink RLC data block */ type record RlcmacUlEgprsDataBlock { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711 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: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756 Gerrit-Change-Number: 22711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:31:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 18:31:15 +0000 Subject: Change in libosmocore[master]: ns2: Don't queie Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queie Q.933 LMI messages; only store most recent ones ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22637/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22637/3//COMMIT_MSG at 7 PS3, Line 7: ns2: Don't queie Q.933 LMI messages; only store most recent ones So you edited the description from last patch version only to add a typo? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 18:31:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:31:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:31:16 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Factor-out function to set link as dead In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22707 ) Change subject: gb: frame_relay: Factor-out function to set link as dead ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I624b6a1175cf7d59173dfff02d6197bb644b9072 Gerrit-Change-Number: 22707 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 04 Feb 2021 18:31:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:31:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:31:28 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Detect link outage on "last receive seq nr == 0" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22708 ) Change subject: gb: frame_relay: Detect link outage on "last receive seq nr == 0" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960a7b17f2550cb49a7b9d72ed87cd271bb64122 Gerrit-Change-Number: 22708 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 18:31:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:32:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 18:32:56 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Factor-out function to set link as dead In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22707 ) Change subject: gb: frame_relay: Factor-out function to set link as dead ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I624b6a1175cf7d59173dfff02d6197bb644b9072 Gerrit-Change-Number: 22707 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 04 Feb 2021 18:32:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:34:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:34:06 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Factor-out function to set link as dead In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22707 ) Change subject: gb: frame_relay: Factor-out function to set link as dead ...................................................................... gb: frame_relay: Factor-out function to set link as dead Change-Id: I624b6a1175cf7d59173dfff02d6197bb644b9072 --- M src/gb/frame_relay.c 1 file changed, 15 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 96f51cf..679a315 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -343,6 +343,20 @@ } +static void link_set_failed(struct osmo_fr_link *link) +{ + struct osmo_fr_dlc *dlc; + + LOGPFRL(link, LOGL_NOTICE, "Link failed\n"); + link->state = false; + if (link->status_cb) + link->status_cb(link, link->cb_data, link->state); + + llist_for_each_entry(dlc, &link->dlc_list, list) { + dlc_set_active(dlc, false); + } +} + /* Q.933 */ static int rx_lmi_q933_status_enq(struct msgb *msg, struct tlv_parsed *tp) { @@ -427,14 +441,7 @@ if (!link->state) return; - LOGPFRL(link, LOGL_NOTICE, "Link failed\n"); - link->state = false; - if (link->status_cb) - link->status_cb(link, link->cb_data, link->state); - - llist_for_each_entry(dlc, &link->dlc_list, list) { - dlc_set_active(dlc, false); - } + link_set_failed(link); } else { /* good link */ if (link->state) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I624b6a1175cf7d59173dfff02d6197bb644b9072 Gerrit-Change-Number: 22707 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:34:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 18:34:07 +0000 Subject: Change in libosmocore[master]: gb: frame_relay: Detect link outage on "last receive seq nr == 0" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22708 ) Change subject: gb: frame_relay: Detect link outage on "last receive seq nr == 0" ...................................................................... gb: frame_relay: Detect link outage on "last receive seq nr == 0" this is a bit of a hack. Q.933 explicitly forbids either side from ever sending a sequence number of '0'. Values start from '1' and are modulo 256, but '0' is always skipped. So if the peer is sending us a "last received sequence number of '0' it means it has not yet received any packets from us, which in turn can only mean that it has just been restarted. Let's treat this as "service affecting condition" and notify upper layers. This helps particularly in recovering from rapidly re-starting peers, where the Q.933 nor NS have time to actually detect the connection was lost. Change-Id: I960a7b17f2550cb49a7b9d72ed87cd271bb64122 Related: OS#4974 --- M src/gb/frame_relay.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 679a315..7c75cd0 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -382,9 +382,19 @@ link_int_rx = TLVP_VAL(tp, Q933_IEI_LINK_INT_VERIF); link->last_rx_seq = link_int_rx[0]; + /* this is a bit of a hack. Q.933 explicitly forbids either side from ever + * sending a sequence number of '0'. Values start from '1' and are modulo 256, + * but '0' is always skipped. So if the peer is sending us a "last received + * sequence number of '0' it means it has not yet received any packets from us, + * which in turn can only mean that it has just been restarted. Let's treat + * this as "service affecting condition" and notify upper layers. This helps + * particularly in recovering from rapidly re-starting peers, where the Q.933 + * nor NS have time to actually detect the connection was lost. Se OS#4974 */ + if (link_int_rx[1] == 0) { + link_set_failed(link); /* the network checks the receive sequence number received from * the user equipment against its send sequence counter */ - if (link_int_rx[1] != link->last_tx_seq) { + } else if (link_int_rx[1] != link->last_tx_seq) { check_link_state(link, false); link->err_count++; } else { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960a7b17f2550cb49a7b9d72ed87cd271bb64122 Gerrit-Change-Number: 22708 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:34:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 18:34:13 +0000 Subject: Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22709 ) Change subject: ns2: Don't try to add packets to the backlog on real errors ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 Gerrit-Change-Number: 22709 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 18:34:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:38:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 18:38:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC bloc... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 ) Change subject: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC blocks coming from PCUIF ...................................................................... Patch Set 2: I got all tests passing now (only the ones which used to pass before ofc). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 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: Iecc33565fdc673e3499db12a0d4e0587290cfd45 Gerrit-Change-Number: 22321 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 18:38:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 18:38:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 4 Feb 2021 18:38:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 18:38:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 20:15:15 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Thu, 4 Feb 2021 20:15:15 +0000 Subject: Change in osmo-bsc[master]: cosmetic: shorten deref chains where possible References: Message-ID: iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22712 ) Change subject: cosmetic: shorten deref chains where possible ...................................................................... cosmetic: shorten deref chains where possible Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb --- M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/timeslot_fsm.c 5 files changed, 40 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/22712/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 9e00fe7..f45b507 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -973,6 +973,7 @@ { struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); struct gsm_lchan *lchan = msg->lchan; + struct rate_ctr_group *bts_ctrs = lchan->ts->trx->bts->bts_ctrs; struct tlv_parsed tp; const uint8_t *cause_p; @@ -981,14 +982,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); switch (lchan->type) { case GSM_LCHAN_SDCCH: - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_SDCCH]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_SDCCH]); break; case GSM_LCHAN_TCH_H: case GSM_LCHAN_TCH_F: - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_TCH]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_TCH]); break; default: break; @@ -1914,6 +1915,7 @@ { struct e1inp_sign_link *sign_link = msg->dst; struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg); + struct rate_ctr_group *bts_ctrs = sign_link->trx->bts->bts_ctrs; int rc = 0; msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr, @@ -1931,7 +1933,7 @@ case RSL_MT_DELETE_IND: /* CCCH overloaded, IMM_ASSIGN was dropped */ LOGPLCHAN(msg->lchan, DRSL, LOGL_NOTICE, "DELETE INDICATION (Downlink CCCH overload)\n"); - rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_DELETE_IND]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_DELETE_IND]); break; case RSL_MT_CBCH_LOAD_IND: /* current load on the CBCH */ @@ -1943,7 +1945,7 @@ default: LOGP(DRSL, LOGL_NOTICE, "Unknown Abis RSL TRX message type " "0x%02x\n", rslh->c.msg_type); - rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_UNKNOWN]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_UNKNOWN]); return -EINVAL; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5054096..5790b3f 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1231,6 +1231,7 @@ static void lchan_fsm_borken_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; enum bts_counter_id ctr; switch (prev_state) { case LCHAN_ST_UNUSED: @@ -1254,9 +1255,9 @@ default: ctr = BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN; } - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[ctr]); + rate_ctr_inc(&bts->bts_ctrs->ctr[ctr]); if (prev_state != LCHAN_ST_BORKEN) - osmo_stat_item_inc(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); /* The actual action besides all the beancounting above */ lchan_reset(lchan); @@ -1265,12 +1266,13 @@ static void lchan_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; switch (event) { case LCHAN_EV_RSL_CHAN_ACTIV_ACK: /* A late Chan Activ ACK? Release. */ - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK]); - osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); @@ -1279,15 +1281,15 @@ case LCHAN_EV_RSL_CHAN_ACTIV_NACK: /* A late Chan Activ NACK? Ok then, unused. */ - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK]); - osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan_fsm_state_chg(LCHAN_ST_UNUSED); return; case LCHAN_EV_RSL_RF_CHAN_REL_ACK: /* A late Release ACK? */ - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK]); - osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 0187a75..19cdeee 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -120,18 +120,19 @@ } if (conn && conn->lchan) { + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; switch (mtype) { case GSM48_MT_MM_LOC_UPD_ACCEPT: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]); break; case GSM48_MT_MM_LOC_UPD_REJECT: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]); break; case GSM48_MT_MM_IMSI_DETACH_IND: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]); break; default: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]); break; } } diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index d751fc1..49c4ef1 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -381,6 +381,7 @@ { struct input_signal_data *isd = signal_data; struct gsm_bts_trx *trx = isd->trx; + struct gsm_bts *bts = trx->bts; if (subsys != SS_L_INPUT) return -EINVAL; @@ -396,9 +397,9 @@ uint8_t ca[20]; /* has to be called before generate_ma_for_ts to set bts->si_common.cell_alloc */ - generate_cell_chan_list(ca, trx->bts); + generate_cell_chan_list(ca, bts); - llist_for_each_entry(cur_trx, &trx->bts->trx_list, list) { + llist_for_each_entry(cur_trx, &bts->trx_list, list) { int i; for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) generate_ma_for_ts(&cur_trx->ts[i]); @@ -411,19 +412,19 @@ LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type)); if (isd->link_type == E1INP_SIGN_OML) { - rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_BTS_OML_FAIL]); all_ts_dispatch_event(trx, TS_EV_OML_DOWN); } else if (isd->link_type == E1INP_SIGN_RSL) { - rate_ctr_inc(&trx->bts->bts_ctrs->ctr[BTS_CTR_BTS_RSL_FAIL]); - acc_ramp_abort(&trx->bts->acc_ramp); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_BTS_RSL_FAIL]); + acc_ramp_abort(&bts->acc_ramp); all_ts_dispatch_event(trx, TS_EV_RSL_DOWN); if (trx->nr == 0) - osmo_timer_del(&trx->bts->cbch_timer); + osmo_timer_del(&bts->cbch_timer); } - gsm_bts_sm_mo_reset(trx->bts->site_mgr); + gsm_bts_sm_mo_reset(bts->site_mgr); - abis_nm_clear_queue(trx->bts); + abis_nm_clear_queue(bts); break; default: break; diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index d8636a1..3fd9d69 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -366,6 +366,7 @@ static void ts_fsm_wait_pdch_act(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts_trx_ts *ts = ts_fi_ts(fi); + struct rate_ctr_group *bts_ctrs = ts->trx->bts->bts_ctrs; switch (event) { case TS_EV_PDCH_ACT_ACK: @@ -374,9 +375,9 @@ case TS_EV_PDCH_ACT_NACK: if (ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH) - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]); else - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]); ts->pdch_act_allowed = false; ts_fsm_error(fi, TS_ST_UNUSED, "Received PDCH activation NACK"); return; @@ -659,6 +660,7 @@ static void ts_fsm_borken_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx_ts *ts = ts_fi_ts(fi); + struct gsm_bts *bts = ts->trx->bts; enum bts_counter_id ctr; switch (prev_state) { case TS_ST_NOT_INITIALIZED: @@ -685,8 +687,8 @@ default: ctr = BTS_CTR_TS_BORKEN_FROM_UNKNOWN; } - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[ctr]); - osmo_stat_item_inc(ts->trx->bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[ctr]); + osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); } static void ts_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -783,9 +785,10 @@ static void ts_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_bts_trx_ts *ts = ts_fi_ts(fi); + struct gsm_bts *bts = ts->trx->bts; if (ts->fi->state == TS_ST_BORKEN) { - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_TS_BORKEN_EV_TEARDOWN]); - osmo_stat_item_dec(ts->trx->bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_TS_BORKEN_EV_TEARDOWN]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb Gerrit-Change-Number: 22712 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 20:26:22 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Thu, 4 Feb 2021 20:26:22 +0000 Subject: Change in osmo-bsc[master]: cosmetic: shorten deref chains where possible In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22712 to look at the new patch set (#2). Change subject: cosmetic: shorten deref chains where possible ...................................................................... cosmetic: shorten deref chains where possible Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb --- M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/timeslot_fsm.c 4 files changed, 31 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/22712/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb Gerrit-Change-Number: 22712 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 20:46:08 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 20:46:08 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile File osmo-gbproxy-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22636/1/osmo-gbproxy-master/Dockerfile at 34 PS1, Line 34: l > Done, not sure if I did it correctly for centos. [?] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 20:46:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 20:46:11 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 20:46:11 +0000 Subject: Change in docker-playground[master]: Add osmo-gbproxy-* container for osmo-gbproxy In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22636 ) Change subject: Add osmo-gbproxy-* container for osmo-gbproxy ...................................................................... Add osmo-gbproxy-* container for osmo-gbproxy Uses the new repo split off of osmo-sgsn Related: OS#4992 Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 --- M make/Makefile M osmo-gbproxy-master/Dockerfile M osmo-gbproxy-master/Makefile A osmo-gbproxy-master/Release.key M osmo-gbproxy-master/osmo-gbproxy.cfg M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh 7 files changed, 107 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved daniel: Verified diff --git a/make/Makefile b/make/Makefile index 7bb0345..5280bef 100644 --- a/make/Makefile +++ b/make/Makefile @@ -21,6 +21,7 @@ OSMO_BB_BRANCH?=master OSMO_BSC_BRANCH?=master OSMO_BTS_BRANCH?=master +OSMO_GBPROXY_BRANCH?=master OSMO_GGSN_BRANCH?=master OSMO_GSM_TESTER_BRANCH?=master OSMO_HLR_BRANCH?=master @@ -74,6 +75,7 @@ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ + --build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \ --build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \ --build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \ --build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \ diff --git a/osmo-gbproxy-master/Dockerfile b/osmo-gbproxy-master/Dockerfile index 8661ec9..9df1ee7 100644 --- a/osmo-gbproxy-master/Dockerfile +++ b/osmo-gbproxy-master/Dockerfile @@ -1,6 +1,69 @@ ARG USER ARG DISTRO -FROM $USER/osmo-sgsn-master +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN case "$DISTRO" in \ + debian*) \ + apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \ + ;; \ + esac + +# we need to add this to invalidate the cache once the repository is updated. +# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM +ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + libosmocore-dev \ + libosmo-abis-dev \ + libosmo-netif-dev \ + && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + telnet \ + "pkgconfig(libosmo-netif)" \ + "pkgconfig(libosmoabis)" \ + "pkgconfig(libosmocore)" \ + "pkgconfig(libosmoctrl)" \ + "pkgconfig(libosmogb)" \ + "pkgconfig(libosmogsm)" \ + "pkgconfig(libosmovty)" \ + ;; \ + esac + +WORKDIR /tmp + +ARG OSMO_GBPROXY_BRANCH="master" + +RUN git clone git://git.osmocom.org/osmo-gbproxy.git +ADD http://git.osmocom.org/osmo-gbproxy/patch?h=$OSMO_GBPROXY_BRANCH /tmp/commit + +RUN cd osmo-gbproxy && \ + git fetch && git checkout $OSMO_GBPROXY_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GBPROXY_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure && \ + make "-j$(nproc)" install && \ + ldconfig + +VOLUME /data COPY osmo-gbproxy.cfg /data/osmo-gbproxy.cfg diff --git a/osmo-gbproxy-master/Makefile b/osmo-gbproxy-master/Makefile index 1614f9a..9e5fb05 100644 --- a/osmo-gbproxy-master/Makefile +++ b/osmo-gbproxy-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.21 -v gbproxy-vol:/data +RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data include ../make/Makefile diff --git a/osmo-gbproxy-master/Release.key b/osmo-gbproxy-master/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-gbproxy-master/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-gbproxy-master/osmo-gbproxy.cfg b/osmo-gbproxy-master/osmo-gbproxy.cfg index 29f698f..dec0608 100644 --- a/osmo-gbproxy-master/osmo-gbproxy.cfg +++ b/osmo-gbproxy-master/osmo-gbproxy.cfg @@ -2,17 +2,28 @@ ! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty !! ! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging print category-hex 0 + logging timestamp 1 + logging print file 1 + logging level lns debug + logging level lbssgp debug + logging level gprs debug line vty no login + bind 0.0.0.0 ! -gbproxy - sgsn nsei 101 +sgsn nsei 101 + name main ns - nse 101 nsvci 101 - nse 101 remote-role sgsn - nse 101 encapsulation udp - nse 101 remote-ip 192.168.100.239 - nse 101 remote-port 7777 + bind udp local + listen 0.0.0.0 23000 + accept-ipaccess + nse 101 + nsvc ipa local 172.18.0.21 23000 nsvci 2342 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 @@ -20,7 +31,3 @@ timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation framerelay-gre enabled 0 - encapsulation framerelay-gre local-ip 0.0.0.0 - encapsulation udp local-ip 127.0.0.100 - encapsulation udp local-port 23000 diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 78d98e2..863e8ef 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -16,7 +16,6 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "osmo-sgsn-$IMAGE_SUFFIX" \ "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 2120f90..9605608 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -3,7 +3,7 @@ . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ - "osmo-sgsn-$IMAGE_SUFFIX" \ + "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" SUBNET=24 @@ -32,7 +32,7 @@ -v $VOL_BASE_DIR/gbproxy:/data \ --name ${BUILD_TAG}-gbproxy -d \ $DOCKER_ARGS \ - $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \ + $REPO_USER/osmo-gbproxy-$IMAGE_SUFFIX \ /bin/sh -c "osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1" echo Starting container with gbproxy testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1 Gerrit-Change-Number: 22636 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 20:51:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 20:51:52 +0000 Subject: Change in osmo-bsc[master]: cosmetic: shorten deref chains where possible In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22712 ) Change subject: cosmetic: shorten deref chains where possible ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb Gerrit-Change-Number: 22712 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 20:51:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 20:56:24 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 20:56:24 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#6) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... gb_proxy: simplify raid data storage Instead of storing the raw ra_id in its unparsed binary form, store it as a parsed struct. Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Related: OS#4894 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 25 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 21:01:51 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 21:01:51 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... Patch Set 6: This patch should now be correct, it does not eliminate the redundancy but it should be equivalent to the previous behavior. At least the TTCN3 tests look ok now and there is no segfault anymore. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 21:01:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 21:32:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 4 Feb 2021 21:32:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: fix config files References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22713 ) Change subject: gbproxy: fix config files ...................................................................... gbproxy: fix config files It seems only docker config files were updated, while the local ones have been forgotten in recent changes. We have to find a proper solution for this :/ Change-Id: I26e900617bb87983912d8440376a7449f318e737 --- M gbproxy/GBProxy_Tests.fr.cfg M gbproxy/osmo-gbproxy.fr.cfg 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/22713/1 diff --git a/gbproxy/GBProxy_Tests.fr.cfg b/gbproxy/GBProxy_Tests.fr.cfg index 234b2f4..65c3f52 100644 --- a/gbproxy/GBProxy_Tests.fr.cfg +++ b/gbproxy/GBProxy_Tests.fr.cfg @@ -17,6 +17,8 @@ GBProxy_Tests.mp_nsconfig_sgsn := { { handle_sns := true + }, { + handle_sns := true } } diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index 11ab84b..d0f8595 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -34,9 +34,9 @@ timer tns-alive 3 timer tns-alive-retries 10 nse 101 - ip-sns 127.0.0.1 7777 + ip-sns 127.0.0.10 7777 nse 102 - ip-sns 127.0.0.1 8888 + ip-sns 127.0.0.11 8888 nse 2001 nsvc fr hdlcnet1 dlci 16 nsvci 1 nsvc fr hdlcnet2 dlci 17 nsvci 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22713 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: I26e900617bb87983912d8440376a7449f318e737 Gerrit-Change-Number: 22713 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 21:32:30 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 4 Feb 2021 21:32:30 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer:Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer:Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 3: (1 comment) > Patch Set 3: > > > Patch Set 3: > > > > This be rebased onto I4d7558c04d9d01761516526086be5104bb2eeada > > I am confused... This is expected. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/2/src/gb_proxy_peer.c File src/gb_proxy_peer.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/2/src/gb_proxy_peer.c at 215 PS2, Line 215: if ((cell->id.cid == cid) && (!memcmp(&cell->id.raid, raid, sizeof(*raid)))) { > Ok, thanks. I was a bit unsure about that. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: dexter Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 04 Feb 2021 21:32:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 21:33:04 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 4 Feb 2021 21:33:04 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/6/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/6/src/gb_proxy.c at 674 PS6, Line 674: memcpy(&bvc->cell->id.raid, &bvc->id.raid, sizeof(bvc->cell->id.raid)); Shouldn't we use ra_id here and also copy ra_id to bvc->id.raid in the beginning of the function? I think then we can get rid of the FIXME below. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 21:33:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 21:38:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 4 Feb 2021 21:38:56 +0000 Subject: Change in osmo-trx[master]: sigProcLib: fix C/I computation for 8-PSK modulated bursts References: Message-ID: Hello tnt, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/22714 to review the following change. Change subject: sigProcLib: fix C/I computation for 8-PSK modulated bursts ...................................................................... sigProcLib: fix C/I computation for 8-PSK modulated bursts Change-Id: I860af60bc0fbd36dfb38316fad65ddd3a5827a8f Related: Ib4ceec553f2e5f77bf3f6777724968456a180f5e Related: OS#4006, OS#4373 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 3 files changed, 38 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/14/22714/1 diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 6de266c..0a1ba6f 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -734,11 +734,10 @@ goto ret_idle; } - type = (CorrType) rc; + rxBurst = demodAnyBurst(*burst, (CorrType) rc, cfg->rx_sps, &ebp); bi->toa = ebp.toa; bi->tsc = ebp.tsc; bi->ci = ebp.ci; - rxBurst = demodAnyBurst(*burst, cfg->rx_sps, ebp.amp, ebp.toa, type); /* EDGE demodulator returns 444 (gSlotLen * 3) bits */ if (rxBurst->size() == EDGE_BURST_NBITS) { diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 04f7e30..b7c41ba 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1792,15 +1792,15 @@ * stages. */ static signalVector *demodCommon(const signalVector &burst, int sps, - complex chan, float toa) + const struct estim_burst_params *ebp) { signalVector *delay, *dec; if ((sps != 1) && (sps != 4)) return NULL; - delay = delayVector(&burst, NULL, -toa * (float) sps); - scaleVector(*delay, (complex) 1.0 / chan); + delay = delayVector(&burst, NULL, -ebp->toa * (float) sps); + scaleVector(*delay, (complex) 1.0 / ebp->amp); if (sps == 1) return delay; @@ -1816,13 +1816,13 @@ * 4 SPS (if activated) to minimize distortion through the fractional * delay filters. Symbol rotation and after always operates at 1 SPS. */ -static SoftVector *demodGmskBurst(const signalVector &rxBurst, - int sps, complex channel, float TOA) +static SoftVector *demodGmskBurst(const signalVector &rxBurst, int sps, + const struct estim_burst_params *ebp) { SoftVector *bits; signalVector *dec; - dec = demodCommon(rxBurst, sps, channel, TOA); + dec = demodCommon(rxBurst, sps, ebp); if (!dec) return NULL; @@ -1835,6 +1835,27 @@ return bits; } +static float computeEdgeCI(const signalVector *rot) +{ + float err_pwr = 0.0f; + float step = 2.0f * M_PI_F / 8.0f; + + for (size_t i = 8; i < rot->size() - 8; i++) { + /* Compute the ideal symbol */ + complex sym = (*rot)[i]; + float phase = step * roundf(sym.arg() / step); + complex ideal = complex(cos(phase), sin(phase)); + + /* Compute the error vector */ + complex err = ideal - sym; + + /* Accumulate power */ + err_pwr += err.norm2(); + } + + return 3.0103f * log2f(1.0f * (rot->size() - 16) / err_pwr); +} + /* * Demodulate an 8-PSK burst. Prior to symbol rotation, operate at * 4 SPS (if activated) to minimize distortion through the fractional @@ -1845,19 +1866,20 @@ * through the fractional delay filters at 1 SPS renders signal * nearly unrecoverable. */ -static SoftVector *demodEdgeBurst(const signalVector &burst, - int sps, complex chan, float toa) +static SoftVector *demodEdgeBurst(const signalVector &burst, int sps, + struct estim_burst_params *ebp) { SoftVector *bits; signalVector *dec, *rot, *eq; - dec = demodCommon(burst, sps, chan, toa); + dec = demodCommon(burst, sps, ebp); if (!dec) return NULL; /* Equalize and derotate */ eq = convolve(dec, GSMPulse4->c0_inv, NULL, NO_DELAY); rot = derotateEdgeBurst(*eq, 1); + ebp->ci = computeEdgeCI(rot); /* Soft slice and normalize */ bits = softSliceEdgeBurst(*rot); @@ -1869,13 +1891,13 @@ return bits; } -SoftVector *demodAnyBurst(const signalVector &burst, int sps, complex amp, - float toa, CorrType type) +SoftVector *demodAnyBurst(const signalVector &burst, CorrType type, + int sps, struct estim_burst_params *ebp) { if (type == EDGE) - return demodEdgeBurst(burst, sps, amp, toa); + return demodEdgeBurst(burst, sps, ebp); else - return demodGmskBurst(burst, sps, amp, toa); + return demodGmskBurst(burst, sps, ebp); } bool sigProcLibSetup() diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index dd03190..0c3c7c6 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -134,7 +134,7 @@ struct estim_burst_params *ebp); /** Demodulate burst basde on type and output soft bits */ -SoftVector *demodAnyBurst(const signalVector &burst, int sps, - complex amp, float toa, CorrType type); +SoftVector *demodAnyBurst(const signalVector &burst, CorrType type, + int sps, struct estim_burst_params *ebp); #endif /* SIGPROCLIB_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I860af60bc0fbd36dfb38316fad65ddd3a5827a8f Gerrit-Change-Number: 22714 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: tnt Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 21:47:24 2021 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Thu, 4 Feb 2021 21:47:24 +0000 Subject: Change in osmo-trx[master]: sigProcLib: fix C/I computation for 8-PSK modulated bursts In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22714 ) Change subject: sigProcLib: fix C/I computation for 8-PSK modulated bursts ...................................................................... Patch Set 1: Code-Review+1 I mean ... I wrote the algo for it, so yeah I tend to agree with it. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I860af60bc0fbd36dfb38316fad65ddd3a5827a8f Gerrit-Change-Number: 22714 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: tnt Gerrit-CC: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 21:47:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 22:40:44 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 4 Feb 2021 22:40:44 +0000 Subject: Change in osmo-trx[master]: sigProcLib: fix C/I computation for 8-PSK modulated bursts In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22714 ) Change subject: sigProcLib: fix C/I computation for 8-PSK modulated bursts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I860af60bc0fbd36dfb38316fad65ddd3a5827a8f Gerrit-Change-Number: 22714 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 04 Feb 2021 22:40:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 4 22:41:28 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Thu, 4 Feb 2021 22:41:28 +0000 Subject: Change in osmo-trx[master]: sigProcLib: fix C/I computation for 8-PSK modulated bursts In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22714 ) Change subject: sigProcLib: fix C/I computation for 8-PSK modulated bursts ...................................................................... sigProcLib: fix C/I computation for 8-PSK modulated bursts Change-Id: I860af60bc0fbd36dfb38316fad65ddd3a5827a8f Related: Ib4ceec553f2e5f77bf3f6777724968456a180f5e Related: OS#4006, OS#4373 --- M Transceiver52M/Transceiver.cpp M Transceiver52M/sigProcLib.cpp M Transceiver52M/sigProcLib.h 3 files changed, 38 insertions(+), 17 deletions(-) Approvals: tnt: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 6de266c..0a1ba6f 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -734,11 +734,10 @@ goto ret_idle; } - type = (CorrType) rc; + rxBurst = demodAnyBurst(*burst, (CorrType) rc, cfg->rx_sps, &ebp); bi->toa = ebp.toa; bi->tsc = ebp.tsc; bi->ci = ebp.ci; - rxBurst = demodAnyBurst(*burst, cfg->rx_sps, ebp.amp, ebp.toa, type); /* EDGE demodulator returns 444 (gSlotLen * 3) bits */ if (rxBurst->size() == EDGE_BURST_NBITS) { diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 04f7e30..b7c41ba 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1792,15 +1792,15 @@ * stages. */ static signalVector *demodCommon(const signalVector &burst, int sps, - complex chan, float toa) + const struct estim_burst_params *ebp) { signalVector *delay, *dec; if ((sps != 1) && (sps != 4)) return NULL; - delay = delayVector(&burst, NULL, -toa * (float) sps); - scaleVector(*delay, (complex) 1.0 / chan); + delay = delayVector(&burst, NULL, -ebp->toa * (float) sps); + scaleVector(*delay, (complex) 1.0 / ebp->amp); if (sps == 1) return delay; @@ -1816,13 +1816,13 @@ * 4 SPS (if activated) to minimize distortion through the fractional * delay filters. Symbol rotation and after always operates at 1 SPS. */ -static SoftVector *demodGmskBurst(const signalVector &rxBurst, - int sps, complex channel, float TOA) +static SoftVector *demodGmskBurst(const signalVector &rxBurst, int sps, + const struct estim_burst_params *ebp) { SoftVector *bits; signalVector *dec; - dec = demodCommon(rxBurst, sps, channel, TOA); + dec = demodCommon(rxBurst, sps, ebp); if (!dec) return NULL; @@ -1835,6 +1835,27 @@ return bits; } +static float computeEdgeCI(const signalVector *rot) +{ + float err_pwr = 0.0f; + float step = 2.0f * M_PI_F / 8.0f; + + for (size_t i = 8; i < rot->size() - 8; i++) { + /* Compute the ideal symbol */ + complex sym = (*rot)[i]; + float phase = step * roundf(sym.arg() / step); + complex ideal = complex(cos(phase), sin(phase)); + + /* Compute the error vector */ + complex err = ideal - sym; + + /* Accumulate power */ + err_pwr += err.norm2(); + } + + return 3.0103f * log2f(1.0f * (rot->size() - 16) / err_pwr); +} + /* * Demodulate an 8-PSK burst. Prior to symbol rotation, operate at * 4 SPS (if activated) to minimize distortion through the fractional @@ -1845,19 +1866,20 @@ * through the fractional delay filters at 1 SPS renders signal * nearly unrecoverable. */ -static SoftVector *demodEdgeBurst(const signalVector &burst, - int sps, complex chan, float toa) +static SoftVector *demodEdgeBurst(const signalVector &burst, int sps, + struct estim_burst_params *ebp) { SoftVector *bits; signalVector *dec, *rot, *eq; - dec = demodCommon(burst, sps, chan, toa); + dec = demodCommon(burst, sps, ebp); if (!dec) return NULL; /* Equalize and derotate */ eq = convolve(dec, GSMPulse4->c0_inv, NULL, NO_DELAY); rot = derotateEdgeBurst(*eq, 1); + ebp->ci = computeEdgeCI(rot); /* Soft slice and normalize */ bits = softSliceEdgeBurst(*rot); @@ -1869,13 +1891,13 @@ return bits; } -SoftVector *demodAnyBurst(const signalVector &burst, int sps, complex amp, - float toa, CorrType type) +SoftVector *demodAnyBurst(const signalVector &burst, CorrType type, + int sps, struct estim_burst_params *ebp) { if (type == EDGE) - return demodEdgeBurst(burst, sps, amp, toa); + return demodEdgeBurst(burst, sps, ebp); else - return demodGmskBurst(burst, sps, amp, toa); + return demodGmskBurst(burst, sps, ebp); } bool sigProcLibSetup() diff --git a/Transceiver52M/sigProcLib.h b/Transceiver52M/sigProcLib.h index dd03190..0c3c7c6 100644 --- a/Transceiver52M/sigProcLib.h +++ b/Transceiver52M/sigProcLib.h @@ -134,7 +134,7 @@ struct estim_burst_params *ebp); /** Demodulate burst basde on type and output soft bits */ -SoftVector *demodAnyBurst(const signalVector &burst, int sps, - complex amp, float toa, CorrType type); +SoftVector *demodAnyBurst(const signalVector &burst, CorrType type, + int sps, struct estim_burst_params *ebp); #endif /* SIGPROCLIB_H */ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I860af60bc0fbd36dfb38316fad65ddd3a5827a8f Gerrit-Change-Number: 22714 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 01:00:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 01:00:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: fix a copy-pasted comment References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22715 ) Change subject: library/MGCP_Emulation: fix a copy-pasted comment ...................................................................... library/MGCP_Emulation: fix a copy-pasted comment Change-Id: If068b653811c836f8e937a6f77d79d0c150c8e63 --- M library/MGCP_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/22715/1 diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index 494b171..8ccc085 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -455,7 +455,7 @@ } } -/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +/* client/conn_hdlr side function to use procedure port to delete expect in emulation */ function f_create_mgcp_delete_ep(MgcpEndpoint ep) runs on MGCP_ConnHdlr { MGCP_PROC.call(MGCPEM_delete_ep:{ep, self}) { [] MGCP_PROC.getreply(MGCPEM_delete_ep:{?,?}) {}; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22715 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: If068b653811c836f8e937a6f77d79d0c150c8e63 Gerrit-Change-Number: 22715 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 01:00:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 01:00:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 ) Change subject: msc: finish and enable test case for MT Call T310 timer ...................................................................... msc: finish and enable test case for MT Call T310 timer The test suite needs to handle MGCP messages, otherwise the related FSMs in the IUT would tear everything down before T310 is expired. Change-Id: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Related: SYS#5340 --- M msc/MSC_Tests.ttcn 1 file changed, 41 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/22716/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e6681bb..206effa 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1679,43 +1679,69 @@ /* Test MT Call T310 timer */ friend function f_tc_mt_t310(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars, 200.0); var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); - var MNCC_PDU mncc; var MgcpCommand mgcp_cmd; + var PDU_BSSAP bssap; + timer T310; + f_init_handler(pars); + + /* Initiate a MT call, establish connection */ f_mt_call_start(cpars); /* MS->MSC: CALL CONFIRMED */ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CALL_CONF(cpars.transaction_id))); MNCC.receive(tr_MNCC_CALL_CONF_ind(cpars.mncc_callref)); - MGCP.receive(tr_CRCX) -> value mgcp_cmd; - cpars.mgcp_call_id := f_MgcpCmd_extract_call_id(mgcp_cmd); - cpars.mgcp_ep := mgcp_cmd.line.ep; - /* FIXME: Respond to CRCX */ + /* NOTE: MSC is expected to start T310 here */ - /* old libosmocore T310 default timeout is 180s. so let's wait 190 */ - timer T := 190.0; - T.start; + /* MSC->MGW: CRCX (first) */ + MGCP.receive(tr_CRCX) -> value mgcp_cmd; + f_handle_crcx(cpars, mgcp_cmd); /* MSC<-MGW: OK */ + + /* BSC->BSC: BSSMAP ASSIGNMENT REQ */ + BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, ?)) -> value bssap; + BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, + aoip := f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port), + speechCodec := ts_BSSMAP_IE_SpeechCodec({ ts_CodecFR }))); + + /* MSC->MGW: MDCX */ + MGCP.receive(tr_MDCX) -> value mgcp_cmd; + MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, + sdp := omit)); + + /* MSC->MGW: CRCX (second) */ + MGCP.receive(tr_CRCX) -> value mgcp_cmd; + f_handle_crcx(cpars, mgcp_cmd); /* MSC<-MGW: OK */ + MNCC.receive(tr_MNCC_RTP_CREATE(cpars.mncc_callref)); + + /* Reschedule the guard timeout */ + g_Tguard.start(30.0 + 10.0); + + /* NOTE: the BSC is expected to respond with CC ALERTING at this state, so + * the MSC would stop T310. However, the idea is to verify T310 expiration + * here, so grab some popcorn and wait for MNCC DISC.ind. */ + T310.start(30.0 + 2.0); alt { - [] T.timeout { - setverdict(fail, "Timeout waiting for T310"); + [] T310.timeout { + setverdict(fail, "Timeout waiting for MNCC DISC.ind due to T310"); mtc.stop; } [] MNCC.receive(tr_MNCC_DISC_ind(cpars.mncc_callref)) { MNCC.send(ts_MNCC_REL_req(cpars.mncc_callref, valueof(ts_MNCC_cause(23)))); + log("Rx MNCC DISC.ind, T310.read yelds ", T310.read); + setverdict(pass); } } + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_DISC(cpars.transaction_id))); BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))); - /* FIXME: We're sending this with TIflag 0: allocated by sender, which is wrong */ - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id))); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id, '1'B))); alt { [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd { MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id)); - f_create_mgcp_delete_ep(cpars.mgcp_ep); + // FIXME: f_create_mgcp_delete_ep(cpars.mgcp_ep); repeat; } [] as_clear_cmd_compl_disc(); @@ -6342,7 +6368,7 @@ execute( TC_mo_crcx_ran_reject() ); execute( TC_mt_crcx_ran_reject() ); execute( TC_mo_setup_and_dtmf_dup() ); - //execute( TC_mt_t310() ); + execute( TC_mt_t310() ); execute( TC_gsup_cancel() ); execute( TC_lu_imsi_auth_tmsi_encr_1_13() ); execute( TC_lu_imsi_auth_tmsi_encr_3_13() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 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: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Gerrit-Change-Number: 22716 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 5 01:57:57 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 05 Feb 2021 01:57:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <601ca634617b2_35c82afc5c9a25f8951896@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 253s] [COMPILING apps/dfu/main.c] [ 253s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 253s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 253s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 254s] Memory region Used Size Region Size %age Used [ 254s] rom: 16580 B 16 KB 101.20% [ 254s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 254s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 254s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 254s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 254s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 254s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 254s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 254s] collect2: error: ld returned 1 exit status [ 254s] % [ 254s] make[2]: *** [Makefile:234: flash] Error 1 [ 254s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 254s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 254s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 254s] dh_auto_build: error: make -j1 returned exit code 2 [ 254s] make: *** [debian/rules:16: build] Error 25 [ 254s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 254s] ### VM INTERACTION START ### [ 257s] [ 236.003180] sysrq: Power Off [ 257s] [ 236.013188] reboot: Power down [ 257s] ### VM INTERACTION END ### [ 257s] [ 257s] lamb02 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 5 01:57:47 UTC 2021. [ 257s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Feb 5 02:15:23 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 05 Feb 2021 02:15:23 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601caa4ca1fd9_35c82afc5c9a25f8955662@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 199s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 199s] [COMPILING libboard/qmod/source/card_pres.c] [ 199s] [COMPILING libboard/qmod/source/wwan_led.c] [ 199s] [COMPILING libboard/qmod/source/i2c.c] [ 200s] [COMPILING libboard/qmod/source/board_qmod.c] [ 200s] [COMPILING apps/dfu/main.c] [ 200s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 200s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 200s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 200s] Memory region Used Size Region Size %age Used [ 200s] rom: 16588 B 16 KB 101.25% [ 200s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 200s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 200s] collect2: error: ld returned 1 exit status [ 200s] % [ 200s] make[2]: *** [Makefile:234: flash] Error 1 [ 200s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 200s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 200s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 200s] dh_auto_build: error: make -j1 returned exit code 2 [ 200s] make: *** [debian/rules:16: build] Error 25 [ 200s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 200s] ### VM INTERACTION START ### [ 204s] [ 186.572025] sysrq: Power Off [ 204s] [ 186.576811] reboot: Power down [ 204s] ### VM INTERACTION END ### [ 204s] [ 204s] lamb10 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 5 02:15:20 UTC 2021. [ 204s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 5 02:59:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 02:59:17 +0000 Subject: Change in libosmocore[master]: gsm0808: gsm0808_create_ass2(): use osmo_store{16, 32}be() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: gsm0808_create_ass2(): use osmo_store{16,32}be() ...................................................................... gsm0808: gsm0808_create_ass2(): use osmo_store{16,32}be() This API makes the code simpler and easier to read. Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b --- M src/gsm/gsm0808.c 1 file changed, 5 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/22717/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 971d962..bd3afeb 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -494,8 +494,6 @@ { /* See also: 3GPP TS 48.008 3.2.1.1 ASSIGNMENT REQUEST */ struct msgb *msg; - uint16_t cic_sw; - uint32_t ci_sw; /* Mandatory emelent! */ OSMO_ASSERT(ct); @@ -514,9 +512,8 @@ /* Circuit Identity Code 3.2.2.2 */ if (cic) { - cic_sw = osmo_htons(*cic); - msgb_tv_fixed_put(msg, GSM0808_IE_CIRCUIT_IDENTITY_CODE, - sizeof(cic_sw), (uint8_t *) & cic_sw); + msgb_v_put(msg, GSM0808_IE_CIRCUIT_IDENTITY_CODE); + osmo_store16be(*cic, msgb_put(msg, sizeof(*cic))); } /* AoIP: AoIP Transport Layer Address (MGW) 3.2.2.102 */ @@ -531,17 +528,9 @@ /* AoIP: Call Identifier 3.2.2.105 */ if (ci) { /* NOTE: 3GPP TS 48.008, section 3.2.2.105 specifies that - the least significant byte should be transmitted first. - On x86, this would mean that the endieness is already - correct, however a platform independed implementation - is required: */ -#ifndef OSMO_IS_LITTLE_ENDIAN - ci_sw = osmo_swab32(*ci); -#else - ci_sw = *ci; -#endif - msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, sizeof(ci_sw), - (uint8_t *) & ci_sw); + * the least significant byte shall be transmitted first. */ + msgb_v_put(msg, GSM0808_IE_CALL_ID); + osmo_store32le(*ci, msgb_put(msg, sizeof(*ci))); } if (kc) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 03:03:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 03:03:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates: fix: ensure 'no extension' in {ts, tr}_Called References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22718 ) Change subject: library/L3_Templates: fix: ensure 'no extension' in {ts,tr}_Called ...................................................................... library/L3_Templates: fix: ensure 'no extension' in {ts,tr}_Called Our definitions contain the minimum for 'CalledPartyBCD_Number', optional extensions are not supported. Thus do not indicate their presence, use '1'B (inverted logic) in both templates. Change-Id: I448a1f7b71ed7d63d397da2b7d04942b501deaa5 Related: SYS#5340 --- M library/L3_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/22718/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 2eb0bb2..5bd87eb 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1112,7 +1112,7 @@ lengthIndicator := 0, /* overwritten */ numberingPlanIdentification := '0000'B, typeOfNumber := '000'B, /* unknown */ - ext1 := '0'B, + ext1 := '1'B, /* no extension */ digits := digits } @@ -1121,7 +1121,7 @@ lengthIndicator := ?, numberingPlanIdentification := ?, typeOfNumber := ?, - ext1 := ?, + ext1 := '1'B, /* no extension */ digits := digits } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22718 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: I448a1f7b71ed7d63d397da2b7d04942b501deaa5 Gerrit-Change-Number: 22718 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 04:36:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 04:36:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 ) Change subject: msc: test reaction on Clear Request during a MO/MT Call ...................................................................... msc: test reaction on Clear Request during a MO/MT Call Change-Id: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Related: SYS#5340 --- M msc/MSC_Tests.ttcn 1 file changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/22719/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 206effa..0974eb8 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -935,6 +935,66 @@ vc_conn.done; } +/* Test reaction on Clear Request during a MO Call */ +friend function f_TC_mo_mt_call_clear_request(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var CallParameters cpars := valueof(t_CallParams); + var MNCC_PDU mncc_pdu; + timer T := 2.0; + + f_init_handler(pars); + + f_perform_lu(); + + /* HACK: reducing code duplication ('66'H - MO, '68'H - MT) */ + if (pars.imsi == '262420002532766'H) + { f_mo_call_establish(cpars); } + else + { f_mt_call_establish(cpars); } + + /* Hold the line for a while... */ + f_sleep(2.0); + + /* BSC sends BSSMAP Clear Request (e.g. due to RR failure) */ + BSSAP.send(ts_BSSMAP_ClearRequest(1)); + + /* Expect (optional) CC RELEASE and Clear Command */ + var default ccrel := activate(as_optional_cc_rel(cpars)); + f_expect_clear(); + deactivate(ccrel); + + /* Expect DISconnect notification on the MNCC socket */ + T.start; + alt { + [] MNCC.receive(tr_MNCC_DISC_ind(cpars.mncc_callref)) -> value mncc_pdu { + log("Rx MNCC DISC.ind, cause := ", mncc_pdu.u.signal.cause); + setverdict(pass); + } + [] MNCC.receive(MNCC_PDU:?) -> value mncc_pdu { + setverdict(fail, "Rx unexpected MNCC PDU: ", mncc_pdu); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for MNCC DISC.ind"); + } + } +} +testcase TC_mo_call_clear_request() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_TC_mo_mt_call_clear_request), 2532766); // '66'H - MO + vc_conn.done; +} +testcase TC_mt_call_clear_request() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_TC_mo_mt_call_clear_request), 2532768); // '68'H - MT + vc_conn.done; +} + /* Test LU but BSC will send a clear request in the middle */ friend function f_tc_lu_disconnect(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); @@ -6345,6 +6405,8 @@ execute( TC_lu_auth_sai_timeout() ); execute( TC_lu_auth_sai_err() ); execute( TC_lu_clear_request() ); + execute( TC_mo_call_clear_request() ); + execute( TC_mt_call_clear_request() ); execute( TC_lu_disconnect() ); execute( TC_lu_by_imei() ); execute( TC_lu_by_tmsi_noauth_unknown() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:41:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:41:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: fix config files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22713 ) Change subject: gbproxy: fix config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22713 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: I26e900617bb87983912d8440376a7449f318e737 Gerrit-Change-Number: 22713 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:41:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:41:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:41:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: fix config files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22713 ) Change subject: gbproxy: fix config files ...................................................................... gbproxy: fix config files It seems only docker config files were updated, while the local ones have been forgotten in recent changes. We have to find a proper solution for this :/ Change-Id: I26e900617bb87983912d8440376a7449f318e737 --- M gbproxy/GBProxy_Tests.fr.cfg M gbproxy/osmo-gbproxy.fr.cfg 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gbproxy/GBProxy_Tests.fr.cfg b/gbproxy/GBProxy_Tests.fr.cfg index 234b2f4..65c3f52 100644 --- a/gbproxy/GBProxy_Tests.fr.cfg +++ b/gbproxy/GBProxy_Tests.fr.cfg @@ -17,6 +17,8 @@ GBProxy_Tests.mp_nsconfig_sgsn := { { handle_sns := true + }, { + handle_sns := true } } diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index 11ab84b..d0f8595 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -34,9 +34,9 @@ timer tns-alive 3 timer tns-alive-retries 10 nse 101 - ip-sns 127.0.0.1 7777 + ip-sns 127.0.0.10 7777 nse 102 - ip-sns 127.0.0.1 8888 + ip-sns 127.0.0.11 8888 nse 2001 nsvc fr hdlcnet1 dlci 16 nsvci 1 nsvc fr hdlcnet2 dlci 17 nsvci 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22713 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: I26e900617bb87983912d8440376a7449f318e737 Gerrit-Change-Number: 22713 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:42:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:42:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: fix a copy-pasted comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22715 ) Change subject: library/MGCP_Emulation: fix a copy-pasted comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22715 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: If068b653811c836f8e937a6f77d79d0c150c8e63 Gerrit-Change-Number: 22715 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:42:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:43:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:43:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates: fix: ensure 'no extension' in {ts, tr}_Called In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22718 ) Change subject: library/L3_Templates: fix: ensure 'no extension' in {ts,tr}_Called ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22718 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: I448a1f7b71ed7d63d397da2b7d04942b501deaa5 Gerrit-Change-Number: 22718 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:43:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:43:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:43:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 ) Change subject: msc: finish and enable test case for MT Call T310 timer ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 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: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Gerrit-Change-Number: 22716 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:44:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:44:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 ) Change subject: msc: test reaction on Clear Request during a MO/MT Call ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:44:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:44:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:44:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MGCP_Emulation: fix a copy-pasted comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22715 ) Change subject: library/MGCP_Emulation: fix a copy-pasted comment ...................................................................... library/MGCP_Emulation: fix a copy-pasted comment Change-Id: If068b653811c836f8e937a6f77d79d0c150c8e63 --- M library/MGCP_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index 494b171..8ccc085 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -455,7 +455,7 @@ } } -/* client/conn_hdlr side function to use procedure port to create expect in emulation */ +/* client/conn_hdlr side function to use procedure port to delete expect in emulation */ function f_create_mgcp_delete_ep(MgcpEndpoint ep) runs on MGCP_ConnHdlr { MGCP_PROC.call(MGCPEM_delete_ep:{ep, self}) { [] MGCP_PROC.getreply(MGCPEM_delete_ep:{?,?}) {}; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22715 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: If068b653811c836f8e937a6f77d79d0c150c8e63 Gerrit-Change-Number: 22715 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:44:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:44:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/L3_Templates: fix: ensure 'no extension' in {ts, tr}_Called In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22718 ) Change subject: library/L3_Templates: fix: ensure 'no extension' in {ts,tr}_Called ...................................................................... library/L3_Templates: fix: ensure 'no extension' in {ts,tr}_Called Our definitions contain the minimum for 'CalledPartyBCD_Number', optional extensions are not supported. Thus do not indicate their presence, use '1'B (inverted logic) in both templates. Change-Id: I448a1f7b71ed7d63d397da2b7d04942b501deaa5 Related: SYS#5340 --- M library/L3_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 2eb0bb2..5bd87eb 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1112,7 +1112,7 @@ lengthIndicator := 0, /* overwritten */ numberingPlanIdentification := '0000'B, typeOfNumber := '000'B, /* unknown */ - ext1 := '0'B, + ext1 := '1'B, /* no extension */ digits := digits } @@ -1121,7 +1121,7 @@ lengthIndicator := ?, numberingPlanIdentification := ?, typeOfNumber := ?, - ext1 := ?, + ext1 := '1'B, /* no extension */ digits := digits } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22718 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: I448a1f7b71ed7d63d397da2b7d04942b501deaa5 Gerrit-Change-Number: 22718 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:44:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:44:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix decoding of dl data block with no llc block header byte In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 ) Change subject: RLCMAC: Fix decoding of dl data block with no llc block header byte ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 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: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b Gerrit-Change-Number: 22706 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:44:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:44:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:44:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix unbound spb value in decoded egprs data blocks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711 ) Change subject: RLCMAC: Fix unbound spb value in decoded egprs data blocks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711 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: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756 Gerrit-Change-Number: 22711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:44:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:45:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:45:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:45:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:46:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:46:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC bloc... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 ) Change subject: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC blocks coming from PCUIF ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 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: Iecc33565fdc673e3499db12a0d4e0587290cfd45 Gerrit-Change-Number: 22321 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:46:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:46:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:46:23 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22637 to look at the new patch set (#4). Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... ns2: Don't queue Q.933 LMI messages; only store most recent ones There's not really any point in storing multiple LMI messages, and then transmitting them in inverse order, as the existing code does. Instead, we shall store only the last (failed) LMI message and try to transmit that at highest priority, before any NS messages in the actual queue. Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 --- M src/gb/gprs_ns2_fr.c 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/22637/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 09:50:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 09:50:48 +0000 Subject: Change in libosmocore[master]: gsm0808: gsm0808_create_ass2(): use osmo_store{16, 32}be() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: gsm0808_create_ass2(): use osmo_store{16,32}be() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22717/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/c/libosmocore/+/22717/1/src/gsm/gsm0808.c at a519 PS1, Line 519: sizeof(cic_sw), (uint8_t *) & cic_sw); wouldn't msgb_tv16_put() simply do the trick? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 09:50:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:09:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:09:35 +0000 Subject: Change in osmo-bsc[master]: cosmetic: shorten deref chains where possible In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22712 ) Change subject: cosmetic: shorten deref chains where possible ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb Gerrit-Change-Number: 22712 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 10:09:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:09:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:09:38 +0000 Subject: Change in osmo-bsc[master]: cosmetic: shorten deref chains where possible In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22712 ) Change subject: cosmetic: shorten deref chains where possible ...................................................................... cosmetic: shorten deref chains where possible Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb --- M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/timeslot_fsm.c 4 files changed, 31 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 9e00fe7..f45b507 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -973,6 +973,7 @@ { struct abis_rsl_dchan_hdr *dh = msgb_l2(msg); struct gsm_lchan *lchan = msg->lchan; + struct rate_ctr_group *bts_ctrs = lchan->ts->trx->bts->bts_ctrs; struct tlv_parsed tp; const uint8_t *cause_p; @@ -981,14 +982,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "CONNECTION FAIL%s\n", rsl_cause_name(&tp)); - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL]); switch (lchan->type) { case GSM_LCHAN_SDCCH: - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_SDCCH]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_SDCCH]); break; case GSM_LCHAN_TCH_H: case GSM_LCHAN_TCH_F: - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_TCH]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_RF_FAIL_TCH]); break; default: break; @@ -1914,6 +1915,7 @@ { struct e1inp_sign_link *sign_link = msg->dst; struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg); + struct rate_ctr_group *bts_ctrs = sign_link->trx->bts->bts_ctrs; int rc = 0; msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr, @@ -1931,7 +1933,7 @@ case RSL_MT_DELETE_IND: /* CCCH overloaded, IMM_ASSIGN was dropped */ LOGPLCHAN(msg->lchan, DRSL, LOGL_NOTICE, "DELETE INDICATION (Downlink CCCH overload)\n"); - rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_DELETE_IND]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_DELETE_IND]); break; case RSL_MT_CBCH_LOAD_IND: /* current load on the CBCH */ @@ -1943,7 +1945,7 @@ default: LOGP(DRSL, LOGL_NOTICE, "Unknown Abis RSL TRX message type " "0x%02x\n", rslh->c.msg_type); - rate_ctr_inc(&sign_link->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_UNKNOWN]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_UNKNOWN]); return -EINVAL; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5054096..5790b3f 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1231,6 +1231,7 @@ static void lchan_fsm_borken_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; enum bts_counter_id ctr; switch (prev_state) { case LCHAN_ST_UNUSED: @@ -1254,9 +1255,9 @@ default: ctr = BTS_CTR_LCHAN_BORKEN_FROM_UNKNOWN; } - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[ctr]); + rate_ctr_inc(&bts->bts_ctrs->ctr[ctr]); if (prev_state != LCHAN_ST_BORKEN) - osmo_stat_item_inc(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); /* The actual action besides all the beancounting above */ lchan_reset(lchan); @@ -1265,12 +1266,13 @@ static void lchan_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; switch (event) { case LCHAN_EV_RSL_CHAN_ACTIV_ACK: /* A late Chan Activ ACK? Release. */ - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK]); - osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_ACK]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); @@ -1279,15 +1281,15 @@ case LCHAN_EV_RSL_CHAN_ACTIV_NACK: /* A late Chan Activ NACK? Ok then, unused. */ - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK]); - osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_CHAN_ACTIV_NACK]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan_fsm_state_chg(LCHAN_ST_UNUSED); return; case LCHAN_EV_RSL_RF_CHAN_REL_ACK: /* A late Release ACK? */ - rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK]); - osmo_stat_item_dec(lchan->ts->trx->bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_LCHAN_BORKEN_EV_RF_CHAN_REL_ACK]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_LCHAN_BORKEN], 1); lchan->release.in_error = true; lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 0187a75..19cdeee 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -120,18 +120,19 @@ } if (conn && conn->lchan) { + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; switch (mtype) { case GSM48_MT_MM_LOC_UPD_ACCEPT: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_ACCEPT]); break; case GSM48_MT_MM_LOC_UPD_REJECT: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_REJECT]); break; case GSM48_MT_MM_IMSI_DETACH_IND: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_DETACH]); break; default: - rate_ctr_inc(&conn->lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_LOCATION_UPDATE_UNKNOWN]); break; } } diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index d8636a1..3fd9d69 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -366,6 +366,7 @@ static void ts_fsm_wait_pdch_act(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts_trx_ts *ts = ts_fi_ts(fi); + struct rate_ctr_group *bts_ctrs = ts->trx->bts->bts_ctrs; switch (event) { case TS_EV_PDCH_ACT_ACK: @@ -374,9 +375,9 @@ case TS_EV_PDCH_ACT_NACK: if (ts->pchan_on_init == GSM_PCHAN_TCH_F_PDCH) - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]); else - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]); + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_CHAN_ACT_NACK]); ts->pdch_act_allowed = false; ts_fsm_error(fi, TS_ST_UNUSED, "Received PDCH activation NACK"); return; @@ -659,6 +660,7 @@ static void ts_fsm_borken_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx_ts *ts = ts_fi_ts(fi); + struct gsm_bts *bts = ts->trx->bts; enum bts_counter_id ctr; switch (prev_state) { case TS_ST_NOT_INITIALIZED: @@ -685,8 +687,8 @@ default: ctr = BTS_CTR_TS_BORKEN_FROM_UNKNOWN; } - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[ctr]); - osmo_stat_item_inc(ts->trx->bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[ctr]); + osmo_stat_item_inc(bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); } static void ts_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -783,9 +785,10 @@ static void ts_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_bts_trx_ts *ts = ts_fi_ts(fi); + struct gsm_bts *bts = ts->trx->bts; if (ts->fi->state == TS_ST_BORKEN) { - rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_TS_BORKEN_EV_TEARDOWN]); - osmo_stat_item_dec(ts->trx->bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_TS_BORKEN_EV_TEARDOWN]); + osmo_stat_item_dec(bts->bts_statg->items[BTS_STAT_TS_BORKEN], 1); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic42db1a2d768c8ee7e07406ac5f77af757e52cdb Gerrit-Change-Number: 22712 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:11:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 10:11:04 +0000 Subject: Change in libosmocore[master]: frame_relay; Fix Q.933 async STATUS at DLC creation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22720 ) Change subject: frame_relay; Fix Q.933 async STATUS at DLC creation ...................................................................... frame_relay; Fix Q.933 async STATUS at DLC creation Fix the encoding of the asynchronous Q.933 STATUS message we send at DLC creation time. Change-Id: Id1460ffa6266be85f44579c447421eed12481b02 Closes: OS#5010 --- M src/gb/frame_relay.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/22720/1 diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 7c75cd0..c54384e 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -977,7 +977,7 @@ llist_add_tail(&dlc->list, &link->dlc_list); dlc->add = true; - tx_lmi_q933_status(link, Q933_IEI_PVC_STATUS); + tx_lmi_q933_status(link, Q933_REPT_SINGLE_PVC_ASYNC_STS); return dlc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id1460ffa6266be85f44579c447421eed12481b02 Gerrit-Change-Number: 22720 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:13:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:13:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 ) Change subject: msc: finish and enable test case for MT Call T310 timer ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716/2/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716/2/msc/MSC_Tests.ttcn at 1744 PS2, Line 1744: // FIXME: f_create_mgcp_delete_ep(cpars.mgcp_ep); what about this? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 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: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Gerrit-Change-Number: 22716 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 10:13:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:14:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:14:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix decoding of dl data block with no llc block header byte In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 ) Change subject: RLCMAC: Fix decoding of dl data block with no llc block header byte ...................................................................... RLCMAC: Fix decoding of dl data block with no llc block header byte The value was marked as unbound while it should be marked as omitted: """ dl_block := { data := { cs := CS_1 (0), mac_hdr := { mac_hdr := { payload_type := MAC_PT_RLC_DATA (0), rrbp := RRBP_Nplus13_mod_2715648 (0), rrbp_valid := false, usf := 7 }, hdr_ext := { pr := PWR_RED_0_to_3dB (0), spare := '0'B, tfi := 0, fbi := false, bsn := 0, e := true } }, blocks := { { hdr := , payload := '0D0C8653110FFEF072972C5A790C0317299753B5'O } } } } } """ Change-Id: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b --- M library/RLCMAC_EncDec.cc 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index ac60b37..ac22def 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -505,6 +505,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data()); ttcn_buffer.increase_pos(length); ret_val.blocks()[0] = lb; @@ -663,6 +664,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data()); aligned_buffer.increase_pos(length); ret_val.blocks()[0] = lb; @@ -792,6 +794,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, ttcn_buffer.get_read_data()); ttcn_buffer.increase_pos(length); ret_val.blocks()[0] = lb; @@ -945,6 +948,7 @@ /* LI not present: The Upper Layer PDU that starts with the current RLC data block either * fills the current RLC data block precisely or continues in the following in-sequence RLC * data block */ + lb.hdr() = OMIT_VALUE; lb.payload() = OCTETSTRING(length, aligned_buffer.get_read_data()); aligned_buffer.increase_pos(length); ret_val.blocks()[0] = lb; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22706 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: If00338729ee1b2c8a4e100495e7cfa0599a4cb8b Gerrit-Change-Number: 22706 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:14:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:14:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RLCMAC: Fix unbound spb value in decoded egprs data blocks In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711 ) Change subject: RLCMAC: Fix unbound spb value in decoded egprs data blocks ...................................................................... RLCMAC: Fix unbound spb value in decoded egprs data blocks That field is only present in Header Type 3 blocks. Change-Id: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756 --- M library/RLCMAC_EncDec.cc M library/RLCMAC_Types.ttcn 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc index ac22def..97bd0be 100644 --- a/library/RLCMAC_EncDec.cc +++ b/library/RLCMAC_EncDec.cc @@ -545,6 +545,7 @@ ret_val.bsn2__offset() = egprs1->bsn2_lo << 7 | egprs1->bsn2_hi; ret_val.pr() = egprs1->pr; ret_val.cps() = egprs1->cps; + ret_val.spb() = OMIT_VALUE; ttcn_buffer.increase_pos(sizeof(*egprs1)); return ret_val; @@ -571,6 +572,7 @@ ret_val.bsn2__offset() = 0; /*TODO: mark optional and not set ? */ ret_val.pr() = egprs2->pr; ret_val.cps() = egprs2->cps; + ret_val.spb() = OMIT_VALUE; ttcn_buffer.increase_pos(sizeof(*egprs2)); return ret_val; diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 3110a66..fe47231 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -238,9 +238,9 @@ uint11_t bsn1, uint8_t bsn2_offset, uint2_t pr, /* power reduction */ - uint2_t spb, + uint2_t spb optional, uint4_t cps - } with { variant "" }; + } with { variant (spb) "PRESENCE(header_type=RLCMAC_HDR_TYPE_3)" }; /* Manual C++ Decoder: */ type record RlcmacDlEgprsDataBlock { CodingScheme mcs, /* Provided by C++ Decoder */ @@ -295,9 +295,10 @@ uint4_t cps, boolean pfi_ind, BIT1 rsb, - BIT2 spb + BIT2 spb optional } with { variant (pfi_ind) "FIELDLENGTH(1)" + variant (spb) "PRESENCE(header_type=RLCMAC_HDR_TYPE_3)" }; /* Manual C++ Decoder: 10.3a.2.1 EGPRS Uplink RLC data block */ type record RlcmacUlEgprsDataBlock { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22711 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: Ie05576d7d7c18933dd9abcdc055cbfe1e4e54756 Gerrit-Change-Number: 22711 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:15:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:15:26 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 10:15:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:16:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 10:16:13 +0000 Subject: Change in libosmocore[master]: frame_relay; Fix Q.933 async STATUS at DLC creation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22720 ) Change subject: frame_relay; Fix Q.933 async STATUS at DLC creation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id1460ffa6266be85f44579c447421eed12481b02 Gerrit-Change-Number: 22720 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 10:16:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 10:56:36 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 10:56:36 +0000 Subject: Change in libosmocore[master]: frame_relay; Fix Q.933 async STATUS at DLC creation In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22720 ) Change subject: frame_relay; Fix Q.933 async STATUS at DLC creation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id1460ffa6266be85f44579c447421eed12481b02 Gerrit-Change-Number: 22720 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 10:56:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:01:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:01:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Define a global default set of MS RaCap References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721 ) Change subject: pcu: Define a global default set of MS RaCap ...................................................................... pcu: Define a global default set of MS RaCap We initialize those verbose structures over and over in different tests, and we usually don't care about detials, only whether they enable EGPRS or not. So let's define them once and reuse them in tests whenever possible. Some tests requiring specific values (eg to test allocation of 8 PDCH on a single TBF) are left intact. Change-Id: Id047929ad71dc7e330b09fd6cbfab2da43320fde --- M pcu/PCU_Tests.ttcn 1 file changed, 41 insertions(+), 144 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/22721/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 3c3b570..8c9b469 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -118,6 +118,28 @@ const octetstring si13_default := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; const octetstring si_default := si1_default & si3_default & si13_default; +const MultislotCap_GPRS mscap_gprs_def := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B +}; +const MultislotCap_EGPRS mscap_egprs_def := { + egprsmultislotclass := '00011'B, + egprsextendeddynalloccap := '0'B +}; +template (value) MSRadioAccessCapabilityV ms_racap_gprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, omit) }; +template (value) MSRadioAccessCapabilityV ms_racap_egprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, mscap_egprs_def) }; + +const MultislotCap_GPRS_BSSGP bssgp_mscap_gprs_def := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B +}; +const MultislotCap_EGPRS_BSSGP bssgp_mscap_egprs_def := { + egprsmultislotclass := '00011'B, + egprsextendeddynalloccap := '0'B +}; +template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_gprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, omit)) }; +template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_egprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, bssgp_mscap_egprs_def)) }; + type record lqual_range { /* component reference to the IPA_Client component used for RSL */ uint8_t low, @@ -1077,15 +1099,6 @@ var uint32_t unused_fn, sched_fn; var GprsMS ms; var CodingScheme exp_ul_mcs; - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; /* Initialize GPRS MS side */ f_init_gprs_ms(); @@ -1104,7 +1117,7 @@ ms.lqual_cb := g_mcs_lqual_ranges[2].low * 10; /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def)); if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_mcs)) { setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_mcs); @@ -1161,16 +1174,6 @@ var PollFnCtx pollctx; var uint32_t unused_fn, sched_fn; var GprsMS ms; - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - /* Initialize GPRS MS side */ f_init_gprs_ms(); @@ -1185,7 +1188,7 @@ f_pcuvty_set_link_quality_ranges(); /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -1210,15 +1213,6 @@ var RlcmacDlBlock dl_block; var uint32_t poll_fn; var GprsMS ms; - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS_BSSGP mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1242,7 +1236,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, bssgp_ms_racap_egprs_def)); f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ @@ -1273,17 +1267,7 @@ f_pcuvty_set_allowed_cs_mcs(); f_pcuvty_set_link_quality_ranges(); - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS_BSSGP mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - - f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), ms_racap); + f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), bssgp_ms_racap_egprs_def); } /* Verify PCU drops TBF after some time of inactivity. */ @@ -1728,46 +1712,27 @@ } testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT { - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template CodingScheme exp_ul_cs_mcs := cs_gprs_any; var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; - f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs); + f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT { - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any; var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any; - f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs); + f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT { /* Configure PCU to force two phase access */ g_force_two_phase_access := true; - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false); var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; - f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs); + f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } /* Test scenario where SGSN wants to send some data against MS and it is @@ -1832,13 +1797,8 @@ /* TC_mt_ping_pong, but DL-UNITDATA contains RA Access capability with (M)CS /* information about the MS */ testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT { - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - } ; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template CodingScheme exp_cs_mcs := cs_gprs_any; - f_TC_mt_ping_pong(ms_racap, exp_cs_mcs); + f_TC_mt_ping_pong(bssgp_ms_racap_gprs_def, exp_cs_mcs); } /* Verify that if PCU doesn't get one of the intermediate UL data blocks in a UL @@ -2703,18 +2663,7 @@ /* Verify osmo-pcu Doesn't append LLC UI dummy frames to rlcmac blocks * containing llc data. See OS#4849 */ testcase TC_dl_egprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT { - - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS_BSSGP mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - - f_tc_dl_data_no_llc_ui_dummy(ms_racap); + f_tc_dl_data_no_llc_ui_dummy(bssgp_ms_racap_egprs_def); } private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req, @@ -3266,7 +3215,6 @@ var PCUIF_info_ind info_ind; const integer num_ms := 2; /* 2 MS, first one is GPRS-only, second one is EGPRS */ var PollFnCtx pollctx; - var MSRadioAccessCapabilityV ms_racap; var uint32_t sched_fn, dl_fn, ack_fn; var octetstring data := f_rnd_octstring(10); var RlcmacDlBlock dl_block; @@ -3297,18 +3245,8 @@ f_bssgp_establish(); f_multi_ms_bssgp_register(); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - /* Establish UL TBF for MS0 (GPRS-only) */ - ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; - pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap_gprs_def)); if (not match(g_ms[0].ul_tbf.tx_cs_mcs, cs_gprs_any)) { setverdict(fail, "Wrong CS_MCS ", g_ms[0].ul_tbf.tx_cs_mcs, " received vs exp ", cs_gprs_any); f_shutdown(__BFILE__, __LINE__); @@ -3317,8 +3255,7 @@ f_ms_tx_ul_block(g_ms[0], ts_RLCMAC_CTRL_ACK(g_ms[0].tlli), pollctx.fn, nr := pollctx.tstrxbts); /* Establish UL TBF for MS1 (EGPRS) */ - ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap_egprs_def)); if (not match(g_ms[1].ul_tbf.tx_cs_mcs, mcs_egprs_any)) { setverdict(fail, "Wrong CS_MCS ", g_ms[1].ul_tbf.tx_cs_mcs, " received vs exp ", mcs_egprs_any); f_shutdown(__BFILE__, __LINE__); @@ -3748,11 +3685,6 @@ var PollFnCtx pollctx; var GprsMS ms; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); @@ -3774,7 +3706,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3791,11 +3723,6 @@ var RlcmacDlBlock dl_block; var uint32_t sched_fn; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); @@ -3817,7 +3744,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3844,11 +3771,6 @@ var PollFnCtx pollctx; var GprsMS ms; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template (value) RlcmacUlCtrlMsg cell_chf_notif; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ @@ -3873,7 +3795,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3893,11 +3815,6 @@ var PollFnCtx pollctx; var GprsMS ms; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template (value) RlcmacUlCtrlMsg cell_chf_notif; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ @@ -3922,7 +3839,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3947,11 +3864,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; @@ -3977,7 +3889,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -4008,11 +3920,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; @@ -4036,7 +3943,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -4077,11 +3984,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; @@ -4105,7 +4007,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -4146,11 +4048,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */ @@ -4184,7 +4081,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721 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: Id047929ad71dc7e330b09fd6cbfab2da43320fde Gerrit-Change-Number: 22721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:02:09 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Feb 2021 11:02:09 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Patch Set 1: Okay, I've tagged a 0.0.1 release: https://git.osmocom.org/osmo-gbproxy/tag/?h=0.0.1 Now --version reports 0.0.1, so I'm abandoning this workaround. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 11:02:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:02:21 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Feb 2021 11:02:21 +0000 Subject: Change in osmo-ci[master]: repo-install-test: osmo-gbproxy: disable ver check In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22700 ) Change subject: repo-install-test: osmo-gbproxy: disable ver check ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia906f03812f39bc3cf4876cda50b30fc38ec3094 Gerrit-Change-Number: 22700 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:08:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:08:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 ) Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function ...................................................................... BSSGP_Emulation: Fix warning: control reaches end of non-void function Change-Id: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/22722/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 4af5f82..f6921d8 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -593,6 +593,7 @@ } setverdict(fail, "No LLC SAPI for ", l3_mo); mtc.stop; + self.stop; } private function f_llc_sapi_by_l3_mt(PDU_L3_SGSN_MS l3_mt) return BIT4 { @@ -605,6 +606,7 @@ } setverdict(fail, "No LLC SAPI for ", l3_mt); mtc.stop; + self.stop; } #endif @@ -832,6 +834,7 @@ function DefaultCreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli, BssgpDecoded dec) runs on BSSGP_BVC_CT { setverdict(fail, "Couldn't find Component for TLLI ", tlli); mtc.stop; + self.stop; } /* @@ -877,6 +880,7 @@ setverdict(fail, "Cannot unregister index=", i, " IMSI ", imsi, " registred to ", ClientTable[i].comp_ref, " from ", vc_conn); mtc.stop; + self.stop; } log("Removing Client IMSI=", imsi, ", index=", i); ClientTable[i] := { @@ -921,6 +925,7 @@ } setverdict(fail, "Couldn't find Component for IMSI ", imsi); mtc.stop; + self.stop; } private function f_tbl_comp_by_tlli(OCT4 tlli) runs on BSSGP_BVC_CT return BSSGP_Client_CT { @@ -944,6 +949,7 @@ } setverdict(fail, "Couldn't find Client for Component ", comp_ref); mtc.stop; + self.stop; } private function f_tbl_tlli_by_comp(BSSGP_Client_CT comp_ref) runs on BSSGP_BVC_CT return OCT4 { @@ -956,6 +962,7 @@ } setverdict(fail, "Couldn't find TLLI for Component ", comp_ref); mtc.stop; + self.stop; } /* PDU_BSSGP enhanced with LLC and possibly L3 decoded payloads */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:08:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:08:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix indentation whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 ) Change subject: BSSGP_Emulation: Fix indentation whitespace ...................................................................... BSSGP_Emulation: Fix indentation whitespace Change-Id: Iade336832e7045cd29bae52c7907c6a1c57813cd --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/22723/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index f6921d8..1d10815 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -364,7 +364,7 @@ } else { setverdict(fail, "Rx SIG BSSGP for unknown PTP BVCI ", ptp_bvci, ": ", udi.bssgp); BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0)); - } + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 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: Iade336832e7045cd29bae52c7907c6a1c57813cd Gerrit-Change-Number: 22723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:15:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:15:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... pcu: Fix warning: The value returned by function is not used Change-Id: Iac84facc0041b928f04a5e2d2311dfd9d642c5a9 --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/22724/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 4fca26e..21e1ed7 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -302,14 +302,14 @@ if (sgsn_originated_reset) { /* Expect BVC-RESET, but ignore it to prevent a race condition of BVC RESETs */ - var template PDU_NS pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, 0, omit)); - f_ns_exp(pdu); + var template PDU_NS pdu_tmpl := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, 0, omit)); + var PDU_NS pdu := f_ns_exp(pdu_tmpl); /* SGSN originated BVC-RESET on an uninitialized signalling BVC */ f_tx_bvc_reset_rx_ack(0, omit, omit); /* Expect BVC-RESET PTP BVC, but ignore it to prevent a race condition of BVC RESETs */ - pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id)); - f_ns_exp(pdu); + pdu_tmpl := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id)); + pdu := f_ns_exp(pdu_tmpl); /* SGSN originated BVC-RESET on an uninitialized PTP BVC */ f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvc[0].bvci, omit, mp_gb_cfg.bvc[0].cell_id); } else { @@ -363,14 +363,14 @@ if (sgsn_originated_reset) { /* Expect BVC-RESET, but ignore it to prevent a race condition of BVC RESETs */ - var template PDU_NS pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, 0, omit)); - f_ns_exp(pdu, idx := 1); + var template PDU_NS pdu_tmpl := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, 0, omit)); + var PDU_NS pdu := f_ns_exp(pdu_tmpl, idx := 1); /* SGSN originated BVC-RESET on an uninitialized sign BVC */ f_tx_bvc_reset_rx_ack(0, omit, omit, idx := 1); /* Expect BVC-RESET PTP BVC, but ignore it to prevent a race condition of BVC RESETs */ - pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id)); - f_ns_exp(pdu, idx := 1); + pdu_tmpl := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id)); + pdu := f_ns_exp(pdu_tmpl, idx := 1); f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvc[0].bvci, omit, mp_gb_cfg.bvc[0].cell_id, idx := 1); } else { /* Expect BVC-RESET for signaling BVCI=0 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 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: Iac84facc0041b928f04a5e2d2311dfd9d642c5a9 Gerrit-Change-Number: 22724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:18:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:18:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CTRL: Avoid using keyword 'now' as var References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 ) Change subject: CTRL: Avoid using keyword 'now' as var ...................................................................... CTRL: Avoid using keyword 'now' as var Fixes warning: Keyword 'now' is treated as an identifier. Activate compiler option '-I' to use real-time testing features Change-Id: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f --- M library/Osmocom_CTRL_Functions.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/22725/1 diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index 294fe33..15cb26f 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -268,14 +268,14 @@ * Set the test verdict accordingly. */ function f_counter_name_vals_expect(IPA_CTRL_PT pt, charstring instance_name, integer instance_nr, CounterNameVals vals) { - var CounterNameVals now := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); + var CounterNameVals last := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); for (var integer i := 0; i < lengthof(vals); i := i + 1) { - if (now[i].name != vals[i].name) { + if (last[i].name != vals[i].name) { setverdict(fail, "Internal error"); } - if (now[i].val != vals[i].val) { + if (last[i].val != vals[i].val) { setverdict(fail, "Rate counter mismatch: ", instance_name, " ", instance_nr, - " ", vals[i].name, " is at ", now[i].val, " but expected ", vals[i].val); + " ", vals[i].name, " is at ", last[i].val, " but expected ", vals[i].val); } } setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 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: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f Gerrit-Change-Number: 22725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:26:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:26:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... pcu: Fix warning: The value returned by function is not used Change-Id: Id7068e74439d1532c32c6113e642d0b3b063aaf3 --- M pcu/PCUIF_Components.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/22726/1 diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 50de700..868012f 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -363,11 +363,16 @@ repeat; } [lengthof(pdtch_data_queue) > 0] CLCK.receive(tr_RAW_PCU_EV(TDMA_EV_PDTCH_BLOCK_END)) -> value event { + var boolean exists; /* FN matching the beginning of current block: */ ev_begin_fn := event.data.tdma_fn - 3; /* Check if we reached time to serve the first DATA.ind message in the queue: */ - f_PCUIF_MsgQueue_first(pdtch_data_queue, pcu_msg); + exists := f_PCUIF_MsgQueue_first(pdtch_data_queue, pcu_msg); + if (not exists) { + /* Should not happen since we end up here if lengthof(pdtch_data_queue) > 0 */ + mtc.stop; + } next_fn := pcu_msg.u.data_ind.fn; if (next_fn != 0 and next_fn != ev_begin_fn) { if (next_fn < ev_begin_fn) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726 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: Id7068e74439d1532c32c6113e642d0b3b063aaf3 Gerrit-Change-Number: 22726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:38:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:38:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... pcu: Fix inadequate restriction on the referenced template parameter Fixes: warning: Inadequate restriction on the referenced template parameter `chreq_desc', this may cause a dynamic test case error at runtime Change-Id: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b --- M pcu/GPRS_Components.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/22727/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index bf2e868..3658fc8 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -423,7 +423,7 @@ } function f_dltbf_ts_RLCMAC_DL_ACK_NACK(DlTbf dl_tbf, boolean use_egprs := false, - template ChannelReqDescription chreq_desc := omit) + template (omit) ChannelReqDescription chreq_desc := omit) runs on MS_BTS_IFACE_CT return template RlcmacUlBlock { if (use_egprs) { return ts_RLCMAC_DL_ACK_NACK_EGPRS(dl_tbf.tfi, dl_tbf.egprs_acknack_desc, false, chreq_desc); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 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: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b Gerrit-Change-Number: 22727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:38:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:38:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... pcu: Fix inadequate restriction on the referenced template parameter Fixes: warning: Inadequate restriction on the referenced template parameter `tfi', this may cause a dynamic test case error at runtime Same for other parameters. Change-Id: If2cadbc7087ac0f99537b9916ef0c23363c9242c --- M library/RLCMAC_Templates.ttcn 1 file changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/22728/1 diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 981061c..6b5fb9f 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -422,9 +422,12 @@ } /* Template for uplink Data block */ - template RlcmacUlBlock t_RLCMAC_UL_DATA(template CodingScheme cs, template uint5_t tfi, - template uint4_t cv, template uint7_t bsn, - template LlcBlocks blocks := {}, template boolean stall := false) := { + template (value) RlcmacUlBlock t_RLCMAC_UL_DATA(template (value) CodingScheme cs, + template (value) uint5_t tfi, + template (value) uint4_t cv, + template (value) uint7_t bsn, + template (value) LlcBlocks blocks := {}, + template (value) boolean stall := false) := { data := { cs := cs, mac_hdr := { @@ -444,10 +447,13 @@ blocks := blocks } } - template RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template CodingScheme cs, template uint5_t tfi, - template uint4_t cv, template uint7_t bsn, - template LlcBlocks blocks := {}, template boolean stall := false, - template GprsTlli tlli) := { + template (value) RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template (value) CodingScheme cs, + template (value) uint5_t tfi, + template (value) uint4_t cv, + template (value) uint7_t bsn, + template (value) LlcBlocks blocks := {}, + template (value) boolean stall := false, + template (value) GprsTlli tlli) := { data := { cs := cs, mac_hdr := { @@ -469,9 +475,12 @@ } /* Template for uplink Data block */ - template RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs, - template uint5_t tfi, template uint4_t cv, - template uint11_t bsn1, template uint8_t bsn2_offset := 0, template EgprsLlcBlocks blocks := {}) := { + template (value) RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs, + template (value) uint5_t tfi, + template (value) uint4_t cv, + template (value) uint11_t bsn1, + template (value) uint8_t bsn2_offset := 0, + template (value) EgprsLlcBlocks blocks := {}) := { data_egprs := { mcs := mcs, mac_hdr := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 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: If2cadbc7087ac0f99537b9916ef0c23363c9242c Gerrit-Change-Number: 22728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 11:42:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 11:42:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... pcu: Fix inadequate restriction on the referenced template parameter warning: Inadequate restriction on the referenced template parameter `imsi' Change-Id: Iecd19d8d397e427068e495577889e1247faa11e7 --- M pcu/GPRS_Components.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/22729/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 3658fc8..830f8d3 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -1153,7 +1153,7 @@ } /* Return true if a given Packet Paging Request contains the given IMSI, false otherwise */ -function f_pkt_paging_match_imsi(in PacketPagingReq req, template hexstring imsi, +function f_pkt_paging_match_imsi(in PacketPagingReq req, template (present) hexstring imsi, boolean cs_domain := true, boolean ps_domain := true) runs on MS_BTS_IFACE_CT return boolean { if (not ispresent(req.repeated_pageinfo)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 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: Iecd19d8d397e427068e495577889e1247faa11e7 Gerrit-Change-Number: 22729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 12:05:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 12:05:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function Fixes warning: Osmocom_Gb_Types.ttcn:1377.13-32: warning: Inadequate restriction on the referenced function `f_oct_or_wc(bmax, 2)', this may cause a dynamic test case error at runtime Change-Id: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/22730/1 diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index cbaeb72..04d32aa 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -1374,7 +1374,7 @@ lengthIndicator := { length1 := 2 }, - bmax := f_oct_or_wc(bmax, 2) + bmax := valueof(f_oct_or_wc(bmax, 2)) }, bucket_Leak_Rate := { iEI := '03'O, @@ -1382,7 +1382,7 @@ lengthIndicator := { length1 := 2 }, - r_Value := f_oct_or_wc(bucket_leak_rate, 2) + r_Value := valueof(f_oct_or_wc(bucket_leak_rate, 2)) }, bucket_Full_Ratio := omit, flow_Control_Granularity := omit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 12:05:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 12:05:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: Inadequate restriction on the referenc... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 ) Change subject: Osmocom_Gb_Types: Fix warning: Inadequate restriction on the referenced template parameter ...................................................................... Osmocom_Gb_Types: Fix warning: Inadequate restriction on the referenced template parameter Fixes warning: Osmocom_Gb_Types.ttcn:1397.26-29: warning: Inadequate restriction on the referenced template parameter `tlli', this may cause a dynamic test case error at runtime Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849 --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/22731/1 diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 04d32aa..5af9b8d 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -921,7 +921,7 @@ }, tLLI_Value := tlli } - template TLLI_BSSGP tr_BSSGP_TLLI(template GprsTlli tlli) := { + template (present) TLLI_BSSGP tr_BSSGP_TLLI(template (present) GprsTlli tlli) := { iEI := '1F'O, ext := '1'B, lengthIndicator := { @@ -1394,7 +1394,7 @@ template (present) OCT1 tag := ?) := { pDU_BSSGP_FLOW_CONTROL_MS := { bssgpPduType := '28'O, - tLLI := ts_BSSGP_TLLI(tlli), + tLLI := tr_BSSGP_TLLI(tlli), tag := { iEI := '1E'O, ext := '1'B, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 12:15:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 12:15:12 +0000 Subject: Change in libosmocore[master]: gsm0808: gsm0808_create_ass2(): use osmo_store{16, 32}be() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: gsm0808_create_ass2(): use osmo_store{16,32}be() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22717/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/c/libosmocore/+/22717/1/src/gsm/gsm0808.c at a519 PS1, Line 519: sizeof(cic_sw), (uint8_t *) & cic_sw); > wouldn't msgb_tv16_put() simply do the trick? Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 12:15:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 12:28:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 12:28:16 +0000 Subject: Change in libosmocore[master]: gsm0808: use msgb_tv16_put() and osmo_store32be() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22717 to look at the new patch set (#2). Change subject: gsm0808: use msgb_tv16_put() and osmo_store32be() ...................................................................... gsm0808: use msgb_tv16_put() and osmo_store32be() This API makes the code simpler and easier to read. Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b --- M src/gsm/gsm0808.c 1 file changed, 5 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/22717/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 12:30:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 12:30:59 +0000 Subject: Change in libosmocore[master]: gsm0808: use msgb_tv16_put() and osmo_store32be() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: use msgb_tv16_put() and osmo_store32be() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 12:30:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:21:07 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Feb 2021 13:21:07 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... apn_start: avoid segfault if missing tun-device Check if tun-device is defined and give the user a hint that it is missing instead of segfaulting with gtpu-mode kernel-gtp: 20210205141701206 DGGSN <0002> ggsn.c:186 APN(internet): Starting 20210205141701206 DGGSN <0002> ggsn.c:204 APN(internet): Opening Kernel GTP device (null) Segmentation fault With gtpu-mode tun it didn't segfault, but still tried to open the NULL device: 20210205141557598 DGGSN <0002> ggsn.c:186 APN(internet): Starting 20210205141557599 DGGSN <0002> ggsn.c:189 APN(internet): Opening TUN device (null) 20210205141557599 DTUN <0001> tun.c:195 errno=1/Operation not permitted ioctl() failed Related: OS#3208 Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 --- M ggsn/ggsn.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/32/22732/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 267637d..bb503ca 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -183,6 +183,11 @@ if (apn->started) return 0; + if (!apn->tun.cfg.dev_name) { + LOGPAPN(LOGL_ERROR, apn, "Missing tun-device in config\n"); + return -1; + } + LOGPAPN(LOGL_INFO, apn, "Starting\n"); switch (apn->cfg.gtpu_mode) { case APN_GTPU_MODE_TUN: -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:32:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 13:32:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 to look at the new patch set (#2). Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings ...................................................................... Osmocom_Gb_Types: Fix tons of template restriction warnings Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849 --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 191 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/22731/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:35:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 13:35:05 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/1/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/1/ggsn/ggsn.c at 186 PS1, Line 186: if (!apn->tun.cfg.dev_name) { I would rather add this kind of check during main() after parsing VTY. It's actually the only time which this can happen: during startup. Since once it's set, the dev name is always non null, even if changed through VTY. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 13:35:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 13:37:57 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: check return value of osmo_fsm_register() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22733 ) Change subject: bssgp_bvc_fsm: check return value of osmo_fsm_register() ...................................................................... bssgp_bvc_fsm: check return value of osmo_fsm_register() Change-Id: I0ade2e476a035bb44b2f135ece4552d015852274 Fixes: CID#215717 --- M src/gb/bssgp_bvc_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/22733/1 diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index 6de0028..6b8bd14 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -819,5 +819,5 @@ static __attribute__((constructor)) void on_dso_load_bvc_fsm(void) { - osmo_fsm_register(&bssgp_bvc_fsm); + OSMO_ASSERT(osmo_fsm_register(&bssgp_bvc_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ade2e476a035bb44b2f135ece4552d015852274 Gerrit-Change-Number: 22733 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:42:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 13:42:06 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: check return value of osmo_fsm_register() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22733 ) Change subject: bssgp_bvc_fsm: check return value of osmo_fsm_register() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ade2e476a035bb44b2f135ece4552d015852274 Gerrit-Change-Number: 22733 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 13:42:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:51:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 13:51:10 +0000 Subject: Change in libosmocore[master]: ns2: Name NSVC FSM events consistently References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22734 ) Change subject: ns2: Name NSVC FSM events consistently ...................................................................... ns2: Name NSVC FSM events consistently Reading a log line like this: <0026> gprs_ns2_vc_fsm.c:808 GPRS-NS2-VC(FR-hdlcnet1-DLCI16-NSE02001-NSVC00001)[0x6120000024a0]{UNBLOCKED}: Received Event RESET is very ambiguous. Does it mean we received a NS-RESET message? Does it mean the FSM was instructed to send a NS-RESET? ... Let's make sure the human-readable names give a very clear indication of what exactly is happening. Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/22734/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index f6424de..66ee450 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -122,18 +122,18 @@ }; static const struct value_string ns2_vc_event_names[] = { - { GPRS_NS2_EV_REQ_START, "START" }, - { GPRS_NS2_EV_RX_RESET, "RESET" }, - { GPRS_NS2_EV_RX_RESET_ACK, "RESET_ACK" }, - { GPRS_NS2_EV_RX_UNBLOCK, "UNBLOCK" }, - { GPRS_NS2_EV_RX_UNBLOCK_ACK, "UNBLOCK_ACK" }, - { GPRS_NS2_EV_RX_BLOCK, "BLOCK" }, - { GPRS_NS2_EV_RX_BLOCK_ACK, "BLOCK_ACK" }, - { GPRS_NS2_EV_RX_ALIVE, "ALIVE" }, - { GPRS_NS2_EV_RX_ALIVE_ACK, "ALIVE_ACK" }, - { GPRS_NS2_EV_RX_STATUS, "STATUS" }, - { GPRS_NS2_EV_RX_UNITDATA, "UNITDATA" }, - { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "FORCE_UNCONFIGURED" }, + { GPRS_NS2_EV_REQ_START, "REQ-START" }, + { GPRS_NS2_EV_RX_RESET, "RX-RESET" }, + { GPRS_NS2_EV_RX_RESET_ACK, "RX-RESET_ACK" }, + { GPRS_NS2_EV_RX_UNBLOCK, "RX-UNBLOCK" }, + { GPRS_NS2_EV_RX_UNBLOCK_ACK, "RX-UNBLOCK_ACK" }, + { GPRS_NS2_EV_RX_BLOCK, "RX-BLOCK" }, + { GPRS_NS2_EV_RX_BLOCK_ACK, "RX-BLOCK_ACK" }, + { GPRS_NS2_EV_RX_ALIVE, "RX-ALIVE" }, + { GPRS_NS2_EV_RX_ALIVE_ACK, "RX-ALIVE_ACK" }, + { GPRS_NS2_EV_RX_STATUS, "RX-STATUS" }, + { GPRS_NS2_EV_RX_UNITDATA, "RX-UNITDATA" }, + { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "REQ-FORCE_UNCONFIGURED" }, { GPRS_NS2_EV_REQ_OM_BLOCK, "REQ-O&M-BLOCK"}, { GPRS_NS2_EV_REQ_OM_UNBLOCK, "REQ-O&M-UNBLOCK"}, { 0, NULL } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e Gerrit-Change-Number: 22734 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:52:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 13:52:11 +0000 Subject: Change in libosmocore[master]: frame_relay; Fix Q.933 async STATUS at DLC creation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22720 ) Change subject: frame_relay; Fix Q.933 async STATUS at DLC creation ...................................................................... frame_relay; Fix Q.933 async STATUS at DLC creation Fix the encoding of the asynchronous Q.933 STATUS message we send at DLC creation time. Change-Id: Id1460ffa6266be85f44579c447421eed12481b02 Closes: OS#5010 --- M src/gb/frame_relay.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index 7c75cd0..c54384e 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -977,7 +977,7 @@ llist_add_tail(&dlc->list, &link->dlc_list); dlc->add = true; - tx_lmi_q933_status(link, Q933_IEI_PVC_STATUS); + tx_lmi_q933_status(link, Q933_REPT_SINGLE_PVC_ASYNC_STS); return dlc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id1460ffa6266be85f44579c447421eed12481b02 Gerrit-Change-Number: 22720 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:55:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 13:55:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 to look at the new patch set (#2). Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function Fixes warning: Osmocom_Gb_Types.ttcn:1377.13-32: warning: Inadequate restriction on the referenced function `f_oct_or_wc(bmax, 2)', this may cause a dynamic test case error at runtime Change-Id: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/22730/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:55:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 13:55:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 to look at the new patch set (#3). Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings ...................................................................... Osmocom_Gb_Types: Fix tons of template restriction warnings Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849 --- M gbproxy/GBProxy_Tests.ttcn M library/Osmocom_Gb_Types.ttcn 2 files changed, 196 insertions(+), 104 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/22731/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 13:56:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 13:56:04 +0000 Subject: Change in libosmocore[master]: ns2: Name NSVC FSM events consistently In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22734 ) Change subject: ns2: Name NSVC FSM events consistently ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e Gerrit-Change-Number: 22734 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 13:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 14:58:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 14:58:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 ) Change subject: GSM_Types: Fix warning: control reaches end of non-void function ...................................................................... GSM_Types: Fix warning: control reaches end of non-void function Change-Id: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 --- M library/GSM_Types.ttcn 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/22735/1 diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 9710c26..ca4159a 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -86,11 +86,10 @@ case (CS2) { return 32 } case (CS3) { return 38 } case (CS3) { return 52 } - case else { - setverdict(fail, "Invalid GPRS CS ", cs); - mtc.stop; - } } + setverdict(fail, "Invalid GPRS CS ", cs); + mtc.stop; + self.stop; } const GprsTlli TLLI_UNUSED := 'FFFFFFFF'O; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:00:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 15:00:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 ) Change subject: pcu: Fix warning: control reaches end of non-void function ...................................................................... pcu: Fix warning: control reaches end of non-void function Change-Id: I2c8b343fba5fabda9f78af8711e2a837536518e9 --- M pcu/GPRS_TBF.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/22736/1 diff --git a/pcu/GPRS_TBF.ttcn b/pcu/GPRS_TBF.ttcn index f946f29..f401904 100644 --- a/pcu/GPRS_TBF.ttcn +++ b/pcu/GPRS_TBF.ttcn @@ -411,6 +411,7 @@ function f_dl_tbf_is_in_window(integer bsn) return boolean { setverdict(fail, "pleaes implement me"); mtc.stop; + self.stop; } function f_dl_tbf_is_received(inout DlTbfState ds, integer bsn) return boolean { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 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: I2c8b343fba5fabda9f78af8711e2a837536518e9 Gerrit-Change-Number: 22736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:01:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 15:01:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 ) Change subject: VTY: Fix warning: control reaches end of non-void function ...................................................................... VTY: Fix warning: control reaches end of non-void function Change-Id: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/22737/1 diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 9410c9e..df046de 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -221,6 +221,7 @@ setverdict(fail, "No matching VTY response for regular expression '", regex, "' after ", num_attempts, " attempts." ); mtc.stop; + self.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 Gerrit-Change-Number: 22737 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:03:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 15:03:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 ) Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function ...................................................................... Osmocom_Gb_Types: Fix warning: control reaches end of non-void function Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/22738/1 diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index d474be9..01a39a2 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -3782,10 +3782,8 @@ case (PDU_BSSGP:{pDU_BSSGP_PAGING_CS:={?,?,?,{bVCI:=?},*,*,*,*,*}}) { return pdu.pDU_BSSGP_PAGING_CS.paging_Field4.bVCI; } - case else { - return omit; - } } + return omit; } /* extract the BVCI IE of given PDU + convert it to integer value */ @@ -3828,6 +3826,7 @@ } else { setverdict(fail, "Unknonw TLLI Type ", tllib); mtc.stop; + self.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c Gerrit-Change-Number: 22738 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:39:49 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Feb 2021 15:39:49 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 to look at the new patch set (#2). Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... apn_start: avoid segfault if missing tun-device Check if tun-device is defined and give the user a hint that it is missing instead of segfaulting with gtpu-mode kernel-gtp: 20210205141701206 DGGSN <0002> ggsn.c:186 APN(internet): Starting 20210205141701206 DGGSN <0002> ggsn.c:204 APN(internet): Opening Kernel GTP device (null) Segmentation fault With gtpu-mode tun it didn't segfault, but still tried to open the NULL device: 20210205141557598 DGGSN <0002> ggsn.c:186 APN(internet): Starting 20210205141557599 DGGSN <0002> ggsn.c:189 APN(internet): Opening TUN device (null) 20210205141557599 DTUN <0001> tun.c:195 errno=1/Operation not permitted ioctl() failed Related: OS#3208 Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 --- M ggsn/ggsn_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/32/22732/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:39:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 5 Feb 2021 15:39:55 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/1/ggsn/ggsn.c File ggsn/ggsn.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/1/ggsn/ggsn.c at 186 PS1, Line 186: if (!apn->tun.cfg.dev_name) { > I would rather add this kind of check during main() after parsing VTY. [?] After parsing VTY in main() does not work, because the APN is started during parsing. As discussed, I've moved it to parsing of "no shutdown", where it does get started. osmo-ggsn -c broken.cfg Error occurred during reading the below line: no shutdown % Failed to start APN, tun-device is not configured Failed to open config file: 'broken.cfg' -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 15:39:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:42:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 15:42:30 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22739 ) Change subject: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() ...................................................................... osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() Change-Id: I68a37e17469ec9f8178fd2027b8860dbc643a4f9 Related: OS#5007 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/22739/1 diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 1552a86..bf0650d 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -554,7 +554,7 @@ .ci_cb = (ci_cb_sum / n), }; - LOGP(DL1C, LOGL_DEBUG, "Measurement AVG (num=%u, shift=%u): " + LOGP(DMEAS, LOGL_DEBUG, "Measurement AVG (num=%u, shift=%u): " "RSSI %f, ToA256 %d, C/I %d cB\n", n, shift, avg->rssi, avg->toa256, avg->ci_cb); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68a37e17469ec9f8178fd2027b8860dbc643a4f9 Gerrit-Change-Number: 22739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:48:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 15:48:53 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/2/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/2/ggsn/ggsn_vty.c at 710 PS2, Line 710: apn->cfg.shutdown = false; this shutdown var is really confusing lol -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 15:48:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 15:49:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 15:49:39 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22739 ) Change subject: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68a37e17469ec9f8178fd2027b8860dbc643a4f9 Gerrit-Change-Number: 22739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 15:49:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:13:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 16:13:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... Patch Set 3: Code-Review+1 Looks good in general, but I still don't understand why do you need 'bts_nr' field... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 16:13:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:24:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 16:24:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: fix syntax in PCU_Tests.cfg References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22740 ) Change subject: pcu: fix syntax in PCU_Tests.cfg ...................................................................... pcu: fix syntax in PCU_Tests.cfg There was a missing comma in the configuration as well the indention was misaligned. Related: OS#4953 Fixes: be7afce974a4 ("NS_Emulation: Respect data_weight==0 or signalling_weight==0") Change-Id: I7f146ff71c107983e5787982970d0f6cd313cde9 --- M pcu/PCU_Tests.cfg 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/22740/1 diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index dfebb40..6d3407d 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -36,7 +36,6 @@ data_weight := 1, signalling_weight := 1 } - } }, nsvci := 1234 }, @@ -51,7 +50,6 @@ data_weight := 1, signalling_weight := 1 } - } }, nsvci := 1234 } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22740 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: I7f146ff71c107983e5787982970d0f6cd313cde9 Gerrit-Change-Number: 22740 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:31:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 16:31:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 to look at the new patch set (#2). Change subject: GSM_Types: Fix warning: control reaches end of non-void function ...................................................................... GSM_Types: Fix warning: control reaches end of non-void function Change-Id: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 --- M library/GSM_Types.ttcn 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/22735/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:31:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 16:31:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 to look at the new patch set (#4). Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings ...................................................................... Osmocom_Gb_Types: Fix tons of template restriction warnings Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849 --- M gbproxy/GBProxy_Tests.ttcn M library/BSSGP_Emulation.ttcnpp M library/Osmocom_Gb_Types.ttcn M library/RAW_NS.ttcnpp 4 files changed, 267 insertions(+), 135 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/22731/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:31:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 16:31:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 ) Change subject: StatsD_Checker: Check f_IPL4_listen result ...................................................................... StatsD_Checker: Check f_IPL4_listen result Change-Id: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 --- M library/StatsD_Checker.ttcn 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/22741/1 diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn index d287b74..6e16ed4 100644 --- a/library/StatsD_Checker.ttcn +++ b/library/StatsD_Checker.ttcn @@ -25,6 +25,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +import from Socket_API_Definitions all; + import from StatsD_Types all; import from StatsD_CodecPort all; import from StatsD_CodecPort_CtrlFunct all; @@ -90,6 +92,7 @@ function main(charstring statsd_host, integer statsd_port) runs on StatsD_Checker_CT { var StatsD_ConnHdlr vc_conn; var StatsDExpects expects; + var Result res; while (not mp_enable_stats) { log("StatsD checker disabled by modulepar"); @@ -97,7 +100,11 @@ } map(self:STATS, system:STATS); - StatsD_CodecPort_CtrlFunct.f_IPL4_listen(STATS, statsd_host, statsd_port, { udp := {} }, {}); + res := StatsD_CodecPort_CtrlFunct.f_IPL4_listen(STATS, statsd_host, statsd_port, { udp := {} }, {}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not bind StatsD socket, check your configuration"); + mtc.stop; + } /* Connect to VTY and reset stats */ map(self:STATSVTY, system:STATSVTY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 Gerrit-Change-Number: 22741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 16:35:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failured. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 90 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22742/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index de27fb4..ca47934 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -577,7 +577,7 @@ ns2_nse_notify_unblocked(nsvc, false); /* check if sns is using this VC */ - ns2_sns_free_nsvc(nsvc); + ns2_sns_replace_nsvc(nsvc); osmo_fsm_inst_term(nsvc->fi, OSMO_FSM_TERM_REQUEST, NULL); /* let the driver/bind clean up it's internal state */ @@ -1175,6 +1175,7 @@ { struct gprs_ns2_nse *nse = nsvc->nse; + ns2_sns_notify_alive(nse, nsvc, unblocked); ns2_nse_data_sum(nse); if (unblocked == nse->alive) diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 6462907..ff95c81 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -350,7 +350,8 @@ int ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp); struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, const char *id); -void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc); +void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc); +void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive); /* vc */ struct osmo_fsm_inst *ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc, diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 427a153..a5b900f 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -80,6 +80,7 @@ GPRS_SNS_EV_DELETE, GPRS_SNS_EV_CHANGE_WEIGHT, GPRS_SNS_EV_NO_NSVC, + GPRS_SNS_EV_NSVC_ALIVE, /*!< a NS-VC became alive */ }; static const struct value_string gprs_sns_event_names[] = { @@ -122,6 +123,8 @@ int bind_offset; /* timer N */ int N; + /* true if at least one nsvc is alive */ + bool alive; /* local configuration to send to the remote end */ struct gprs_ns_ie_ip4_elem *ip4_local; @@ -227,13 +230,18 @@ return &gss->initial->saddr; } -/*! called when a nsvc is beeing freed */ -void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc) +/*! called when all nsvcs has failed */ +void ns2_sns_nse_failure(struct gprs_ns2_nse *nse) { - struct gprs_ns2_nse *nse; +} + +/*! called when a nsvc is beeing freed or the nsvc is become dead*/ +void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc) +{ + struct gprs_ns2_nse *nse = nsvc->nse; struct gprs_ns2_vc *tmp; + struct osmo_fsm_inst *fi = nse->bss_sns_fi; struct ns2_sns_state *gss; - struct osmo_fsm_inst *fi = nsvc->nse->bss_sns_fi; if (!fi) return; @@ -242,17 +250,23 @@ if (nsvc != gss->sns_nsvc) return; - nse = nsvc->nse; - if (nse->alive) { - /* choose a different sns nsvc */ + gss->sns_nsvc = NULL; + if (gss->alive) { llist_for_each_entry(tmp, &nse->nsvc, list) { if (ns2_vc_is_unblocked(tmp)) gss->sns_nsvc = tmp; } } else { - gss->sns_nsvc = NULL; - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL); + /* the SNS is waiting for it's first NS-VC to come up + * choose any other nsvc */ + llist_for_each_entry(tmp, &nse->nsvc, list) { + if (nsvc != tmp) + gss->sns_nsvc = tmp; + } } + + if (!gss->sns_nsvc) + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL); } static void ns2_clear_ipv46_entries(struct ns2_sns_state *gss) @@ -715,6 +729,7 @@ if (old_state != GPRS_SNS_ST_UNCONFIGURED) ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE); + gss->alive = false; ns2_clear_ipv46_entries(gss); /* no initial available */ @@ -873,6 +888,18 @@ } } +/* calculate the timeout of the configured state. the configured + * state will fail if not at least one NS-VC is alive within X second. + */ +static inline int ns_sns_configured_timeout(struct osmo_fsm_inst *fi) +{ + int secs; + struct gprs_ns2_inst *nsi = nse_inst_from_fi(fi)->nsi; + secs = nsi->timeout[NS_TOUT_TNS_ALIVE] * nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES] ; + secs *= nsi->timeout[NS_TOUT_TNS_TEST]; + + return secs; +} static void ns_sns_st_config_sgsn_ip4(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -917,7 +944,7 @@ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); /* start the test procedure on ALL NSVCs! */ gprs_ns2_start_alive_all_nsvcs(nse); - osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 3); } else { /* just send CONFIG-ACK */ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); @@ -1259,6 +1286,9 @@ case GPRS_SNS_EV_CHANGE_WEIGHT: ns2_sns_st_configured_change(fi, gss, tp); break; + case GPRS_SNS_EV_NSVC_ALIVE: + osmo_timer_del(&fi->timer); + break; } } @@ -1307,7 +1337,8 @@ [GPRS_SNS_ST_CONFIGURED] = { .in_event_mask = S(GPRS_SNS_EV_ADD) | S(GPRS_SNS_EV_DELETE) | - S(GPRS_SNS_EV_CHANGE_WEIGHT), + S(GPRS_SNS_EV_CHANGE_WEIGHT) | + S(GPRS_SNS_EV_NSVC_ALIVE), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_SIZE), .name = "CONFIGURED", @@ -1340,6 +1371,10 @@ osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2); } break; + case 3: + LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + break; } return 0; } @@ -1709,6 +1744,46 @@ return count; } +void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive) +{ + struct ns2_sns_state *gss; + struct gprs_ns2_vc *tmp; + + if (!nse->bss_sns_fi) + return; + + gss = nse->bss_sns_fi->priv; + if(nse->bss_sns_fi->state != GPRS_SNS_ST_CONFIGURED) + return; + + /* check if this is the current SNS NS-VC */ + if (nsvc == gss->sns_nsvc) { + /* only replace the SNS NS-VC if there are other alive NS-VC. + * There aren't any other alive NS-VC when the SNS fsm just reached CONFIGURED + * and couldn't confirm yet if the NS-VC comes up */ + if (gss->alive && !alive) + ns2_sns_replace_nsvc(nsvc); + } + + if (alive == gss->alive) + return; + + if (alive) { + gss->alive = true; + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NSVC_ALIVE, NULL); + } else { + /* is there at least another alive nsvc? */ + llist_for_each_entry(tmp, &nse->nsvc, list) { + if (ns2_vc_is_unblocked(nsvc)) + return; + } + + /* all NS-VC have failed */ + gss->alive = false; + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NO_NSVC, NULL); + } +} + /* initialize osmo_ctx on main tread */ static __attribute__((constructor)) void on_dso_load_ctx(void) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 16:35:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... gprs_ns2_sns: add timeout to ST_CONFIG_SGSN The state CONFIG_SGSN must be also protected by the timeout Tsns-prov. Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 --- M src/gb/gprs_ns2_sns.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22743/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index a5b900f..3230b6e 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -853,6 +853,7 @@ static void ns2_sns_st_config_bss(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct tlv_parsed *tp = NULL; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); switch (event) { case GPRS_SNS_EV_CONFIG_ACK: @@ -862,7 +863,7 @@ gprs_ns2_cause_str(*TLVP_VAL(tp, NS_IE_CAUSE))); /* TODO: What to do? */ } else { - osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 3); } break; default: @@ -944,10 +945,11 @@ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); /* start the test procedure on ALL NSVCs! */ gprs_ns2_start_alive_all_nsvcs(nse); - osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 3); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 4); } else { /* just send CONFIG-ACK */ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); + osmo_timer_schedule(&fi->timer, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 0); } } @@ -1372,6 +1374,14 @@ } break; case 3: + if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { + LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + } else { + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nsi->timeout[NS_TOUT_TSNS_PROV], 3); + } + break; + case 4: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei); osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:35:14 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 16:35:14 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... gprs_ns2_sns: reset the N of timeout when entering a new state Otherwise retries are splitted between the states. Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be --- M src/gb/gprs_ns2_sns.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22744/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 3230b6e..88b7c74 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -726,8 +726,10 @@ int count; /* on a generic failure, the timer callback will recover */ - if (old_state != GPRS_SNS_ST_UNCONFIGURED) + if (old_state != GPRS_SNS_ST_UNCONFIGURED) { + gss->N = 0; ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE); + } gss->alive = false; ns2_clear_ipv46_entries(gss); @@ -874,6 +876,10 @@ static void ns2_sns_st_config_bss_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + + if (old_state != GPRS_SNS_ST_CONFIG_BSS) + gss->N = 0; + /* Transmit SNS-CONFIG */ switch (gss->ip) { case IPv4: @@ -1000,9 +1006,18 @@ } else { /* just send CONFIG-ACK */ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); + osmo_timer_schedule(&fi->timer, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 0); } } +static void ns2_sns_st_config_sgsn_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + + if (old_state != GPRS_SNS_ST_CONFIG_SGSN) + gss->N = 0; +} + static void ns2_sns_st_config_sgsn(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; @@ -1335,6 +1350,7 @@ S(GPRS_SNS_ST_SIZE), .name = "CONFIG_SGSN", .action = ns2_sns_st_config_sgsn, + .onenter = ns2_sns_st_config_sgsn_onenter, }, [GPRS_SNS_ST_CONFIGURED] = { .in_event_mask = S(GPRS_SNS_EV_ADD) | -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:35:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 16:35:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... Patch Set 3: I don't need it now because we only manage 1 BTS, but at some point we may want to add tests for several BTS. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 16:35:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:44:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 16:44:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... Patch Set 3: > Patch Set 3: > > I don't need it now because we only manage 1 BTS, but at some point we may want to add tests for several BTS. Right, but then you'll have several 'BTS' ports, like BTS[0] and BTS[1], so if you do: [] BTS[0].receive(...) -> value val; you always know that the 'val' comes from BTS[0]. Alternatively: [] any from BTS.receive(...) -> sender v_BTS; So I don't see why we would need 'bts_nr'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 16:44:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 16:59:52 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 16:59:52 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 16:59:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:00:06 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:00:06 +0000 Subject: Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22709 ) Change subject: ns2: Don't try to add packets to the backlog on real errors ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 Gerrit-Change-Number: 22709 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:00:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:01:41 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:01:41 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 05 Feb 2021 17:01:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:01:52 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:01:52 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:01:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:03:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:03:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC bloc... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 ) Change subject: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC blocks coming from PCUIF ...................................................................... Patch Set 3: Code-Review+1 (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321/3/pcu/GPRS_Components.ttcn File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321/3/pcu/GPRS_Components.ttcn at 509 PS3, Line 509: alt { coding style: we usually avoid indention inside the 'alt' statement. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321/3/pcu/GPRS_Components.ttcn at 516 PS3, Line 516: } I think we also need a local guard timer here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321/3/pcu/GPRS_Components.ttcn at 820 PS3, Line 820: if (do_repeat) { What's the practical purpose of 'do_repeat' here? I mean, in which case(s) it's useful to pass true? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321/3/pcu/GPRS_Components.ttcn at 833 PS3, Line 833: out GsmRrMessage rr_imm_ass For the sake of consistency (at least with as_rx_ptcch()), let's reorder the arguments to make 'rr_imm_ass' first, then 'template GsmRrMessage t_imm_ass', and then all optional ones with default values. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 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: Iecc33565fdc673e3499db12a0d4e0587290cfd45 Gerrit-Change-Number: 22321 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 17:03:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:04:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:04:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Define a global default set of MS RaCap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721 ) Change subject: pcu: Define a global default set of MS RaCap ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721 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: Id047929ad71dc7e330b09fd6cbfab2da43320fde Gerrit-Change-Number: 22721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:04:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:05:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:05:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 ) Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:05:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:05:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:05:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix indentation whitespace In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 ) Change subject: BSSGP_Emulation: Fix indentation whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 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: Iade336832e7045cd29bae52c7907c6a1c57813cd Gerrit-Change-Number: 22723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:05:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:07:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:07:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724/1/pcu/PCU_Tests_SNS.ttcn File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724/1/pcu/PCU_Tests_SNS.ttcn at 306 PS1, Line 306: pdu If it's not used, let's prefix it with 'unused_'. Otherwise it may look confusing. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 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: Iac84facc0041b928f04a5e2d2311dfd9d642c5a9 Gerrit-Change-Number: 22724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:07:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:07:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:07:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CTRL: Avoid using keyword 'now' as var In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 ) Change subject: CTRL: Avoid using keyword 'now' as var ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 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: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f Gerrit-Change-Number: 22725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:07:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:11:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:11:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 to look at the new patch set (#5). Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings ...................................................................... Osmocom_Gb_Types: Fix tons of template restriction warnings Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849 --- M gbproxy/GBProxy_Tests.ttcn M library/BSSGP_Emulation.ttcnpp M library/Osmocom_Gb_Types.ttcn M library/RAW_NS.ttcnpp 4 files changed, 275 insertions(+), 143 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/22731/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:11:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:11:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix tons of warnings in RLCMAC and pcu References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 ) Change subject: Fix tons of warnings in RLCMAC and pcu ...................................................................... Fix tons of warnings in RLCMAC and pcu Change-Id: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 --- M library/RLCMAC_CSN1_Templates.ttcn M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 4 files changed, 44 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/22745/1 diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 1becddd..39f240b 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -284,7 +284,7 @@ pwr_ctrl := * }; - template EgprsAckNackDescriptionIE ts_EgprsAckNackDescriptionIE(template EgprsAckNackDescription andesc) := { + template (value) EgprsAckNackDescriptionIE ts_EgprsAckNackDescriptionIE(template (value) EgprsAckNackDescription andesc) := { len_present := '1'B, len := 0, /* Overwritten by RAW encoder */ acknack_desc := andesc diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 6b5fb9f..e398491 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -369,7 +369,7 @@ } /* Send Template for Downlink ACK/NACK */ - template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi, AckNackDescription andesc, boolean retry := false, + template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template (value) uint5_t tfi, AckNackDescription andesc, boolean retry := false, template (omit) ChannelReqDescription chreq_desc := omit) := { ctrl := { mac_hdr := { @@ -393,8 +393,10 @@ } /* Send Template for Egprs Downlink ACK/NACK */ - template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template uint5_t tfi, EgprsAckNackDescription andesc, boolean retry := false, - template (omit) ChannelReqDescription chreq_desc := omit) := { + template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template (value) uint5_t tfi, + EgprsAckNackDescription andesc, + boolean retry := false, + template (omit) ChannelReqDescription chreq_desc := omit) := { ctrl := { mac_hdr := { payload_type := MAC_PT_RLCMAC_NO_OPT, @@ -762,7 +764,8 @@ } /* Template for Uplink MAC Control Header */ - template UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template MacPayloadType pt, template boolean retry := false) := { + template (value) UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template (value) MacPayloadType pt, + template (value) boolean retry := false) := { payload_type := pt, spare := '00000'B, retry := retry diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 830f8d3..34b7e79 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -424,7 +424,7 @@ function f_dltbf_ts_RLCMAC_DL_ACK_NACK(DlTbf dl_tbf, boolean use_egprs := false, template (omit) ChannelReqDescription chreq_desc := omit) -runs on MS_BTS_IFACE_CT return template RlcmacUlBlock { +runs on MS_BTS_IFACE_CT return template (value) RlcmacUlBlock { if (use_egprs) { return ts_RLCMAC_DL_ACK_NACK_EGPRS(dl_tbf.tfi, dl_tbf.egprs_acknack_desc, false, chreq_desc); } else { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 8c9b469..5f75992 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -310,7 +310,7 @@ /* Send a random block, so this TBF becomes "active" */ if (do_activate) { /* FIXME: use the new APU by Pau to get correct TRX/TS here */ - var template TsTrxBtsNum nr := ts_TsTrxBtsNum(7, i mod 8); + var template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum(7, i mod 8); var octetstring dummy := f_rnd_octstring(12); var RlcmacDlBlock dl_block; var uint32_t poll_fn; @@ -353,8 +353,8 @@ pkt_res_req := ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit); } - f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(pkt_res_req), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); - /* Store 1st UlTBF context before receiving next one, will will + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(pkt_res_req)), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + /* Store 1st UlTBF context before receiving next one, will * overwrite the TS allocation on MS with info from new UL TBF: */ pollctx.tstrxbts := f_ms_tx_TsTrxBtsNum(ms); @@ -986,7 +986,7 @@ } /* Verify scheduling of multiple Downlink data blocks, enough to reach CS4 */ -function f_dl_data_exp_cs(template CodingScheme exp_final_cs := ?, template MSRadioAccessCapabilityV_BSSGP ms_racap := omit) runs on RAW_PCU_Test_CT { +function f_dl_data_exp_cs(template (present) CodingScheme exp_final_cs := ?, template (omit) MSRadioAccessCapabilityV_BSSGP ms_racap := omit) runs on RAW_PCU_Test_CT { var octetstring data := f_rnd_octstring(1400); var RlcmacDlBlock prev_dl_block, dl_block; var uint32_t ack_fn; @@ -996,7 +996,7 @@ var integer bsn := 0; var boolean using_egprs := f_rlcmac_cs_mcs_is_mcs(valueof(exp_final_cs)); var integer bsn_mod; - var template CodingScheme exp_tmp_csmcs; + var template (present) CodingScheme exp_tmp_csmcs; if (using_egprs) { exp_tmp_csmcs := mcs_egprs_any; @@ -1640,7 +1640,7 @@ * answered, so TBFs for uplink and later for downlink are created. */ testcase TC_mo_ping_pong() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_cs_mcs := cs_gprs_any; f_TC_mo_ping_pong_1phase_access(exp_cs_mcs); } @@ -1712,15 +1712,15 @@ } testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_ul_cs_mcs := cs_gprs_any; - var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_ul_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_dl_cs_mcs := cs_gprs_any; f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any; - var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any; + var template (present) CodingScheme exp_ul_cs_mcs := mcs_egprs_any; + var template (present) CodingScheme exp_dl_cs_mcs := mcs_egprs_any; f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } @@ -1730,7 +1730,7 @@ g_force_two_phase_access := true; var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false); - var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_dl_cs_mcs := cs_gprs_any; f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } @@ -1790,14 +1790,14 @@ } testcase TC_mt_ping_pong() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_cs_mcs := cs_gprs_any; f_TC_mt_ping_pong(omit, exp_cs_mcs); } /* TC_mt_ping_pong, but DL-UNITDATA contains RA Access capability with (M)CS /* information about the MS */ testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_cs_mcs := cs_gprs_any; f_TC_mt_ping_pong(bssgp_ms_racap_gprs_def, exp_cs_mcs); } @@ -2963,7 +2963,7 @@ /* Make sure that Immediate (UL EGPRS TBF) Assignment contains hopping parameters */ testcase TC_pcuif_fh_imm_ass_ul_egprs() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); /* Enable frequency hopping on TRX0/TS7 */ @@ -2984,7 +2984,7 @@ /* Make sure that Immediate (UL TBF) Assignment contains hopping parameters */ testcase TC_pcuif_fh_imm_ass_ul() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var GprsMS ms := valueof(t_GprsMS_def); /* Enable frequency hopping on TRX0/TS7 */ @@ -3002,7 +3002,7 @@ /* Make sure that Immediate (DL TBF) Assignment contains hopping parameters */ testcase TC_pcuif_fh_imm_ass_dl() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS) + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var GprsMS ms := valueof(t_GprsMS_def); /* Enable frequency hopping on TRX0/TS7 */ @@ -3063,7 +3063,7 @@ /* Make sure that Packet Uplink Assignment contains hopping parameters */ testcase TC_pcuif_fh_pkt_ass_ul() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var GprsMS ms := valueof(t_GprsMS_def); var uint32_t poll_fn; @@ -3103,7 +3103,7 @@ /* Make sure that Packet Downlink Assignment contains hopping parameters */ testcase TC_pcuif_fh_pkt_ass_dl() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var octetstring data := f_rnd_octstring(10); var GprsMS ms := valueof(t_GprsMS_def); var RlcmacDlBlock dl_block; @@ -3151,7 +3151,7 @@ /* Check if the IUT handles subsequent INFO.ind messages */ testcase TC_pcuif_info_ind_subsequent() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var BTS_PDTCH_Block data_msg; /* Initialize the PCU interface abstraction */ @@ -3647,9 +3647,9 @@ 423), 2), 5)); - var template RIM_Routing_Address src_addr := t_RIM_Routing_Address_cid(src); - var template RIM_Routing_Address dst_addr := t_RIM_Routing_Address_cid(dst); - var template RAN_Information_RIM_Container res_cont; + var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); + var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); + var template (value) RAN_Information_RIM_Container res_cont; res_cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(2), ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), @@ -4147,16 +4147,16 @@ BTS.send(si16_data_ind); f_sleep(1.0); - var template RIM_Routing_Address dst_addr; - var template RIM_Routing_Address src_addr; - var template RAN_Information_Request_RIM_Container req_cont; - var template PDU_BSSGP bssgp_rim_pdu; + var RIM_Routing_Address dst_addr; + var RIM_Routing_Address src_addr; + var template (value) RAN_Information_Request_RIM_Container req_cont; + var template (value) PDU_BSSGP bssgp_rim_pdu; var template PDU_BSSGP bssgp_rim_pdu_expect; var template RAN_Information_RIM_Container rim_cont_expect; var BssgpCellId src_cid := {ra_id := { lai := { mcc_mnc := '262F42'H, lac := 12345}, rac := 0 }, cell_id := 20962 }; - src_addr := t_RIM_Routing_Address_cid(src_cid); - dst_addr := t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id); + src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); + dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); var octetstring si_expect := si1_expect & si3_expect & si13_expect; @@ -4201,7 +4201,7 @@ * has no system information available. We expect getting a response back but * with no system information inside. */ testcase TC_rim_ran_info_req_single_rep_no_si() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var PCUIF_Message pcu_msg; timer T := 2.0; @@ -4223,16 +4223,16 @@ BTS.send(si16_data_ind); f_sleep(1.0); - var template RIM_Routing_Address dst_addr; - var template RIM_Routing_Address src_addr; - var template RAN_Information_Request_RIM_Container req_cont; - var template PDU_BSSGP bssgp_rim_pdu; + var RIM_Routing_Address dst_addr; + var RIM_Routing_Address src_addr; + var template (value) RAN_Information_Request_RIM_Container req_cont; + var template (value) PDU_BSSGP bssgp_rim_pdu; var template PDU_BSSGP bssgp_rim_pdu_expect; var template RAN_Information_RIM_Container rim_cont_expect; var BssgpCellId src_cid := {ra_id := { lai := { mcc_mnc := '262F42'H, lac := 12345}, rac := 0 }, cell_id := 20962 }; - src_addr := t_RIM_Routing_Address_cid(src_cid); - dst_addr := t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id); + src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); + dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(1), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 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: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 Gerrit-Change-Number: 22745 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:11:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:11:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 ) Change subject: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally ...................................................................... pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally The same values are available for several tests as gloval consts. Change-Id: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3 --- M pcu/PCU_Tests.ttcn 1 file changed, 4 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/22746/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 5f75992..0b887db 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4124,9 +4124,6 @@ * PCUIF on startup. */ testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { const BssgpBvci bvci := mp_gb_cfg.bvc[0].bvci; - var octetstring si1_expect := '198fb100000000000000000000000000007900002b'O; - var octetstring si3_expect := '1b753000f110236ec9033c2747407900003c0b2b2b'O; - var octetstring si13_expect := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; timer T := 2.0; /* Initialize NS/BSSGP side */ @@ -4139,11 +4136,11 @@ f_bssgp_establish(); /* Send sysinfo to the PCU */ - var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_default, 0, 0, 0, 0, 32767); BTS.send(si1_data_ind); - var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_default, 0, 0, 0, 0, 32767); BTS.send(si3_data_ind); - var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_default, 0, 0, 0, 0, 32767); BTS.send(si16_data_ind); f_sleep(1.0); @@ -4158,9 +4155,6 @@ src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); - - var octetstring si_expect := si1_expect & si3_expect & si13_expect; - req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(1), ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), @@ -4175,7 +4169,7 @@ tr_RIM_Sequence_Number(1), tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), tr_RIM_Protocol_Version_Number(1), - tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_expect)), + tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_default)), omit); bssgp_rim_pdu_expect := tr_PDU_BSSGP_RAN_INFORMATION(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 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: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3 Gerrit-Change-Number: 22746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:12:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:12:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726/1/pcu/PCUIF_Components.ttcn File pcu/PCUIF_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726/1/pcu/PCUIF_Components.ttcn at 372 PS1, Line 372: if (not exists) { I kind of reluctant to introduce such blocks just to make [not smart enough] compiler happy, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726 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: Id7068e74439d1532c32c6113e642d0b3b063aaf3 Gerrit-Change-Number: 22726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:12:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:12:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:12:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 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: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b Gerrit-Change-Number: 22727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:12:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:13:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:13:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 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: If2cadbc7087ac0f99537b9916ef0c23363c9242c Gerrit-Change-Number: 22728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:13:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:13:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:13:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 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: Iecd19d8d397e427068e495577889e1247faa11e7 Gerrit-Change-Number: 22729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:13:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:13:56 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:13:56 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 17:13:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:14:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:14:01 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22743/2/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22743/2/src/gb/gprs_ns2_sns.c at 1384 PS2, Line 1384: case 4: It would be great having local file defines for these timers instead of using 1 2 3 4... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:14:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:14:29 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:14:29 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22742 to look at the new patch set (#3). Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failed. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Related: OS#5355 Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 85 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22742/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:14:29 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:14:29 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22743 to look at the new patch set (#3). Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... gprs_ns2_sns: add timeout to ST_CONFIG_SGSN The state CONFIG_SGSN must be also protected by the timeout Tsns-prov. Related: OS#5355 Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 --- M src/gb/gprs_ns2_sns.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22743/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:14:29 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:14:29 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22744 to look at the new patch set (#3). Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... gprs_ns2_sns: reset the N of timeout when entering a new state Otherwise retries are splitted between the states. Related: OS#5355 Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be --- M src/gb/gprs_ns2_sns.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22744/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:15:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:15:01 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:16:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:16:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn at 1358 PS2, Line 1358: uint16_t bmax Can we just turn this one into a template parameter? template (omit) OCT2 bmax -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:16:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:17:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:17:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 ) Change subject: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 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: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3 Gerrit-Change-Number: 22746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:17:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:21:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:21:20 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 233 PS3, Line 233: /*! called when a nsvc is beeing freed or the nsvc is become dead */ is become -> became https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 234 PS3, Line 234: void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc) the naming is not descriptive. What about "notify_dead()" instead? since you are adding notify_alive... btw, why isn't this handled internally I worry? https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 893 PS3, Line 893: secs = nsi->timeout[NS_TOUT_TNS_ALIVE] * nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES] ; whitespace " ;" https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 894 PS3, Line 894: secs *= nsi->timeout[NS_TOUT_TNS_TEST]; It looks a bit strange multiplying in 2 steps. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:21:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:23:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:23:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn at 1358 PS2, Line 1358: uint16_t bmax > Can we just turn this one into a template parameter? [?] why would you want that? then you can pass omit and you'd end up having a broken pkt with lengthIndicator but no content. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:23:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:26:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:26:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22742 to look at the new patch set (#4). Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failed. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Related: OS#5355 Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 85 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22742/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:27:08 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:27:08 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22743/2/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22743/2/src/gb/gprs_ns2_sns.c at 1384 PS2, Line 1384: case 4: > It would be great having local file defines for these timers instead of using 1 2 3 4... maybe in another commit ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:27:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:27:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 17:27:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn at 1358 PS2, Line 1358: uint16_t bmax > why would you want that? then you can pass omit and you'd end up having a broken pkt with lengthIndi [?] Ah, I though this IE is somehow optional. Nevermind. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:27:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:29:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 17:29:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730/2/library/Osmocom_Gb_Types.ttcn at 1358 PS2, Line 1358: uint16_t bmax > Ah, I though this IE is somehow optional. Nevermind. Well it may be optional according to specs, but you'd need to extend support for that in the whole IE. Whoever needs that can do it in the future. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 05 Feb 2021 17:29:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:31:19 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:31:19 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 4: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 252 PS3, Line 252: gss->sns_nsvc = tmp; Shouldn't/couldn't you break on first match? https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 255 PS3, Line 255: it's its https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 259 PS3, Line 259: gss->sns_nsvc = tmp; break here as well https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 1763 PS3, Line 1763: if (alive == gss->alive) This if could move before the previous (since gss->alive && !alive would always be false) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:31:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:32:54 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:32:54 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:32:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:34:27 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:34:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22744/4/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22744/4/src/gb/gprs_ns2_sns.c at 725 PS4, Line 725: gss->N = 0; You should reset the counter (only) if old_state != GPRS_SNS_ST_SIZE -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 17:34:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:37:44 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:37:44 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22742 to look at the new patch set (#5). Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failed. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Related: OS#5355 Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 89 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22742/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:42:54 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:42:54 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 5: (8 comments) https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 233 PS3, Line 233: /*! called when a nsvc is beeing freed or the nsvc is become dead */ > is become -> became Ack https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 234 PS3, Line 234: void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc) > the naming is not descriptive. [?] what do you mean with "handled internally"? https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 252 PS3, Line 252: gss->sns_nsvc = tmp; > Shouldn't/couldn't you break on first match? Done https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 255 PS3, Line 255: it's > its Done https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 259 PS3, Line 259: gss->sns_nsvc = tmp; > break here as well Ack https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 893 PS3, Line 893: secs = nsi->timeout[NS_TOUT_TNS_ALIVE] * nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES] ; > whitespace " ;" Ack https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 894 PS3, Line 894: secs *= nsi->timeout[NS_TOUT_TNS_TEST]; > It looks a bit strange multiplying in 2 steps. Ack https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 1763 PS3, Line 1763: if (alive == gss->alive) > This if could move before the previous (since gss->alive && !alive would always be false) Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:42:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:43:23 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:43:23 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 5: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 252 PS3, Line 252: gss->sns_nsvc = tmp; > Shouldn't/couldn't you break on first match? Done https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 255 PS3, Line 255: it's > its Done https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 259 PS3, Line 259: gss->sns_nsvc = tmp; > break here as well Done https://gerrit.osmocom.org/c/libosmocore/+/22742/3/src/gb/gprs_ns2_sns.c at 1763 PS3, Line 1763: if (alive == gss->alive) > This if could move before the previous (since gss->alive && !alive would always be false) Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:43:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:46:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:46:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22742 to look at the new patch set (#6). Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failed. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Related: OS#5355 Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 89 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22742/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:46:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 5 Feb 2021 17:46:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22744 to look at the new patch set (#6). Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... gprs_ns2_sns: reset the N of timeout when entering a new state Otherwise retries are splitted between the states. Related: OS#5355 Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be --- M src/gb/gprs_ns2_sns.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22744/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:54:34 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:54:34 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 17:54:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 17:55:16 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 5 Feb 2021 17:55:16 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 17:55:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:05:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 18:05:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 to look at the new patch set (#2). Change subject: msc: test reaction on Clear Request during a MO/MT Call ...................................................................... msc: test reaction on Clear Request during a MO/MT Call Change-Id: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Related: SYS#5340 --- M msc/MSC_Tests.ttcn 1 file changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/22719/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:13:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 18:13:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 18:13:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:13:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 18:13:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC bloc... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 ) Change subject: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC blocks coming from PCUIF ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 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: Iecc33565fdc673e3499db12a0d4e0587290cfd45 Gerrit-Change-Number: 22321 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 18:13:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:13:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 18:13:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 ) Change subject: PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ ...................................................................... PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ This way tests can match directly on specific RLCMAC blocks, giving the opportunity to handle different types using altsteps. Before this, a user of the port could only receive a pcu_msg DATA_REQ with a octetstring containing the rlcmac block, then decode it in a second step when already in the alt step. Related: OS#4927 Change-Id: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 --- M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 2 files changed, 104 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index d6e0867..31721c8 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -536,6 +536,28 @@ } } +template PCUIF_data tr_PCUIF_DATA(template uint8_t trx_nr, + template uint8_t ts_nr, + template uint8_t block_nr := ?, + template uint32_t fn := ?, + template PCUIF_Sapi sapi := ?, + template octetstring data := ?) := { + sapi := sapi, + len := ?, + data := data, + fn := fn, + arfcn := ?, /* unused in BTS */ + trx_nr := trx_nr, + ts_nr := ts_nr, + block_nr := block_nr, + /* measurement parameters below unused on Tx */ + rssi := 0, + ber10k := 0, + ta_offs_qbits := 0, + lqual_cb := 0 + +} + template (value) PCUIF_Message ts_PCUIF_DATA_REQ(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, uint8_t block_nr, uint32_t fn, PCUIF_Sapi sapi, @@ -572,21 +594,7 @@ bts_nr := bts_nr, spare := '0000'O, u := { - data_req := { - sapi := sapi, - len := ?, - data := data, - fn := fn, - arfcn := ?, /* unused in BTS */ - trx_nr := trx_nr, - ts_nr := ts_nr, - block_nr := block_nr, - /* measurement parameters below unused on Tx */ - rssi := 0, - ber10k := 0, - ta_offs_qbits := 0, - lqual_cb := 0 - } + data_req := tr_PCUIF_DATA(trx_nr, ts_nr, block_nr, fn, sapi, data) } } diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index aa2ab42..50de700 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -19,6 +19,10 @@ import from PCUIF_Types all; import from PCUIF_CodecPort all; +import from Osmocom_Types all; +import from RLCMAC_Types all; +import from GSM_RR_Types all; + /* Component communication diagram: * * +-----+ +----------+ +---------+ @@ -119,11 +123,54 @@ data := data } +/* PCUIF req_data containing decoded rlcmac/rr, for users to be able to match + * directly on receive() + */ +type record BTS_PDTCH_Block { + uint8_t bts_nr, + PCUIF_data raw, + RlcmacDlBlock dl_block +}; +type record BTS_PTCCH_Block { + uint8_t bts_nr, + PCUIF_data raw, + PTCCHDownlinkMsg dl_block +}; +type record BTS_CCCH_Block { + uint8_t bts_nr, + PCUIF_data raw, + GsmRrMessage rr_msg +}; +template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr, + template PCUIF_data raw, + template RlcmacDlBlock dl_block := ?) := { + bts_nr := bts_nr, + raw := raw, + dl_block := dl_block +}; +template BTS_PTCCH_Block tr_PCUIF_DATA_PTCCH(template uint8_t bts_nr, + template PCUIF_data raw, + template PTCCHDownlinkMsg dl_block := ?) := { + bts_nr := bts_nr, + raw := raw, + dl_block := dl_block +}; +template BTS_CCCH_Block tr_PCUIF_DATA_RR(template uint8_t bts_nr, + template PCUIF_data raw, + template GsmRrMessage rr_msg := ?) := { + bts_nr := bts_nr, + raw := raw, + rr_msg := rr_msg +}; + /* Generic port for messages and events */ type port RAW_PCU_MSG_PT message { inout RAW_PCU_Command; inout RAW_PCU_Event; inout PCUIF_Message; + inout BTS_PDTCH_Block; + inout BTS_PTCCH_Block; + inout BTS_CCCH_Block; } with { extension "internal" }; /* TDMA frame clock generator */ @@ -361,11 +408,14 @@ [] CLCK.receive(tr_RAW_PCU_CLCK_EV) { repeat; } } -function f_BTS_CT_handler(integer bts_nr, PCUIF_info_ind info_ind) +function f_BTS_CT_handler(integer bts_nr, PCUIF_info_ind info_ind, boolean decode_data_req := false) runs on RAW_PCU_BTS_CT { var PCUIF_Message pcu_msg; var RAW_PCU_Command cmd; var RAW_PCU_Event event; + var BTS_PDTCH_Block pcu_msg_pdtch; + var BTS_PTCCH_Block pcu_msg_ptcch; + var BTS_CCCH_Block pcu_msg_rr; /* Init TDMA clock generator (so we can stop and start it) */ vc_CLCK_GEN := RAW_PCU_ClckGen_CT.create("ClckGen-" & int2str(bts_nr)) alive; @@ -374,6 +424,7 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_AGCH); alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -406,6 +457,35 @@ "/TS" & int2str(pcu_msg.u.act_req.ts_nr)); repeat; } + [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg { + var octetstring data; + /* On PCH the payload is prefixed with paging group (3 octets): skip it. + * TODO: add an additional template parameter, so we can match it. */ + if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { + data := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3); + } else if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_AGCH) { + data := pcu_msg.u.data_req.data; + } + pcu_msg_rr.bts_nr := bts_nr; + pcu_msg_rr.raw := pcu_msg.u.data_req; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + TC.send(pcu_msg_rr); + repeat; + } + [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg { + pcu_msg_pdtch.bts_nr := bts_nr; + pcu_msg_pdtch.raw := pcu_msg.u.data_req; + pcu_msg_pdtch.dl_block := dec_RlcmacDlBlock(pcu_msg_pdtch.raw.data); + TC.send(pcu_msg_pdtch); + repeat; + } + [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := PCU_IF_SAPI_PTCCH)) -> value pcu_msg { + pcu_msg_ptcch.bts_nr := bts_nr; + pcu_msg_ptcch.raw := pcu_msg.u.data_req; + pcu_msg_ptcch.dl_block := dec_PTCCHDownlinkMsg(pcu_msg_ptcch.raw.data); + TC.send(pcu_msg_ptcch); + repeat; + } /* PCU -> test case forwarding (filter by the BTS number) */ [] PCUIF.receive(tr_PCUIF_MSG(?, bts_nr)) -> value pcu_msg { TC.send(pcu_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22320 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: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23 Gerrit-Change-Number: 22320 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:13:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 18:13:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC bloc... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 ) Change subject: pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC blocks coming from PCUIF ...................................................................... pcu: Rewrite GPRS_Components functions to use pre-decoded RLCMAC blocks coming from PCUIF This is only a step towards a major set of changes. This specific commit changes internal implementation of functions to stay compatible with existing tests. Later on, changes will be modified to use the new altsteps directly. Related: OS#4927 Change-Id: Iecc33565fdc673e3499db12a0d4e0587290cfd45 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 106 insertions(+), 99 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index a76deaa..bf2e868 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -506,35 +506,45 @@ sapi := PCU_IF_SAPI_PDTCH, fn := 0, arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr)); - as_ms_rx_pkt_ass_pacch(ms, poll_fn, t_pkt_ass, nr, ignore_dummy, dl_block); + alt { + [] as_ms_rx_pkt_ass_pacch(ms, poll_fn, t_pkt_ass, nr, dl_block); + [ignore_dummy] as_ms_rx_ignore_dummy(ms, nr); + /* TODO: fail */ + [] BTS.receive { + setverdict(fail, "Unexpected BTS message"); + f_shutdown(__BFILE__, __LINE__); + } + } return dl_block; } +altstep as_ms_rx_ignore_dummy(inout GprsMS ms, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var BTS_PDTCH_Block data_msg; + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } +} + altstep as_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, template RlcmacDlBlock t_pkt_ass := ?, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, - boolean ignore_dummy := true, out RlcmacDlBlock dl_block) runs on MS_BTS_IFACE_CT { - var PCUIF_Message pcu_msg; - [] BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, - sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg { - var uint32_t dl_fn; - dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data); - if (ignore_dummy and match(dl_block, tr_RLCMAC_DUMMY_CTRL())) { - /* TODO: sleep? */ - BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, - sapi := PCU_IF_SAPI_PDTCH, fn := 0, - arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr)); - repeat; - } - - if (not match(dl_block, t_pkt_ass)) { - setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass); - f_shutdown(__BFILE__, __LINE__); - } - - dl_fn := pcu_msg.u.data_req.fn; + var BTS_PDTCH_Block data_msg; + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH), + t_pkt_ass)) -> value data_msg { + var uint32_t dl_fn := data_msg.raw.fn; + dl_block := data_msg.dl_block; poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp); if (match(dl_block, tr_RLCMAC_UL_PACKET_ASS)) { @@ -777,22 +787,21 @@ desc.final_ack := final_ack; } -/* This function can be used to send DATA.cnf in response to the IUT originated DATA.req. - * NOTE: it's the responsibility of caller to make sure that pcu_msg contains u.data_req. */ -function f_pcuif_tx_data_cnf(in PCUIF_Message pcu_msg) +/* This function can be used to send DATA.cnf in response to the IUT originated DATA.req. */ +function f_pcuif_tx_data_cnf(in BTS_CCCH_Block data_msg) runs on MS_BTS_IFACE_CT { var PCUIF_Message pcu_msg_cnf := { msg_type := PCU_IF_MSG_DATA_CNF, - bts_nr := pcu_msg.bts_nr, - spare := pcu_msg.spare, - u := { data_cnf := pcu_msg.u.data_req } + bts_nr := data_msg.bts_nr, + spare := '0000'O, + u := { data_cnf := data_msg.raw } }; /* PCU wants DATA.cnf containing basically everything that was in DATA.req, * but PCU_IF_SAPI_PCH is a special case - paging group shall be excluded. */ - if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { - pcu_msg_cnf.u.data_cnf.data := substr(pcu_msg.u.data_req.data, 3, - pcu_msg.u.data_req.len - 3); + if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) { + pcu_msg_cnf.u.data_cnf.data := substr(data_msg.raw.data, 3, + data_msg.raw.len - 3); } BTS.send(pcu_msg_cnf); @@ -802,43 +811,52 @@ // Low level APIs //////////////////////// +altstep as_rx_ptcch(out BTS_PTCCH_Block ret_msg, template (present) PTCCHDownlinkMsg msg := ?, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, boolean do_repeat := false) +runs on MS_BTS_IFACE_CT { + [] BTS.receive(tr_PCUIF_DATA_PTCCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PTCCH), + msg)) -> value ret_msg { + if (do_repeat) { + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PTCCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)) + repeat; + } + } +} + +altstep as_ms_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, + template GsmRrMessage t_imm_ass := ?, + template (present) TsTrxBtsNum nr := ts_TsTrxBtsNum, + out GsmRrMessage rr_imm_ass) +runs on MS_BTS_IFACE_CT { + var BTS_CCCH_Block data_msg; + [] BTS.receive(tr_PCUIF_DATA_RR(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, 0, sapi := sapi), + t_imm_ass)) -> value data_msg { + rr_imm_ass := data_msg.rr_msg; + log("Rx Immediate Assignment: ", rr_imm_ass); + /* Send DATA.cnf back to the IUT (only needed for PCH) */ + if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) { + f_pcuif_tx_data_cnf(data_msg); + } + setverdict(pass); + } +} + function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, template GsmRrMessage t_imm_ass := ?, template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var GsmRrMessage rr_imm_ass; - var PCUIF_Message pcu_msg; - var octetstring data; timer T; T.start(2.0); alt { - [] BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, ts_nr := 0, - sapi := sapi, data := ?)) -> value pcu_msg { - /* On PCH the payload is prefixed with paging group (3 octets): skip it. - * TODO: add an additional template parameter, so we can match it. */ - if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { - data := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3); - } else { - data := pcu_msg.u.data_req.data; - } - - rr_imm_ass := dec_GsmRrMessage(data); - if (not match(rr_imm_ass, t_imm_ass)) { - /* Not for us? Wait for more. */ - repeat; - } - - log("Rx Immediate Assignment: ", rr_imm_ass); - - /* Send DATA.cnf back to the IUT (only needed for PCH) */ - if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { - f_pcuif_tx_data_cnf(pcu_msg); - } - - setverdict(pass); - } - [] BTS.receive { repeat; } + [] as_ms_rx_imm_ass(sapi, t_imm_ass, nr, rr_imm_ass); + [] BTS.receive { repeat; } /* TODO: use as_ms_rx_ignore_dummy instead? */ [] T.timeout { setverdict(fail, "Timeout waiting for Immediate Assignment"); f_shutdown(__BFILE__, __LINE__); @@ -898,14 +916,16 @@ } /* Enqueue RTS.req, expect DATA.req with UL ACK from the PCU */ -function f_pcuif_rx_data_req(out PCUIF_Message pcu_msg, +function f_pcuif_rx_data_req_pdtch(out BTS_PDTCH_Block data_msg, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr)); - BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, - sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg; + + BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH)) + ) -> value data_msg; } /* Expect a Paging Request Type 1 from PCU on PCUIF on specified sapi. */ @@ -914,35 +934,31 @@ template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { var GsmRrMessage rr_pag_req1; - var PCUIF_Message pcu_msg; var octetstring imsi_suff_octstr; var integer pag_group_rx; - var octetstring macblock; - BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, - sapi := PCU_IF_SAPI_PCH)) -> value pcu_msg; + var BTS_CCCH_Block data_msg; + BTS.receive(tr_PCUIF_DATA_RR(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH), + tr_PAG_REQ1(tr_MI_LV(mi1)))) -> value data_msg; + rr_pag_req1 := data_msg.rr_msg; + log("Rx Paging Request Type1: ", rr_pag_req1); + /* First 3 bytes contain IMSI suffix to calculate paging group: */ - imsi_suff_octstr := substr(pcu_msg.u.data_req.data, 0, 3); + imsi_suff_octstr := substr(data_msg.raw.data, 0, 3); pag_group_rx := str2int(oct2char(imsi_suff_octstr[0])) * 100 + str2int(oct2char(imsi_suff_octstr[1])) * 10 + str2int(oct2char(imsi_suff_octstr[2])); - /* Make sure we've got RR Paging Request Type 1 for a given MI */ - macblock := substr(pcu_msg.u.data_req.data, 3, pcu_msg.u.data_req.len - 3); - rr_pag_req1 := dec_GsmRrMessage(macblock); - if (not match(rr_pag_req1, tr_PAG_REQ1(tr_MI_LV(mi1)))) { - setverdict(fail, "Failed to match Paging Request Type 1: ", rr_pag_req1); - f_shutdown(__BFILE__, __LINE__); - } - /* Make sure that received paging froup matches the expected one */ if (not match(pag_group_rx, pag_group)) { setverdict(fail, "Paging group", pag_group_rx, " does not match expected ", pag_group); f_shutdown(__BFILE__, __LINE__); } - f_pcuif_tx_data_cnf(pcu_msg); + /* Send DATA.cnf back to the IUT (only needed for PCH) */ + f_pcuif_tx_data_cnf(data_msg); return rr_pag_req1; } @@ -950,12 +966,12 @@ template (present) CodingScheme exp_cs_mcs := ?, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { - var PCUIF_Message pcu_msg; - f_pcuif_rx_data_req(pcu_msg, nr := nr); - dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data); - dl_fn := pcu_msg.u.data_req.fn; + var BTS_PDTCH_Block data_msg; + f_pcuif_rx_data_req_pdtch(data_msg, nr := nr); + dl_block := data_msg.dl_block; + dl_fn := data_msg.raw.fn; - var integer len := lengthof(pcu_msg.u.data_req.data); + var integer len := lengthof(data_msg.raw.data); var CodingScheme cs_mcs := f_rlcmac_block_len2cs_mcs(len) if (not match(f_rlcmac_block_len2cs_mcs(len), exp_cs_mcs)) { setverdict(fail, "Failed to match Coding Scheme exp ", exp_cs_mcs, " vs ", cs_mcs, " (", len, ")"); diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4204139..3c3b570 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -264,7 +264,7 @@ connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); vc_PCUIF.start(f_PCUIF_CT_handler(mp_pcu_sock_path)); - vc_BTS.start(f_BTS_CT_handler(0, valueof(info_ind))); + vc_BTS.start(f_BTS_CT_handler(0, valueof(info_ind), true)); /* Wait until the BTS is ready (SI13 negotiated) */ BTS.receive(tr_RAW_PCU_EV(BTS_EV_SI13_NEGO)); @@ -509,8 +509,7 @@ /* Verify that the PCU generates valid PTCCH/D messages * while neither Uplink nor Downlink TBF is established. */ testcase TC_ta_ptcch_idle() runs on RAW_PCU_Test_CT { - var PTCCHDownlinkMsg ptcch_msg; - var PCUIF_Message pcu_msg; + var BTS_PTCCH_Block pcu_msg; timer T; /* Initialize the PCU interface abstraction */ @@ -520,28 +519,20 @@ BTS.send(ts_PCUIF_RTS_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 7, sapi := PCU_IF_SAPI_PTCCH, fn := 0, arfcn := 871, block_nr := 0)); + T.start(5.0); alt { - [] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 7, - sapi := PCU_IF_SAPI_PTCCH)) -> value pcu_msg { - log("Rx DATA.req message: ", pcu_msg); - setverdict(pass); - } + /* Make sure the message is encoded correctly + * TODO: do we expect all TA values to be equal '1111111'B? */ + [] as_rx_ptcch(pcu_msg, tr_PTCCHDownlinkMsg); + [] BTS.receive(PCUIF_Message:?) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for a PTCCH/D block"); f_shutdown(__BFILE__, __LINE__); } } - - ptcch_msg := dec_PTCCHDownlinkMsg(pcu_msg.u.data_req.data); - log("Decoded PTCCH/D message: ", ptcch_msg); - - /* Make sure the message is encoded correctly - * TODO: do we expect all TA values to be equal '1111111'B? */ - if (not match(ptcch_msg, tr_PTCCHDownlinkMsg)) { - setverdict(fail, "Malformed PTCCH/D message"); - } + log("Decoded PTCCH/D message: ", pcu_msg.dl_block); f_shutdown(__BFILE__, __LINE__, final := true); } @@ -3212,7 +3203,7 @@ /* Check if the IUT handles subsequent INFO.ind messages */ testcase TC_pcuif_info_ind_subsequent() runs on RAW_PCU_Test_CT { var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; - var PCUIF_Message pcu_msg; + var BTS_PDTCH_Block data_msg; /* Initialize the PCU interface abstraction */ f_init_raw(testcasename(), info_ind); @@ -3220,7 +3211,7 @@ /* Send 16 conseqtive INFO.ind messages and check that the IUT stays alive */ for (var integer i := 0; i < 16; i := i + 1) { BTS.send(ts_PCUIF_INFO_IND(0, info_ind)); - f_pcuif_rx_data_req(pcu_msg); + f_pcuif_rx_data_req_pdtch(data_msg); } f_shutdown(__BFILE__, __LINE__, final := true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22321 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: Iecc33565fdc673e3499db12a0d4e0587290cfd45 Gerrit-Change-Number: 22321 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:13:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 18:13:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Define a global default set of MS RaCap In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721 ) Change subject: pcu: Define a global default set of MS RaCap ...................................................................... pcu: Define a global default set of MS RaCap We initialize those verbose structures over and over in different tests, and we usually don't care about detials, only whether they enable EGPRS or not. So let's define them once and reuse them in tests whenever possible. Some tests requiring specific values (eg to test allocation of 8 PDCH on a single TBF) are left intact. Change-Id: Id047929ad71dc7e330b09fd6cbfab2da43320fde --- M pcu/PCU_Tests.ttcn 1 file changed, 41 insertions(+), 144 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 3c3b570..8c9b469 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -118,6 +118,28 @@ const octetstring si13_default := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; const octetstring si_default := si1_default & si3_default & si13_default; +const MultislotCap_GPRS mscap_gprs_def := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B +}; +const MultislotCap_EGPRS mscap_egprs_def := { + egprsmultislotclass := '00011'B, + egprsextendeddynalloccap := '0'B +}; +template (value) MSRadioAccessCapabilityV ms_racap_gprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, omit) }; +template (value) MSRadioAccessCapabilityV ms_racap_egprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, mscap_egprs_def) }; + +const MultislotCap_GPRS_BSSGP bssgp_mscap_gprs_def := { + gprsmultislotclass := '00011'B, + gprsextendeddynalloccap := '0'B +}; +const MultislotCap_EGPRS_BSSGP bssgp_mscap_egprs_def := { + egprsmultislotclass := '00011'B, + egprsextendeddynalloccap := '0'B +}; +template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_gprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, omit)) }; +template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_egprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, bssgp_mscap_egprs_def)) }; + type record lqual_range { /* component reference to the IPA_Client component used for RSL */ uint8_t low, @@ -1077,15 +1099,6 @@ var uint32_t unused_fn, sched_fn; var GprsMS ms; var CodingScheme exp_ul_mcs; - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; /* Initialize GPRS MS side */ f_init_gprs_ms(); @@ -1104,7 +1117,7 @@ ms.lqual_cb := g_mcs_lqual_ranges[2].low * 10; /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def)); if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_mcs)) { setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_mcs); @@ -1161,16 +1174,6 @@ var PollFnCtx pollctx; var uint32_t unused_fn, sched_fn; var GprsMS ms; - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - /* Initialize GPRS MS side */ f_init_gprs_ms(); @@ -1185,7 +1188,7 @@ f_pcuvty_set_link_quality_ranges(); /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -1210,15 +1213,6 @@ var RlcmacDlBlock dl_block; var uint32_t poll_fn; var GprsMS ms; - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS_BSSGP mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1242,7 +1236,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ - BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, bssgp_ms_racap_egprs_def)); f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ @@ -1273,17 +1267,7 @@ f_pcuvty_set_allowed_cs_mcs(); f_pcuvty_set_link_quality_ranges(); - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS_BSSGP mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - - f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), ms_racap); + f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), bssgp_ms_racap_egprs_def); } /* Verify PCU drops TBF after some time of inactivity. */ @@ -1728,46 +1712,27 @@ } testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT { - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template CodingScheme exp_ul_cs_mcs := cs_gprs_any; var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; - f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs); + f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT { - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any; var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any; - f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs); + f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT { /* Configure PCU to force two phase access */ g_force_two_phase_access := true; - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false); var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; - f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs); + f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } /* Test scenario where SGSN wants to send some data against MS and it is @@ -1832,13 +1797,8 @@ /* TC_mt_ping_pong, but DL-UNITDATA contains RA Access capability with (M)CS /* information about the MS */ testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT { - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - } ; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template CodingScheme exp_cs_mcs := cs_gprs_any; - f_TC_mt_ping_pong(ms_racap, exp_cs_mcs); + f_TC_mt_ping_pong(bssgp_ms_racap_gprs_def, exp_cs_mcs); } /* Verify that if PCU doesn't get one of the intermediate UL data blocks in a UL @@ -2703,18 +2663,7 @@ /* Verify osmo-pcu Doesn't append LLC UI dummy frames to rlcmac blocks * containing llc data. See OS#4849 */ testcase TC_dl_egprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT { - - var MultislotCap_GPRS_BSSGP mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS_BSSGP mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - - f_tc_dl_data_no_llc_ui_dummy(ms_racap); + f_tc_dl_data_no_llc_ui_dummy(bssgp_ms_racap_egprs_def); } private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req, @@ -3266,7 +3215,6 @@ var PCUIF_info_ind info_ind; const integer num_ms := 2; /* 2 MS, first one is GPRS-only, second one is EGPRS */ var PollFnCtx pollctx; - var MSRadioAccessCapabilityV ms_racap; var uint32_t sched_fn, dl_fn, ack_fn; var octetstring data := f_rnd_octstring(10); var RlcmacDlBlock dl_block; @@ -3297,18 +3245,8 @@ f_bssgp_establish(); f_multi_ms_bssgp_register(); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MultislotCap_EGPRS mscap_egprs := { - egprsmultislotclass := '00011'B, - egprsextendeddynalloccap := '0'B - }; - /* Establish UL TBF for MS0 (GPRS-only) */ - ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; - pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap_gprs_def)); if (not match(g_ms[0].ul_tbf.tx_cs_mcs, cs_gprs_any)) { setverdict(fail, "Wrong CS_MCS ", g_ms[0].ul_tbf.tx_cs_mcs, " received vs exp ", cs_gprs_any); f_shutdown(__BFILE__, __LINE__); @@ -3317,8 +3255,7 @@ f_ms_tx_ul_block(g_ms[0], ts_RLCMAC_CTRL_ACK(g_ms[0].tlli), pollctx.fn, nr := pollctx.tstrxbts); /* Establish UL TBF for MS1 (EGPRS) */ - ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) }; - pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap_egprs_def)); if (not match(g_ms[1].ul_tbf.tx_cs_mcs, mcs_egprs_any)) { setverdict(fail, "Wrong CS_MCS ", g_ms[1].ul_tbf.tx_cs_mcs, " received vs exp ", mcs_egprs_any); f_shutdown(__BFILE__, __LINE__); @@ -3748,11 +3685,6 @@ var PollFnCtx pollctx; var GprsMS ms; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); @@ -3774,7 +3706,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3791,11 +3723,6 @@ var RlcmacDlBlock dl_block; var uint32_t sched_fn; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); @@ -3817,7 +3744,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3844,11 +3771,6 @@ var PollFnCtx pollctx; var GprsMS ms; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template (value) RlcmacUlCtrlMsg cell_chf_notif; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ @@ -3873,7 +3795,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3893,11 +3815,6 @@ var PollFnCtx pollctx; var GprsMS ms; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var template (value) RlcmacUlCtrlMsg cell_chf_notif; /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ @@ -3922,7 +3839,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -3947,11 +3864,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; @@ -3977,7 +3889,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -4008,11 +3920,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; @@ -4036,7 +3943,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -4077,11 +3984,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; @@ -4105,7 +4007,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); @@ -4146,11 +4048,6 @@ var GprsMS ms; var template (value) RlcmacUlCtrlMsg cell_chf_notif; var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); - var MultislotCap_GPRS mscap_gprs := { - gprsmultislotclass := '00011'B, - gprsextendeddynalloccap := '0'B - }; - var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) }; var GsmArfcn req_arfcn := 862; var uint6_t req_bsic := 43; var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */ @@ -4184,7 +4081,7 @@ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* Send PACKET RESOURCE REQUEST */ - pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap)); + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721 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: Id047929ad71dc7e330b09fd6cbfab2da43320fde Gerrit-Change-Number: 22721 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 18:18:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 18:18:06 +0000 Subject: Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22747 ) Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request ...................................................................... fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Related: SYS#5340 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/22747/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index ed29e84..704e596 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -272,6 +272,13 @@ /* send release to L4, if callref still exists */ if (trans->callref) { + /* Send MNCC REL.ind (cause='Resource unavailable') */ + if (trans->cc.mncc_initiated) { + mncc_release_ind(trans->net, trans, trans->callref, + GSM48_CAUSE_LOC_PRN_S_LU, + GSM48_CC_CAUSE_RESOURCE_UNAVAIL); + } + /* FIXME: currently, a CC trans that would not yet be in state GSM_CSTATE_RELEASE_REQ fails to send a * CC Release to the MS if it gets freed here. Hack it to do so. */ if (trans->cc.state != GSM_CSTATE_RELEASE_REQ) { @@ -280,11 +287,6 @@ mncc_set_cause(&rel, GSM48_CAUSE_LOC_PRN_S_LU, GSM48_CC_CAUSE_RESOURCE_UNAVAIL); gsm48_cc_tx_release(trans, &rel); } - /* Resource unavailable */ - if (trans->cc.mncc_initiated) - mncc_release_ind(trans->net, trans, trans->callref, - GSM48_CAUSE_LOC_PRN_S_LU, - GSM48_CC_CAUSE_RESOURCE_UNAVAIL); /* This is a final freeing of the transaction. The MNCC release may have triggered the * T308 release timer, but we don't have the luxury of graceful CC Release here. */ gsm48_stop_cc_timer(trans); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:10:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 19:10:48 +0000 Subject: Change in osmo-msc[master]: smpp_openbsc: fix the use of deprecated gsm_septets2octets() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22748 ) Change subject: smpp_openbsc: fix the use of deprecated gsm_septets2octets() ...................................................................... smpp_openbsc: fix the use of deprecated gsm_septets2octets() Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 --- M TODO-RELEASE M src/libmsc/smpp_openbsc.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/48/22748/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 9c358ae..036a9b9 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response osmo-msc update version dependency to version with osmo_fd_*_{disable,enable} +osmo-msc smpp migrate to gsm_septet_pack(), available since Ib1aac538afeb0a5c76a1df472d555139a496e12e diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index a79b252..54cd75b 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -250,8 +250,7 @@ sms_msg_len -= ud_len; padbits = 7 - (ud_len % 7); } - gsm_septets2octets(sms->user_data+ud_len, sms_msg, - sms_msg_len, padbits); + gsm_septet_pack(sms->user_data+ud_len, sms_msg, sms_msg_len, padbits); sms->user_data_len = (ud_len*8 + padbits)/7 + sms_msg_len;/* SEPTETS */ /* FIXME: sms->text */ } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 Gerrit-Change-Number: 22748 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:17:02 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 19:17:02 +0000 Subject: Change in osmo-msc[master]: submit_to_sms(): fix the use of deprecated gsm_septets2octets() In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/22748 ) Change subject: submit_to_sms(): fix the use of deprecated gsm_septets2octets() ...................................................................... submit_to_sms(): fix the use of deprecated gsm_septets2octets() Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 --- M TODO-RELEASE M src/libmsc/smpp_openbsc.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/48/22748/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 Gerrit-Change-Number: 22748 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:17:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 19:17:03 +0000 Subject: Change in osmo-msc[master]: ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22749 ) Change subject: ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() ...................................................................... ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() Change-Id: I56dd920b931e769ba4d268b09700fe3c9fca4fc6 --- M src/libmsc/ran_msg_a.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/22749/1 diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 6a33704..2890076 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -225,7 +225,7 @@ .msg_name = "BSSMAP Ciphering Mode Reject", }; - rc = gsm0808_get_cipher_reject_cause(tp); + rc = gsm0808_get_cause(tp); if (rc < 0) { LOG_RAN_A_DEC_MSG(LOGL_ERROR, "failed to extract Cause\n"); ran_dec_msg.cipher_mode_reject.bssap_cause = GSM0808_CAUSE_EQUIPMENT_FAILURE; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I56dd920b931e769ba4d268b09700fe3c9fca4fc6 Gerrit-Change-Number: 22749 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:24:51 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 5 Feb 2021 19:24:51 +0000 Subject: Change in osmo-bsc[master]: lchan assignment when RTP is set up: don't break on Mode Modify In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22510 to look at the new patch set (#2). Change subject: lchan assignment when RTP is set up: don't break on Mode Modify ...................................................................... lchan assignment when RTP is set up: don't break on Mode Modify Change-Id: I06d3f35fcc71d77e1f30c2b15ab221ef7d5f7f27 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/22510/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I06d3f35fcc71d77e1f30c2b15ab221ef7d5f7f27 Gerrit-Change-Number: 22510 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:24:52 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 5 Feb 2021 19:24:52 +0000 Subject: Change in osmo-bsc[master]: lchan assignment when RTP is set up: don't break on Mode Modify In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22510 ) Change subject: lchan assignment when RTP is set up: don't break on Mode Modify ...................................................................... lchan assignment when RTP is set up: don't break on Mode Modify Change-Id: I06d3f35fcc71d77e1f30c2b15ab221ef7d5f7f27 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 8bb879f..a8b6439 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -444,8 +444,11 @@ return; /* There may be an already existing lchan, if yes, try to work with - * the existing lchan. */ - if (reuse_existing_lchan(conn)) { + * the existing lchan. + * If an RTP FSM is already set up for the lchan, Mode Modify is not yet supported -- see handling of + * LCHAN_EV_REQUEST_MODE_MODIFY in lchan_fsm.c. To not break the lchan, do not even attempt to re-use an lchan + * that already has an RTP stream set up, rather establish a new lchan (that transition is well implemented). */ + if (reuse_existing_lchan(conn) && !conn->lchan->fi_rtp) { /* If the requested mode and the current TCH mode matches up, just send the * assignment complete directly and be done with the assignment procedure. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22510 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I06d3f35fcc71d77e1f30c2b15ab221ef7d5f7f27 Gerrit-Change-Number: 22510 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:24:51 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 5 Feb 2021 19:24:51 +0000 Subject: Change in osmo-bsc[master]: rename lchan->rqd_ta to last_ta In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22511 to look at the new patch set (#2). Change subject: rename lchan->rqd_ta to last_ta ...................................................................... rename lchan->rqd_ta to last_ta Originally, the lchan stored only the Timing Advance from the initial channel request, hence it was called rqd_ta. Since quite a while now, rqd_ta also stores the most recent Timing Advance from each received Measurement Report. So rename to last_ta. This is cosmetic preparation for an upcoming patch that clarifies whether the Timing Advance is already known for Channel Activation. Change-Id: I1049526a173819baeb4978db5bf018ba3f1006a0 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lcs_loc_req.c M src/osmo-bsc/lcs_ta_req.c 6 files changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/22511/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1049526a173819baeb4978db5bf018ba3f1006a0 Gerrit-Change-Number: 22511 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:24:53 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 5 Feb 2021 19:24:53 +0000 Subject: Change in osmo-bsc[master]: rename lchan->rqd_ta to last_ta In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22511 ) Change subject: rename lchan->rqd_ta to last_ta ...................................................................... rename lchan->rqd_ta to last_ta Originally, the lchan stored only the Timing Advance from the initial channel request, hence it was called rqd_ta. Since quite a while now, rqd_ta also stores the most recent Timing Advance from each received Measurement Report. So rename to last_ta. This is cosmetic preparation for an upcoming patch that clarifies whether the Timing Advance is already known for Channel Activation. Change-Id: I1049526a173819baeb4978db5bf018ba3f1006a0 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lcs_loc_req.c M src/osmo-bsc/lcs_ta_req.c 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 8b53902..6cb3cf0 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -657,7 +657,9 @@ } ass_compl; } abis_ip; - uint8_t rqd_ta; + /* At first, the Timing Advance from the initial Channel Request. Later, the Timing Advance value received from + * the most recent Measurement Report. */ + uint8_t last_ta; /* table of neighbor cell measurements */ struct neigh_meas_proc neigh_meas[MAX_NEIGH_MEAS]; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index f45b507..edffd35 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -541,7 +541,7 @@ return rc; } - ta = lchan->rqd_ta; + ta = lchan->last_ta; /* BS11 requires TA shifted by 2 bits */ if (bts->type == GSM_BTS_TYPE_BS11) @@ -1147,8 +1147,8 @@ if (msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_BS11 || msg->lchan->ts->trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) mr->ms_l1.ta >>= 2; - /* store TA for next assignment/handover */ - mr->lchan->rqd_ta = mr->ms_l1.ta; + /* store TA for handover decision, and for intra-cell re-assignment */ + mr->lchan->last_ta = mr->ms_l1.ta; } if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) { msg->l3h = (uint8_t *) TLVP_VAL(&tp, RSL_IE_L3_INFO); @@ -1756,7 +1756,7 @@ OSMO_ASSERT(lchan->rqd_ref); *(lchan->rqd_ref) = rqd->ref; - lchan->rqd_ta = rqd->ta; + lchan->last_ta = rqd->ta; LOG_LCHAN(lchan, LOGL_DEBUG, "MS: Channel Request: reason=%s ra=0x%02x ta=%d\n", gsm_chreq_name(rqd->reason), rqd->ref.ra, rqd->ta); @@ -1788,7 +1788,7 @@ /* use request reference extracted from CHAN_RQD */ memcpy(&ia->req_ref, lchan->rqd_ref, sizeof(ia->req_ref)); - ia->timing_advance = lchan->rqd_ta; + ia->timing_advance = lchan->last_ta; if (!lchan->ts->hopping.enabled) { ia->mob_alloc_len = 0; } else { diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 2cb7a54..134f502 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -1543,10 +1543,10 @@ /* Max Distance */ if (lchan->meas_rep_count > 0 - && lchan->rqd_ta > ho_get_hodec2_max_distance(bts->ho)) { + && lchan->last_ta > ho_get_hodec2_max_distance(bts->ho)) { global_ho_reason = HO_REASON_MAX_DISTANCE; LOGPHOLCHAN(lchan, LOGL_NOTICE, "TA is TOO HIGH: %u > %d\n", - lchan->rqd_ta, ho_get_hodec2_max_distance(bts->ho)); + lchan->last_ta, ho_get_hodec2_max_distance(bts->ho)); /* start penalty timer to prevent coming back too * early. it must be started before selecting a better cell, * so there is no assignment selected, due to running diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5790b3f..7a75c0b 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -580,7 +580,7 @@ ms_power_dbm = ms_pwr_dbm(bts->band, old_lchan->ms_power); lchan_update_ms_power_ctrl_level(lchan, ms_power_dbm >= 0 ? ms_power_dbm : bts->ms_max_power); lchan->bs_power = old_lchan->bs_power; - lchan->rqd_ta = old_lchan->rqd_ta; + lchan->last_ta = old_lchan->last_ta; } else { lchan_update_ms_power_ctrl_level(lchan, bts->ms_max_power); /* Upon last entering the UNUSED state, from lchan_reset(): diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c index ca5c7b9..39bc341 100644 --- a/src/osmo-bsc/lcs_loc_req.c +++ b/src/osmo-bsc/lcs_loc_req.c @@ -313,7 +313,7 @@ plr.bssmap_le.perform_loc_req.apdu = (struct bsslap_pdu){ .msg_type = BSSLAP_MSGT_TA_LAYER3, .ta_layer3 = { - .ta = lchan->rqd_ta, + .ta = lchan->last_ta, }, }; } else { @@ -365,7 +365,7 @@ .msg_type = BSSLAP_MSGT_RESET, .reset = { .cell_id = lchan->ts->trx->bts->cell_identity, - .ta = lchan->rqd_ta, + .ta = lchan->last_ta, .cause = BSSLAP_CAUSE_INTRA_BSS_HO, }, }; diff --git a/src/osmo-bsc/lcs_ta_req.c b/src/osmo-bsc/lcs_ta_req.c index 97d6eb5..3b859a7 100644 --- a/src/osmo-bsc/lcs_ta_req.c +++ b/src/osmo-bsc/lcs_ta_req.c @@ -210,7 +210,7 @@ .msg_type = BSSLAP_MSGT_TA_RESPONSE, .ta_response = { .cell_id = lchan->ts->trx->bts->cell_identity, - .ta = lchan->rqd_ta, + .ta = lchan->last_ta, }, }, }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1049526a173819baeb4978db5bf018ba3f1006a0 Gerrit-Change-Number: 22511 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 19:24:55 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Fri, 5 Feb 2021 19:24:55 +0000 Subject: Change in osmo-bsc[master]: lchan activation: indicate whether TA is known In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22512 ) Change subject: lchan activation: indicate whether TA is known ...................................................................... lchan activation: indicate whether TA is known On lchan activation, we already know the Timing Advance in most situations: from the Channel Request RACH, or from a previous lchan in the same cell. Place this information in lchan->activate.info.ta. So far, the lchan->last_ta (until recently called rqd_ta) was used to store the initial TA for channel activation -- move the initial TA to lchan->activate.info.ta, for proper scoping. Only an inter-cell handover does not yet know a Timing Advance (until the Handover Detection RACH is received), so indicate activate.info.ta_known = false for that case. If ta_known is false, do not include an Access Delay IE in the Channel Activation message, ensuring that the BTS does not use an arbitrary TA that is likely inaccurate. The effect for OsmoBTS is that we will *not* start the downlink SACCH on channel activation for inter-cell handover, but will wait for a HO RACH first, and then use the correct TA when enabling downlink SACCH. Related: OS#4008 SYS#5192 Change-Id: I986bf93e8acd6aef7eaf63ac962480b680aa894f --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c 5 files changed, 28 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6cb3cf0..edfae26 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -571,6 +571,8 @@ /* During intra-BSC handover, we keep the MGW endpoint intact and just re-route to the new lchan. This * activate_info is for the new lchan, the re_use_mgw_endpoint_from_lchan points at the old lchan. */ struct gsm_lchan *re_use_mgw_endpoint_from_lchan; + bool ta_known; + uint8_t ta; }; struct gsm_lchan { diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index edffd35..67e7d27 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -521,7 +521,6 @@ struct msgb *msg; int rc; uint8_t *len; - uint8_t ta; struct rsl_ie_chan_mode cm; struct gsm48_chan_desc cd; @@ -541,12 +540,6 @@ return rc; } - ta = lchan->last_ta; - - /* BS11 requires TA shifted by 2 bits */ - if (bts->type == GSM_BTS_TYPE_BS11) - ta <<= 2; - memset(&cd, 0, sizeof(cd)); gsm48_lchan2chan_desc(&cd, lchan); @@ -601,7 +594,13 @@ if (bts->ms_power_ctrl.mode != GSM_PWR_CTRL_MODE_NONE) msgb_tv_put(msg, RSL_IE_MS_POWER, lchan->ms_power); - msgb_tv_put(msg, RSL_IE_TIMING_ADVANCE, ta); + if (lchan->activate.info.ta_known) { + uint8_t ta = lchan->activate.info.ta; + /* BS11 requires TA shifted by 2 bits */ + if (bts->type == GSM_BTS_TYPE_BS11) + ta <<= 2; + msgb_tv_put(msg, RSL_IE_TIMING_ADVANCE, ta); + } /* BS/MS Power Control Parameters (if supported by BTS model) */ add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan); @@ -1756,13 +1755,14 @@ OSMO_ASSERT(lchan->rqd_ref); *(lchan->rqd_ref) = rqd->ref; - lchan->last_ta = rqd->ta; LOG_LCHAN(lchan, LOGL_DEBUG, "MS: Channel Request: reason=%s ra=0x%02x ta=%d\n", gsm_chreq_name(rqd->reason), rqd->ref.ra, rqd->ta); info = (struct lchan_activate_info){ .activ_for = FOR_MS_CHANNEL_REQUEST, .chan_mode = GSM48_CMODE_SIGN, + .ta = rqd->ta, + .ta_known = true, }; lchan_activate(lchan, &info); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a8b6439..39219a4 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -487,6 +487,8 @@ .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, .re_use_mgw_endpoint_from_lchan = conn->lchan, + .ta = conn->lchan->last_ta, + .ta_known = true, }; osmo_fsm_inst_dispatch(conn->lchan->fi, LCHAN_EV_REQUEST_MODE_MODIFY, &info); @@ -562,6 +564,8 @@ .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, .re_use_mgw_endpoint_from_lchan = conn->lchan, + .ta = conn->lchan->last_ta, + .ta_known = true, }; lchan_activate(conn->assignment.new_lchan, &info); } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index b9caf04..87359dc 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -408,6 +408,13 @@ .s15_s0 = conn->lchan->activate.info.s15_s0, }; + /* For intra-cell handover, we know the accurate Timing Advance from the previous lchan. For inter-cell + * handover, no Timing Advance for the new cell is known, so leave it unset. */ + if (ho->new_bts == bts) { + info.ta = conn->lchan->last_ta; + info.ta_known = true; + } + lchan_activate(ho->new_lchan, &info); } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 7a75c0b..9c7ecaf 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -580,7 +580,6 @@ ms_power_dbm = ms_pwr_dbm(bts->band, old_lchan->ms_power); lchan_update_ms_power_ctrl_level(lchan, ms_power_dbm >= 0 ? ms_power_dbm : bts->ms_max_power); lchan->bs_power = old_lchan->bs_power; - lchan->last_ta = old_lchan->last_ta; } else { lchan_update_ms_power_ctrl_level(lchan, bts->ms_max_power); /* Upon last entering the UNUSED state, from lchan_reset(): @@ -702,8 +701,13 @@ lchan->encr = lchan->activate.info.encr; rc = rsl_tx_chan_activ(lchan, act_type, ho_ref); - if (rc) + if (rc) { lchan_fail_to(LCHAN_ST_UNUSED, "Tx Chan Activ failed: %s (%d)", strerror(-rc), rc); + return; + } + + if (lchan->activate.info.ta_known) + lchan->last_ta = lchan->activate.info.ta; } static void lchan_fsm_post_activ_ack(struct osmo_fsm_inst *fi); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I986bf93e8acd6aef7eaf63ac962480b680aa894f Gerrit-Change-Number: 22512 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:05:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:05:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22750 ) Change subject: deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b ...................................................................... deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b Change-Id: Ia5005dd3ab156f677cc099271e312728fb18e0dc Related: OS#4974 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/22750/1 diff --git a/deps/Makefile b/deps/Makefile index 8d6c2b5..507306b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-3-g3d61883 +titan.TestPorts.AF_PACKET_commit= 0.1-4-g9c6d89b titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22750 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: Ia5005dd3ab156f677cc099271e312728fb18e0dc Gerrit-Change-Number: 22750 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:05:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:05:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Provider_FR: Drop received messages until limk+pvc are up References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22751 ) Change subject: NS_Provider_FR: Drop received messages until limk+pvc are up ...................................................................... NS_Provider_FR: Drop received messages until limk+pvc are up Related: OS#4974 Change-Id: I69f9cf485b0a9eaf9294236f50ffcf4af20f1d20 --- M library/NS_Provider_FR.ttcn 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/22751/1 diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn index 5138d82..30aadef 100644 --- a/library/NS_Provider_FR.ttcn +++ b/library/NS_Provider_FR.ttcn @@ -50,8 +50,21 @@ var PDU_NS rx_pdu; alt { - [] FR.receive(FrameRelayFrame:?) -> value rx_fr { - NSE.send(dec_PDU_NS(rx_fr.payload)); + [not link_available] FR.receive(FrameRelayFrame:?) -> value rx_fr { + log("Dropoing Rx Msg because FR link not yet available", rx_fr); + /* this can happen if the remote side has not yet recognized the + * link is dead; don' fail here */ + } + [link_available and pvc_active] FR.receive(tr_FR(config.provider.fr.dlci)) -> value rx_fr { + var PDU_NS ns := dec_PDU_NS(rx_fr.payload); + NSE.send(ns); + } + [not pvc_active] FR.receive(tr_FR(config.provider.fr.dlci)) -> value rx_fr { + log("Dropoing Rx Msg because FR DLC not yet available", rx_fr); + } + [] FR.receive(tr_FR(?)) -> value rx_fr { + log("Dropoing Rx Msg because DLCI unknown", rx_fr); + setverdict(fail); } [] FR.receive(FRemu_Event:{link_status:=FR_LINK_STS_AVAILABLE}) -> value rx_frevt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22751 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: I69f9cf485b0a9eaf9294236f50ffcf4af20f1d20 Gerrit-Change-Number: 22751 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:17:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:17:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22750 ) Change subject: deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22750 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: Ia5005dd3ab156f677cc099271e312728fb18e0dc Gerrit-Change-Number: 22750 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:17:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:17:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:17:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Provider_FR: Drop received messages until limk+pvc are up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22751 ) Change subject: NS_Provider_FR: Drop received messages until limk+pvc are up ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22751 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: I69f9cf485b0a9eaf9294236f50ffcf4af20f1d20 Gerrit-Change-Number: 22751 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:17:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:17:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:17:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22750 ) Change subject: deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b ...................................................................... deps: Update AF_PACKET (with FR emulation) to 0.1-4-g9c6d89b Change-Id: Ia5005dd3ab156f677cc099271e312728fb18e0dc Related: OS#4974 --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index 8d6c2b5..507306b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-3-g3d61883 +titan.TestPorts.AF_PACKET_commit= 0.1-4-g9c6d89b titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22750 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: Ia5005dd3ab156f677cc099271e312728fb18e0dc Gerrit-Change-Number: 22750 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:17:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:17:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Provider_FR: Drop received messages until limk+pvc are up In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22751 ) Change subject: NS_Provider_FR: Drop received messages until limk+pvc are up ...................................................................... NS_Provider_FR: Drop received messages until limk+pvc are up Related: OS#4974 Change-Id: I69f9cf485b0a9eaf9294236f50ffcf4af20f1d20 --- M library/NS_Provider_FR.ttcn 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn index 5138d82..30aadef 100644 --- a/library/NS_Provider_FR.ttcn +++ b/library/NS_Provider_FR.ttcn @@ -50,8 +50,21 @@ var PDU_NS rx_pdu; alt { - [] FR.receive(FrameRelayFrame:?) -> value rx_fr { - NSE.send(dec_PDU_NS(rx_fr.payload)); + [not link_available] FR.receive(FrameRelayFrame:?) -> value rx_fr { + log("Dropoing Rx Msg because FR link not yet available", rx_fr); + /* this can happen if the remote side has not yet recognized the + * link is dead; don' fail here */ + } + [link_available and pvc_active] FR.receive(tr_FR(config.provider.fr.dlci)) -> value rx_fr { + var PDU_NS ns := dec_PDU_NS(rx_fr.payload); + NSE.send(ns); + } + [not pvc_active] FR.receive(tr_FR(config.provider.fr.dlci)) -> value rx_fr { + log("Dropoing Rx Msg because FR DLC not yet available", rx_fr); + } + [] FR.receive(tr_FR(?)) -> value rx_fr { + log("Dropoing Rx Msg because DLCI unknown", rx_fr); + setverdict(fail); } [] FR.receive(FRemu_Event:{link_status:=FR_LINK_STS_AVAILABLE}) -> value rx_frevt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22751 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: I69f9cf485b0a9eaf9294236f50ffcf4af20f1d20 Gerrit-Change-Number: 22751 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:32:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:32:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22742/6/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22742/6/src/gb/gprs_ns2_sns.c at a95 PS6, Line 95: { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" }, value_string for new event missing. Unrelated: Please also rename to reflect what those are about (see NSVC fsm). RX-(SIZE,...) when a packet as received, etc. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 20:32:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:33:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:33:47 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22743/6/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22743/6/src/gb/gprs_ns2_sns.c at 1376 PS6, Line 1376: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); might be nice to ahve the log lines differ from the case above, so that the log indicates something like BSS-originated config procedure or SGSN-originated config procedure. That way the user doesn't have to check the source code to see what actually failed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 20:33:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:34:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:34:34 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:34:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:36:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:36:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 ) Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722/1/library/BSSGP_Emulation.ttcnpp File library/BSSGP_Emulation.ttcnpp: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722/1/library/BSSGP_Emulation.ttcnpp at 594 PS1, Line 594: setverdict(fail, "No LLC SAPI for ", l3_mo); : mtc.stop; : self.stop; I think the better approach would be to call Misc_Helpers.f_shutdown(fail, ...) in all those cases? or if that is not possible, what about "all component.stop" ? that includes both self and mtc, and is only a single line. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:36:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:37:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... Patch Set 1: in general I am not sure this is worth the effort. Our test suites are _full_ of functions where we legitimately ignore unused results. I would rather consider spending time to fix the compiler, inroducing a way to disable certain warnings. See https://www.eclipse.org/forums/index.php/t/1106852/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 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: Iac84facc0041b928f04a5e2d2311dfd9d642c5a9 Gerrit-Change-Number: 22724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:37:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:38:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:38:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CTRL: Avoid using keyword 'now' as var In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 ) Change subject: CTRL: Avoid using keyword 'now' as var ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 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: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f Gerrit-Change-Number: 22725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:38:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:39:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:39:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:39:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:39:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:39:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 ) Change subject: GSM_Types: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 2: see my other comment about Misc_Helpers.f_shutdown() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:39:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:40:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:40:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 ) Change subject: pcu: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 2: f_shutdown() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 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: I2c8b343fba5fabda9f78af8711e2a837536518e9 Gerrit-Change-Number: 22736 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:40:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:40:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:40:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 ) Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738/2/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738/2/library/Osmocom_Gb_Types.ttcn at 3737 PS2, Line 3737: self.stop; f_shutdown() -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c Gerrit-Change-Number: 22738 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:40:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:41:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:41:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 ) Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings ...................................................................... Patch Set 5: Code-Review+2 thanks! this has been on my todo list for a long time. When I started with TTCN3, I was trying to write as little code as possible and tried to reuse templates for send and receive. But that of course comes at a price, and by now I've long given up on that. Yet, there's still old code in the test suites from the early days. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:41:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:42:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:42:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 ) Change subject: StatsD_Checker: Check f_IPL4_listen result ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741/2/library/StatsD_Checker.ttcn File library/StatsD_Checker.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741/2/library/StatsD_Checker.ttcn at 105 PS2, Line 105: setverdict(fail, "Could not bind StatsD socket, check your configuration"); f_shutdown? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 Gerrit-Change-Number: 22741 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:42:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:42:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:42:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix tons of warnings in RLCMAC and pcu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 ) Change subject: Fix tons of warnings in RLCMAC and pcu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 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: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 Gerrit-Change-Number: 22745 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:42:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:43:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:43:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 ) Change subject: msc: test reaction on Clear Request during a MO/MT Call ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:43:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:44:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:44:08 +0000 Subject: Change in osmo-msc[master]: submit_to_sms(): fix the use of deprecated gsm_septets2octets() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22748 ) Change subject: submit_to_sms(): fix the use of deprecated gsm_septets2octets() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 Gerrit-Change-Number: 22748 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:44:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:44:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:44:21 +0000 Subject: Change in osmo-msc[master]: ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22749 ) Change subject: ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I56dd920b931e769ba4d268b09700fe3c9fca4fc6 Gerrit-Change-Number: 22749 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:44:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:45:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:45:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: fix syntax in PCU_Tests.cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22740 ) Change subject: pcu: fix syntax in PCU_Tests.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22740 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: I7f146ff71c107983e5787982970d0f6cd313cde9 Gerrit-Change-Number: 22740 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 05 Feb 2021 20:45:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:45:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:45:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: fix syntax in PCU_Tests.cfg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22740 ) Change subject: pcu: fix syntax in PCU_Tests.cfg ...................................................................... pcu: fix syntax in PCU_Tests.cfg There was a missing comma in the configuration as well the indention was misaligned. Related: OS#4953 Fixes: be7afce974a4 ("NS_Emulation: Respect data_weight==0 or signalling_weight==0") Change-Id: I7f146ff71c107983e5787982970d0f6cd313cde9 --- M pcu/PCU_Tests.cfg 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index dfebb40..6d3407d 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -36,7 +36,6 @@ data_weight := 1, signalling_weight := 1 } - } }, nsvci := 1234 }, @@ -51,7 +50,6 @@ data_weight := 1, signalling_weight := 1 } - } }, nsvci := 1234 } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22740 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: I7f146ff71c107983e5787982970d0f6cd313cde9 Gerrit-Change-Number: 22740 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:46:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:46:00 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22739 ) Change subject: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68a37e17469ec9f8178fd2027b8860dbc643a4f9 Gerrit-Change-Number: 22739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 20:46:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:46:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:46:02 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22739 ) Change subject: osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() ...................................................................... osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() Change-Id: I68a37e17469ec9f8178fd2027b8860dbc643a4f9 Related: OS#5007 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 1552a86..bf0650d 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -554,7 +554,7 @@ .ci_cb = (ci_cb_sum / n), }; - LOGP(DL1C, LOGL_DEBUG, "Measurement AVG (num=%u, shift=%u): " + LOGP(DMEAS, LOGL_DEBUG, "Measurement AVG (num=%u, shift=%u): " "RSSI %f, ToA256 %d, C/I %d cB\n", n, shift, avg->rssi, avg->toa256, avg->ci_cb); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I68a37e17469ec9f8178fd2027b8860dbc643a4f9 Gerrit-Change-Number: 22739 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:47:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:47:26 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/2/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/2/ggsn/ggsn_vty.c at 710 PS2, Line 710: apn->cfg.shutdown = false; > this shutdown var is really confusing lol that's how cisco works: You have all new nodes (e.g. vlans, bridges, ...) created in VTY by default in "shutdown" mode, and they need explicit enabling via "no shutdown". -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 20:47:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 20:47:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 5 Feb 2021 20:47:42 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... apn_start: avoid segfault if missing tun-device Check if tun-device is defined and give the user a hint that it is missing instead of segfaulting with gtpu-mode kernel-gtp: 20210205141701206 DGGSN <0002> ggsn.c:186 APN(internet): Starting 20210205141701206 DGGSN <0002> ggsn.c:204 APN(internet): Opening Kernel GTP device (null) Segmentation fault With gtpu-mode tun it didn't segfault, but still tried to open the NULL device: 20210205141557598 DGGSN <0002> ggsn.c:186 APN(internet): Starting 20210205141557599 DGGSN <0002> ggsn.c:189 APN(internet): Opening TUN device (null) 20210205141557599 DTUN <0001> tun.c:195 errno=1/Operation not permitted ioctl() failed Related: OS#3208 Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 --- M ggsn/ggsn_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index f76018e..71d8ff6 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -699,6 +699,10 @@ struct apn_ctx *apn = (struct apn_ctx *) vty->index; if (apn->cfg.shutdown) { + if (!apn->tun.cfg.dev_name) { + vty_out(vty, "%% Failed to start APN, tun-device is not configured%s", VTY_NEWLINE); + return CMD_WARNING; + } if (apn_start(apn) < 0) { vty_out(vty, "%% Failed to start APN, check log for details%s", VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 21:22:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 21:22:33 +0000 Subject: Change in osmo-msc[master]: submit_to_sms(): fix the use of deprecated gsm_septets2octets() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22748 ) Change subject: submit_to_sms(): fix the use of deprecated gsm_septets2octets() ...................................................................... submit_to_sms(): fix the use of deprecated gsm_septets2octets() Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 --- M TODO-RELEASE M src/libmsc/smpp_openbsc.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 9c358ae..036a9b9 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response osmo-msc update version dependency to version with osmo_fd_*_{disable,enable} +osmo-msc smpp migrate to gsm_septet_pack(), available since Ib1aac538afeb0a5c76a1df472d555139a496e12e diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index a79b252..54cd75b 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -250,8 +250,7 @@ sms_msg_len -= ud_len; padbits = 7 - (ud_len % 7); } - gsm_septets2octets(sms->user_data+ud_len, sms_msg, - sms_msg_len, padbits); + gsm_septet_pack(sms->user_data+ud_len, sms_msg, sms_msg_len, padbits); sms->user_data_len = (ud_len*8 + padbits)/7 + sms_msg_len;/* SEPTETS */ /* FIXME: sms->text */ } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9985972f0b1d2b71bfd133c5004201a3a0ffcbd0 Gerrit-Change-Number: 22748 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 21:22:34 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 21:22:34 +0000 Subject: Change in osmo-msc[master]: ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22749 ) Change subject: ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() ...................................................................... ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() Change-Id: I56dd920b931e769ba4d268b09700fe3c9fca4fc6 --- M src/libmsc/ran_msg_a.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 6a33704..2890076 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -225,7 +225,7 @@ .msg_name = "BSSMAP Ciphering Mode Reject", }; - rc = gsm0808_get_cipher_reject_cause(tp); + rc = gsm0808_get_cause(tp); if (rc < 0) { LOG_RAN_A_DEC_MSG(LOGL_ERROR, "failed to extract Cause\n"); ran_dec_msg.cipher_mode_reject.bssap_cause = GSM0808_CAUSE_EQUIPMENT_FAILURE; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I56dd920b931e769ba4d268b09700fe3c9fca4fc6 Gerrit-Change-Number: 22749 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 21:27:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 5 Feb 2021 21:27:41 +0000 Subject: Change in osmo-ggsn[master]: apn_start: avoid segfault if missing tun-device In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 ) Change subject: apn_start: avoid segfault if missing tun-device ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/2/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/22732/2/ggsn/ggsn_vty.c at 710 PS2, Line 710: apn->cfg.shutdown = false; > that's how cisco works: You have all new nodes (e.g. vlans, bridges, ... [?] yes I know, I was talking about the C variable. Most probably because the verb/order "to shut down" also matches the "already shutdown" state naming here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9f71af65cc0eed71728c04b774e5c08352947913 Gerrit-Change-Number: 22732 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 05 Feb 2021 21:27:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 22:22:50 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 22:22:50 +0000 Subject: Change in osmo-pcu[master]: vty: register libosmocore's FSM introspection commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22752 ) Change subject: vty: register libosmocore's FSM introspection commands ...................................................................... vty: register libosmocore's FSM introspection commands Change-Id: Id268e44de6eb873138f38720a61cabe589a5d2c8 --- M src/pcu_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/22752/1 diff --git a/src/pcu_vty.c b/src/pcu_vty.c index b0d1ac6..6db8b05 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -1195,6 +1195,7 @@ logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); osmo_talloc_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); install_node(&pcu_node, config_write_pcu); install_element(CONFIG_NODE, &cfg_pcu_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id268e44de6eb873138f38720a61cabe589a5d2c8 Gerrit-Change-Number: 22752 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 5 22:23:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 5 Feb 2021 22:23:28 +0000 Subject: Change in osmo-bts[master]: vty: register libosmocore's FSM introspection commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22753 ) Change subject: vty: register libosmocore's FSM introspection commands ...................................................................... vty: register libosmocore's FSM introspection commands Change-Id: I1eb203673259b455c339784719e288bac14145c0 --- M src/common/main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/22753/1 diff --git a/src/common/main.c b/src/common/main.c index 16ffd1e..f54a5ca 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -291,6 +291,7 @@ logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); bts_vty_init(tall_bts_ctx); e1inp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1eb203673259b455c339784719e288bac14145c0 Gerrit-Change-Number: 22753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Feb 6 02:14:11 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 06 Feb 2021 02:14:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601dfb84268e8_65302aecf5a6a6006325c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 125s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 125s] [COMPILING libboard/qmod/source/card_pres.c] [ 125s] [COMPILING libboard/qmod/source/wwan_led.c] [ 126s] [COMPILING libboard/qmod/source/i2c.c] [ 126s] [COMPILING libboard/qmod/source/board_qmod.c] [ 126s] [COMPILING apps/dfu/main.c] [ 126s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 126s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 126s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 126s] Memory region Used Size Region Size %age Used [ 126s] rom: 16588 B 16 KB 101.25% [ 126s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 126s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 126s] collect2: error: ld returned 1 exit status [ 126s] % [ 126s] make[2]: *** [Makefile:234: flash] Error 1 [ 126s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 126s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 126s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 126s] dh_auto_build: error: make -j1 returned exit code 2 [ 126s] make: *** [debian/rules:16: build] Error 25 [ 126s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 126s] ### VM INTERACTION START ### [ 129s] [ 115.800595] sysrq: Power Off [ 129s] [ 115.808968] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] sheep83 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 6 02:14:06 UTC 2021. [ 129s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 6 02:34:11 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 06 Feb 2021 02:34:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <601e002d584b3_65302aecf5a6a600634666@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 557s] [COMPILING apps/dfu/main.c] [ 558s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 558s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 558s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 558s] Memory region Used Size Region Size %age Used [ 558s] rom: 16580 B 16 KB 101.20% [ 559s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 559s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 559s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 559s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 559s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 559s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 559s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 559s] collect2: error: ld returned 1 exit status [ 559s] % [ 559s] make[2]: *** [Makefile:234: flash] Error 1 [ 559s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 559s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 559s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 559s] dh_auto_build: error: make -j1 returned exit code 2 [ 559s] make: *** [debian/rules:16: build] Error 25 [ 559s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 559s] ### VM INTERACTION START ### [ 562s] [ 488.309065] sysrq: Power Off [ 562s] [ 488.354558] reboot: Power down [ 562s] ### VM INTERACTION END ### [ 562s] [ 562s] lamb02 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 6 02:33:55 UTC 2021. [ 562s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 6 04:41:20 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 06 Feb 2021 04:41:20 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <601e1df4824d5_65302aecf5a6a600647391@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 17s] copying packages... [ 20s] reordering...cycle: libncurses6 -> terminfo-base [ 20s] breaking dependency terminfo-base -> libncurses6 [ 20s] cycle: libcrack2 -> cracklib [ 20s] breaking dependency cracklib -> libcrack2 [ 20s] cycle: libdw1 -> libelf1 -> libebl-plugins [ 20s] breaking dependency libebl-plugins -> libdw1 [ 20s] cycle: libelf1 -> libebl-plugins [ 20s] breaking dependency libelf1 -> libebl-plugins [ 20s] done [ 3625s] libguestfs: error: appliance closed the connection unexpectedly. [ 3625s] This usually means the libguestfs appliance crashed. [ 3625s] Do: [ 3625s] export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 [ 3625s] and run the command again. For further information, read: [ 3625s] http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs [ 3625s] You can also run 'libguestfs-test-tool' and post the *complete* output [ 3625s] into a bug report or message to the libguestfs mailing list. [ 3625s] libguestfs: error: guestfs_launch failed. [ 3625s] This usually means the libguestfs appliance failed to start or crashed. [ 3625s] Do: [ 3625s] export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 [ 3625s] and run the command again. For further information, read: [ 3625s] http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs [ 3625s] You can also run 'libguestfs-test-tool' and post the *complete* output [ 3625s] into a bug report or message to the libguestfs mailing list. Job seems to be stuck here, killed. (after 3600 seconds of inactivity) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 6 09:30:28 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 06 Feb 2021 09:30:28 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/aarch64 In-Reply-To: References: Message-ID: <601e61ccc8886_65302aecf5a6a60068959c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 30s] [ 30s] [1/1] preinstalling libdevmapper1.02.1... [ 30s] copying packages... [ 36s] reordering...cycle: libc6 -> libgcc1 [ 36s] breaking dependency libgcc1 -> libc6 [ 36s] cycle: debhelper -> dh-autoreconf [ 36s] breaking dependency debhelper -> dh-autoreconf [ 36s] cycle: dh-strip-nondeterminism -> debhelper [ 36s] breaking dependency debhelper -> dh-strip-nondeterminism [ 36s] done [28838s] libguestfs: error: appliance closed the connection unexpectedly. [28838s] This usually means the libguestfs appliance crashed. [28838s] Do: [28838s] export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 [28838s] and run the command again. For further information, read: [28838s] http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs [28838s] You can also run 'libguestfs-test-tool' and post the *complete* output [28838s] into a bug report or message to the libguestfs mailing list. [28838s] libguestfs: error: guestfs_launch failed. [28838s] This usually means the libguestfs appliance failed to start or crashed. [28838s] Do: [28838s] export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 [28838s] and run the command again. For further information, read: [28838s] http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs [28838s] You can also run 'libguestfs-test-tool' and post the *complete* output [28838s] into a bug report or message to the libguestfs mailing list. Job seems to be stuck here, killed. (after 28800 seconds of inactivity) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 6 11:53:24 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 06 Feb 2021 11:53:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in CentOS_8/aarch64 In-Reply-To: References: Message-ID: <601e8354ae763_65302aecf5a6a60071187b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/CentOS_8/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in CentOS_8/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 39s] breaking dependency perl-ExtUtils-MakeMaker -> perl-ExtUtils-Install [ 39s] cycle: perl-Getopt-Long -> perl-Pod-Usage -> perl-podlators -> perl-Pod-Simple [ 39s] breaking dependency perl-podlators -> perl-Pod-Simple [ 39s] cycle: perl-Pod-Usage -> perl-podlators [ 39s] breaking dependency perl-podlators -> perl-Pod-Usage [ 39s] cycle: perl-Getopt-Long -> perl-Pod-Usage -> perl-Pod-Perldoc -> perl-Pod-Simple [ 39s] breaking dependency perl-Pod-Perldoc -> perl-Pod-Simple [ 39s] cycle: perl-devel -> perl-ExtUtils-Install -> perl-ExtUtils-MakeMaker [ 39s] breaking dependency perl-ExtUtils-MakeMaker -> perl-devel [ 39s] done [22945s] libguestfs: error: appliance closed the connection unexpectedly. [22945s] This usually means the libguestfs appliance crashed. [22945s] Do: [22945s] export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 [22945s] and run the command again. For further information, read: [22945s] http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs [22945s] You can also run 'libguestfs-test-tool' and post the *complete* output [22945s] into a bug report or message to the libguestfs mailing list. [22945s] libguestfs: error: guestfs_launch failed. [22945s] This usually means the libguestfs appliance failed to start or crashed. [22945s] Do: [22945s] export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1 [22945s] and run the command again. For further information, read: [22945s] http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs [22945s] You can also run 'libguestfs-test-tool' and post the *complete* output [22945s] into a bug report or message to the libguestfs mailing list. Killed job -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Feb 6 12:00:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 12:00:07 +0000 Subject: Change in osmo-bsc[master]: hide the "smscb-command" vty command; people should use osmo-cbc References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22754 ) Change subject: hide the "smscb-command" vty command; people should use osmo-cbc ...................................................................... hide the "smscb-command" vty command; people should use osmo-cbc Many years prior to the implementation of osmo-cbc, we introduced a way how raw RSL SMSCB COMMANMD can be injected from the VTY. These days, people should use the CBSP interface with osmo-cbc or any other CBC. We should not advertise the VTY command hack as a standard feature anymore. Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Related: OS#4753 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/22754/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 03b87b4..3b2bf51 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5775,8 +5775,9 @@ return CMD_SUCCESS; } - -DEFUN(smscb_cmd, smscb_cmd_cmd, +/* this command is now hidden, as it's a low-level debug hack, and people should + * instead use osmo-cbc these days */ +DEFUN_HIDDEN(smscb_cmd, smscb_cmd_cmd, "bts <0-255> smscb-command (normal|schedule|default) <1-4> HEXSTRING", "BTS related commands\n" BTS_NR_STR "SMS Cell Broadcast\n" @@ -5840,6 +5841,7 @@ return CMD_WARNING; } + /* SDCCH4 might not be correct here if the CBCH is on a SDCCH8? */ rsl_sms_cb_command(bts, RSL_CHAN_SDCCH4_ACCH, cb_cmd, false, buf, rc); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Gerrit-Change-Number: 22754 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 14:26:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 14:26:46 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame ...................................................................... osmo_ortp: Don't print ERROR message for every missing RTP frame * it's inconsistent to print ERROR in a LOGL_INFO message * loosing RTP packets is not that unusual, especially when the channel is just starting up Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Closes: OS#4464 --- M src/trau/osmo_ortp.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/55/22755/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 0cd4e9d..6e91f8d 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -202,8 +202,10 @@ if (recv_with_cb(rs)) return 1; - LOGP(DLMIB, LOGL_INFO, "osmo_rtp_socket_poll(%u): ERROR!\n", - rs->rx_user_ts); + /* this happens every time we miss an incoming RTP frame, which is quite common + * when a voice channel is first activated, or also in case of packet loss. + * See also https://osmocom.org/issues/4464 */ + LOGP(DLMIB, LOGL_DEBUG, "osmo_rtp_socket_poll(%u): No message received\n", rs->rx_user_ts); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 14:57:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 14:57:30 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Closes: OS#4143 --- M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c 2 files changed, 44 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/22756/1 diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h index f1f3fcc..d89a1ae 100644 --- a/include/osmocom/ranap/ranap_msg_factory.h +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -13,6 +13,9 @@ struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len); /*! \brief generate RANAP SECURITY MODE COMMAND message */ +struct msgb *ranap_new_msg_sec_mod_cmd2(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status, + uint8_t uia_bitmask, uint8_t uea_bitmask); + struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status); /*! \brief generate RANAP SECURITY MODE COMPLETE message */ diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 2ae2dbf..9d70121 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -202,18 +202,9 @@ return msg; } -static const enum RANAP_IntegrityProtectionAlgorithm ip_alg[2] = { - RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA1, - RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA2, -}; - -static const RANAP_EncryptionAlgorithm_t enc_alg[2] = { - RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorith_UEA1, - RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorithm_UEA2, -}; - /*! \brief generate RANAP SECURITY MODE COMMAND message */ -struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status) +struct msgb *ranap_new_msg_sec_mod_cmd2(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status, + uint8_t uia_bitmask, uint8_t uea_bitmask) { RANAP_SecurityModeCommandIEs_t ies; RANAP_SecurityModeCommand_t out; @@ -223,11 +214,26 @@ memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); - for (i = 0; i < ARRAY_SIZE(ip_alg); i++) { + for (i = 0; i < 8; i++) { + RANAP_IntegrityProtectionAlgorithm_t ialg; + if (!(uia_bitmask & (1 << i))) + continue; + switch (i) { + case 1: + ialg = RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA1; + break; + case 2: + ialg = RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA2; + break; + default: + LOGP(DRANAP, "Unsupported UIA algorithm UIA%d specified\n", i); + return NULL; + } + /* needs to be dynamically allocated, as * SET_OF_free() will call FREEMEM() on it */ RANAP_IntegrityProtectionAlgorithm_t *alg = CALLOC(1, sizeof(*alg)); - *alg = ip_alg[i]; + *alg = ialg; ASN_SEQUENCE_ADD(&ies.integrityProtectionInformation.permittedAlgorithms, alg); } @@ -235,11 +241,27 @@ if (ck) { ies.presenceMask = SECURITYMODECOMMANDIES_RANAP_ENCRYPTIONINFORMATION_PRESENT; - for (i = 0; i < ARRAY_SIZE(ip_alg); i++) { + for (i = 0; i < 8; i++) { + RANAP_EncryptionAlgorithm_t ealg; + if (!(uea_bitmask & (1 << i))) + continue; + switch (i) { + case 1: + ealg = RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorith_UEA1; + break; + case 2: + ealg = RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorithm_UEA2; + break; + default: + LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); + asn_set_empty(&ies.integrityProtectionInformation.permittedAlgorithms); + return NULL; + } + /* needs to be dynamically allocated, as * SET_OF_free() will call FREEMEM() on it */ RANAP_EncryptionAlgorithm_t *alg = CALLOC(1, sizeof(*alg)); - *alg = enc_alg[i]; + *alg = ealg; ASN_SEQUENCE_ADD(&ies.encryptionInformation.permittedAlgorithms, alg); } BIT_STRING_fromBuf(&ies.encryptionInformation.key, ck, 16*8); @@ -271,6 +293,10 @@ return msg; } +struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status) +{ + return ranap_new_msg_sec_mod_cmd2(ik, ck, status, 0x06, 0x06); +} /*! \brief generate RANAP SECURITY MODE COMPLETE message */ struct msgb *ranap_new_msg_sec_mod_compl( -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 15:10:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 15:10:34 +0000 Subject: Change in osmo-msc[master]: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15175 ) Change subject: add 'encryption uea 1 2' cfg / fix ttcn3 iu tests ...................................................................... Patch Set 4: I don't actually think that this patch works. It never passses the ck to ranap_new_msg_sec_mod_cmd() and hence the air interface will always only use integrity protection and no encryption at all. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie138f2fcb105533f7bc06a6d2e6deccf6faccc5b Gerrit-Change-Number: 15175 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 15:10:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 15:32:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 15:32:19 +0000 Subject: Change in libosmocore[master]: gsm0808: use msgb_tv16_put() and osmo_store32be() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: use msgb_tv16_put() and osmo_store32be() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 15:32:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 15:49:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 15:49:26 +0000 Subject: Change in osmo-msc[master]: [UNTESTED] Fix enabling of UMTS UEA encryption References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: [UNTESTED] Fix enabling of UMTS UEA encryption ...................................................................... [UNTESTED] Fix enabling of UMTS UEA encryption The existing code allowed the user to configure UMTS encryption in the vty, but we never actually passed this information down to RANAP. As a result, the RAN had no chance of ever enabling encryption on the air interface. Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Related: OS#4144 --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_iu.c 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/22757/1 diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index 3b08b46..232e284 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -101,6 +101,9 @@ /* out-argument to return the key to the caller, pass NULL if not needed. */ struct geran_encr *chosen_key; } geran; + struct { + bool uea_encryption; + } utran; }; struct ran_handover_request { diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 0645c54..cfdb774 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -332,6 +332,9 @@ /* for ran_a.c to store the GERAN key that is actually used */ .chosen_key = &msc_a->geran_encr, }, + .utran = { + .uea_encryption = net->uea_encryption + } }, }; diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 5d13460..6120918 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -369,7 +369,7 @@ LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "Tx RANAP SECURITY MODE COMMAND to RNC, ik %s\n", osmo_hexdump_nospc(cm->vec->ik, 16)); - return ranap_new_msg_sec_mod_cmd(cm->vec->ik, NULL, RANAP_KeyStatus_new); + return ranap_new_msg_sec_mod_cmd(cm->vec->ik, cm->utran.uea_encryption ? cm->vec->ck : NULL, RANAP_KeyStatus_new); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 15:50:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 15:50:49 +0000 Subject: Change in libosmocore[master]: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22758 ) Change subject: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() ...................................................................... tlv: add msgb_tv32_put(), similar to msgb_tv16_put() Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 --- M include/osmocom/gsm/tlv.h 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/22758/1 diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index fe057f4..0d0cdce 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -414,6 +414,16 @@ return tv16_put(buf, tag, val); } +/*! put (append) a TV32 field to a \ref msgb + * \returns pointer to first byte after newly-put information */ +static inline uint8_t *msgb_tv32_put(struct msgb *msg, uint8_t tag, uint32_t val) +{ + uint8_t *buf = msgb_put(msg, 1 + 4); + *buf++ = tag; + osmo_store32be(val, buf); + return msgb->tail; +} + /*! push (prepend) a TLV field to a \ref msgb * \returns pointer to first byte of newly-pushed information */ static inline uint8_t *msgb_tlv_push(struct msgb *msg, uint8_t tag, uint8_t len, const uint8_t *val) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 Gerrit-Change-Number: 22758 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 15:50:50 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 15:50:50 +0000 Subject: Change in libosmocore[master]: tlv: clarify documentation for msgb_tv{16, 32}_put() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22759 ) Change subject: tlv: clarify documentation for msgb_tv{16,32}_put() ...................................................................... tlv: clarify documentation for msgb_tv{16,32}_put() Change-Id: Ie439822e0587012e108f67ba4e73771dc684b95b --- M include/osmocom/gsm/tlv.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/22759/1 diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 0d0cdce..099a633 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -406,7 +406,7 @@ return len; } -/*! put (append) a TV16 field to a \ref msgb +/*! put (append) a TV16 field (network order) to the given msgb * \returns pointer to first byte after newly-put information */ static inline uint8_t *msgb_tv16_put(struct msgb *msg, uint8_t tag, uint16_t val) { @@ -414,7 +414,7 @@ return tv16_put(buf, tag, val); } -/*! put (append) a TV32 field to a \ref msgb +/*! put (append) a TV32 field (network order) to the given msgb * \returns pointer to first byte after newly-put information */ static inline uint8_t *msgb_tv32_put(struct msgb *msg, uint8_t tag, uint32_t val) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie439822e0587012e108f67ba4e73771dc684b95b Gerrit-Change-Number: 22759 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:06:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:06:35 +0000 Subject: Change in libosmocore[master]: gsm0808: use msgb_tv16_put() and osmo_store32be() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: use msgb_tv16_put() and osmo_store32be() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 16:06:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:06:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:06:49 +0000 Subject: Change in libosmocore[master]: gsm0808: use msgb_tv16_put() and osmo_store32be() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22717 ) Change subject: gsm0808: use msgb_tv16_put() and osmo_store32be() ...................................................................... gsm0808: use msgb_tv16_put() and osmo_store32be() This API makes the code simpler and easier to read. Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b --- M src/gsm/gsm0808.c 1 file changed, 5 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 971d962..6070ef3 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -494,8 +494,6 @@ { /* See also: 3GPP TS 48.008 3.2.1.1 ASSIGNMENT REQUEST */ struct msgb *msg; - uint16_t cic_sw; - uint32_t ci_sw; /* Mandatory emelent! */ OSMO_ASSERT(ct); @@ -513,11 +511,8 @@ gsm0808_enc_channel_type(msg, ct); /* Circuit Identity Code 3.2.2.2 */ - if (cic) { - cic_sw = osmo_htons(*cic); - msgb_tv_fixed_put(msg, GSM0808_IE_CIRCUIT_IDENTITY_CODE, - sizeof(cic_sw), (uint8_t *) & cic_sw); - } + if (cic) + msgb_tv16_put(msg, GSM0808_IE_CIRCUIT_IDENTITY_CODE, *cic); /* AoIP: AoIP Transport Layer Address (MGW) 3.2.2.102 */ if (ss) { @@ -531,17 +526,9 @@ /* AoIP: Call Identifier 3.2.2.105 */ if (ci) { /* NOTE: 3GPP TS 48.008, section 3.2.2.105 specifies that - the least significant byte should be transmitted first. - On x86, this would mean that the endieness is already - correct, however a platform independed implementation - is required: */ -#ifndef OSMO_IS_LITTLE_ENDIAN - ci_sw = osmo_swab32(*ci); -#else - ci_sw = *ci; -#endif - msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, sizeof(ci_sw), - (uint8_t *) & ci_sw); + * the least significant byte shall be transmitted first. */ + msgb_v_put(msg, GSM0808_IE_CALL_ID); + osmo_store32le(*ci, msgb_put(msg, sizeof(*ci))); } if (kc) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe9eaaa2a9344ba798631b8f115ad248f0a2f76b Gerrit-Change-Number: 22717 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:06:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:06:59 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: check return value of osmo_fsm_register() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22733 ) Change subject: bssgp_bvc_fsm: check return value of osmo_fsm_register() ...................................................................... bssgp_bvc_fsm: check return value of osmo_fsm_register() Change-Id: I0ade2e476a035bb44b2f135ece4552d015852274 Fixes: CID#215717 --- M src/gb/bssgp_bvc_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index 6de0028..6b8bd14 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -819,5 +819,5 @@ static __attribute__((constructor)) void on_dso_load_bvc_fsm(void) { - osmo_fsm_register(&bssgp_bvc_fsm); + OSMO_ASSERT(osmo_fsm_register(&bssgp_bvc_fsm) == 0); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ade2e476a035bb44b2f135ece4552d015852274 Gerrit-Change-Number: 22733 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:07:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:07:21 +0000 Subject: Change in osmo-bts[master]: oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22760 ) Change subject: oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() ...................................................................... oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() Change-Id: I2841e15865596bbb24cfe1f27691404514d3b6f0 --- M src/common/oml.c 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/22760/1 diff --git a/src/common/oml.c b/src/common/oml.c index 02b1770..ce76064 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1391,15 +1391,12 @@ uint8_t stream_id = 0; - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) { + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) ip = ntohl(tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP)); - } - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) { + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); - } - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) { + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); - } in.s_addr = htonl(ip); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2841e15865596bbb24cfe1f27691404514d3b6f0 Gerrit-Change-Number: 22760 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:07:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:07:22 +0000 Subject: Change in osmo-bts[master]: oml: avoid redundant ntohl() / htonl() conversion References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22761 ) Change subject: oml: avoid redundant ntohl() / htonl() conversion ...................................................................... oml: avoid redundant ntohl() / htonl() conversion Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 --- M src/common/oml.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/22761/1 diff --git a/src/common/oml.c b/src/common/oml.c index ce76064..b7b86e3 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1384,7 +1384,6 @@ { struct e1inp_sign_link *oml_link = trx->bts->oml_link; uint16_t port = IPA_TCP_PORT_RSL; - uint32_t ip = get_signlink_remote_ip(oml_link); const char *trx_name = gsm_trx_name(trx); struct in_addr in; int rc; @@ -1392,13 +1391,15 @@ uint8_t stream_id = 0; if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) - ip = ntohl(tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP)); + in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); + else + in.s_addr = htonl(get_signlink_remote_ip(oml_link)); + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); - in.s_addr = htonl(ip); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", trx_name, inet_ntoa(in), port, stream_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 Gerrit-Change-Number: 22761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:07:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:07:22 +0000 Subject: Change in osmo-bts[master]: oml: make 'struct tlv_parsed' pointer const where possible References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22762 ) Change subject: oml: make 'struct tlv_parsed' pointer const where possible ...................................................................... oml: make 'struct tlv_parsed' pointer const where possible Change-Id: I077f5aba50cc4d1a86feff527784de07394c5c0a --- M src/common/oml.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/22762/1 diff --git a/src/common/oml.c b/src/common/oml.c index b7b86e3..b1ae7b4 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1155,7 +1155,7 @@ * manufacturer related messages */ -static int oml_ipa_mo_set_attr_nse(void *obj, struct tlv_parsed *tp) +static int oml_ipa_mo_set_attr_nse(void *obj, const struct tlv_parsed *tp) { struct gsm_bts *bts = container_of(obj, struct gsm_bts, gprs.nse); @@ -1178,7 +1178,7 @@ return 0; } -static int oml_ipa_mo_set_attr_cell(void *obj, struct tlv_parsed *tp) +static int oml_ipa_mo_set_attr_cell(void *obj, const struct tlv_parsed *tp) { struct gsm_bts *bts = container_of(obj, struct gsm_bts, gprs.cell); struct gprs_rlc_cfg *rlcc = &bts->gprs.cell.rlc_cfg; @@ -1249,7 +1249,7 @@ } static int oml_ipa_mo_set_attr_nsvc(struct gsm_bts_gprs_nsvc *nsvc, - struct tlv_parsed *tp) + const struct tlv_parsed *tp) { if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_NSVCI, 2)) nsvc->nsvci = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_NSVCI)); @@ -1319,7 +1319,7 @@ } static int oml_ipa_mo_set_attr(struct gsm_bts *bts, const struct gsm_abis_mo *mo, - void *obj, struct tlv_parsed *tp) + void *obj, const struct tlv_parsed *tp) { int rc; @@ -1380,7 +1380,7 @@ } static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, - struct tlv_parsed *tp) + const struct tlv_parsed *tp) { struct e1inp_sign_link *oml_link = trx->bts->oml_link; uint16_t port = IPA_TCP_PORT_RSL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I077f5aba50cc4d1a86feff527784de07394c5c0a Gerrit-Change-Number: 22762 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:07:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:07:23 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... oml: reuse the given msgb in oml_fom_ack_nack() Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 --- M src/common/oml.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/22763/1 diff --git a/src/common/oml.c b/src/common/oml.c index b1ae7b4..12875f4 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -424,23 +424,15 @@ return oml_mo_fom_ack_nack(mo, NM_MT_OPSTART, nack_cause); } -/* Send an ACK or NACK response for 'msg' to BSC, deriving message - * type, obj class, obj inst from 'msg' and copying all attributes - * contained in 'msg'. ACK is sent if cause == 0; NACK otherwise */ -int oml_fom_ack_nack(struct msgb *old_msg, uint8_t cause) +/* Send an ACK or NACK response to BSC for the given OML message, + * reusing it. ACK is sent if cause == 0; NACK otherwise. */ +int oml_fom_ack_nack(struct msgb *msg, uint8_t cause) { - struct msgb *msg; struct abis_om_fom_hdr *foh; - msg = msgb_copy(old_msg, "OML_fom_ack_nack"); - if (!msg) - return -ENOMEM; - - /* remove any l2/l1 that may be present in copy */ + /* remove any l2/l1 that may be already present */ msgb_pull_to_l2(msg); - msg->trx = old_msg->trx; - foh = (struct abis_om_fom_hdr *) msg->l3h; /* alter message type */ @@ -459,7 +451,11 @@ } /* we cannot use oml_send_msg() as we already have the OML header */ - return abis_oml_sendmsg(msg); + if (abis_oml_sendmsg(msg) != 0) + LOGPFOH(DOML, LOGL_ERROR, foh, "Failed to send ACK/NACK\n"); + + /* msgb was reused, do not free() */ + return 1; } /* @@ -1537,6 +1533,10 @@ ret = -EINVAL; } + /* msgb was reused, do not free() */ + if (ret == 1) + return 0; + msgb_free(msg); return ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:07:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:07:23 +0000 Subject: Change in osmo-bts[master]: oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22764 ) Change subject: oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() ...................................................................... oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() Both NM_ATT_IPACC_DST_IP and NM_ATT_IPACC_DST_IP_PORT are defined as TLV_TYPE_FIXED, and NM_ATT_IPACC_STREAM_ID is TLV_TYPE_TV, so the TLV parser already does check the length for us. Change-Id: I1e493e552bb22bb42bb196ce71214e28d23fd19e --- M src/common/oml.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/22764/1 diff --git a/src/common/oml.c b/src/common/oml.c index 12875f4..d395d8f 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1386,14 +1386,14 @@ uint8_t stream_id = 0; - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); else in.s_addr = htonl(get_signlink_remote_ip(oml_link)); - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1e493e552bb22bb42bb196ce71214e28d23fd19e Gerrit-Change-Number: 22764 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:07:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:07:24 +0000 Subject: Change in osmo-bts[master]: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22765 ) Change subject: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs ...................................................................... oml: ensure that IPA RSL Connect ACK/NACK contains all IEs All IEs in the BSC originated message are optional, so we assume default values for them. Let's reflect them all in the ACK/NACK. Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61 Related: OS#3791 --- M src/common/oml.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/22765/1 diff --git a/src/common/oml.c b/src/common/oml.c index d395d8f..c32260b 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -442,14 +442,15 @@ foh->msg_type += 2; /* nack */ /* add cause */ msgb_tv_put(msg, NM_ATT_NACK_CAUSES, cause); - /* update the length as we just made the message larger */ - struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg); - omh->length = msgb_l3len(msg); } else { LOGPFOH(DOML, LOGL_DEBUG, foh, "Sending FOM ACK.\n"); foh->msg_type++; /* ack */ } + /* ensure that the message length is up to date */ + struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg); + omh->length = msgb_l3len(msg); + /* we cannot use oml_send_msg() as we already have the OML header */ if (abis_oml_sendmsg(msg) != 0) LOGPFOH(DOML, LOGL_ERROR, foh, "Failed to send ACK/NACK\n"); @@ -1406,6 +1407,16 @@ trx->rsl_tei = stream_id; rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr); } + + /* The ACK/NACK is expected to contain all IEs */ + if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) /* TV32 */ + msgb_tv_fixed_put(msg, NM_ATT_IPACC_DST_IP, sizeof(in), + (const uint8_t *) &in); + if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) /* TV16 */ + msgb_tv16_put(msg, NM_ATT_IPACC_DST_IP_PORT, port); + if (!TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) /* TV */ + msgb_tv_put(msg, NM_ATT_IPACC_STREAM_ID, stream_id); + if (rc < 0) { LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc); return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61 Gerrit-Change-Number: 22765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:08:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:08:01 +0000 Subject: Change in libosmocore[master]: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/22758 ) Change subject: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() ...................................................................... tlv: add msgb_tv32_put(), similar to msgb_tv16_put() Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 --- M include/osmocom/gsm/tlv.h 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/22758/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 Gerrit-Change-Number: 22758 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:09:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:09:09 +0000 Subject: Change in libosmocore[master]: tlv: clarify documentation for msgb_tv{16, 32}_put() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22759 ) Change subject: tlv: clarify documentation for msgb_tv{16,32}_put() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie439822e0587012e108f67ba4e73771dc684b95b Gerrit-Change-Number: 22759 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:09:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:09:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:09:20 +0000 Subject: Change in libosmocore[master]: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22758 ) Change subject: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 Gerrit-Change-Number: 22758 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:09:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:09:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:09:56 +0000 Subject: Change in osmo-bts[master]: oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22760 ) Change subject: oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2841e15865596bbb24cfe1f27691404514d3b6f0 Gerrit-Change-Number: 22760 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 06 Feb 2021 16:09:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:10:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:10:36 +0000 Subject: Change in osmo-bts[master]: oml: avoid redundant ntohl() / htonl() conversion In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22761 ) Change subject: oml: avoid redundant ntohl() / htonl() conversion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 Gerrit-Change-Number: 22761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:10:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:10:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:10:50 +0000 Subject: Change in osmo-bts[master]: oml: make 'struct tlv_parsed' pointer const where possible In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22762 ) Change subject: oml: make 'struct tlv_parsed' pointer const where possible ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I077f5aba50cc4d1a86feff527784de07394c5c0a Gerrit-Change-Number: 22762 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:10:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:11:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:11:14 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... Patch Set 1: why? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:11:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:11:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:11:34 +0000 Subject: Change in osmo-bts[master]: oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22764 ) Change subject: oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1e493e552bb22bb42bb196ce71214e28d23fd19e Gerrit-Change-Number: 22764 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:11:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:12:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:12:10 +0000 Subject: Change in osmo-bts[master]: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22765 ) Change subject: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61 Gerrit-Change-Number: 22765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:12:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:17:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:17:13 +0000 Subject: Change in libosmocore[master]: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22758 ) Change subject: tlv: add msgb_tv32_put(), similar to msgb_tv16_put() ...................................................................... tlv: add msgb_tv32_put(), similar to msgb_tv16_put() Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 --- M include/osmocom/gsm/tlv.h 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index fe057f4..bcdebb3 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -414,6 +414,16 @@ return tv16_put(buf, tag, val); } +/*! put (append) a TV32 field to a \ref msgb + * \returns pointer to first byte after newly-put information */ +static inline uint8_t *msgb_tv32_put(struct msgb *msg, uint8_t tag, uint32_t val) +{ + uint8_t *buf = msgb_put(msg, 1 + 4); + *buf++ = tag; + osmo_store32be(val, buf); + return msg->tail; +} + /*! push (prepend) a TLV field to a \ref msgb * \returns pointer to first byte of newly-pushed information */ static inline uint8_t *msgb_tlv_push(struct msgb *msg, uint8_t tag, uint8_t len, const uint8_t *val) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I11301b20038aa5d90d46d968f7eda3d53b560022 Gerrit-Change-Number: 22758 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:17:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:17:14 +0000 Subject: Change in libosmocore[master]: tlv: clarify documentation for msgb_tv{16, 32}_put() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22759 ) Change subject: tlv: clarify documentation for msgb_tv{16,32}_put() ...................................................................... tlv: clarify documentation for msgb_tv{16,32}_put() Change-Id: Ie439822e0587012e108f67ba4e73771dc684b95b --- M include/osmocom/gsm/tlv.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index bcdebb3..dc61de1 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -406,7 +406,7 @@ return len; } -/*! put (append) a TV16 field to a \ref msgb +/*! put (append) a TV16 field (network order) to the given msgb * \returns pointer to first byte after newly-put information */ static inline uint8_t *msgb_tv16_put(struct msgb *msg, uint8_t tag, uint16_t val) { @@ -414,7 +414,7 @@ return tv16_put(buf, tag, val); } -/*! put (append) a TV32 field to a \ref msgb +/*! put (append) a TV32 field (network order) to the given msgb * \returns pointer to first byte after newly-put information */ static inline uint8_t *msgb_tv32_put(struct msgb *msg, uint8_t tag, uint32_t val) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie439822e0587012e108f67ba4e73771dc684b95b Gerrit-Change-Number: 22759 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:18:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:18:35 +0000 Subject: Change in osmo-pcu[master]: vty: register libosmocore's FSM introspection commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22752 ) Change subject: vty: register libosmocore's FSM introspection commands ...................................................................... Patch Set 1: Code-Review+2 Trivial change, planning to merge soon. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id268e44de6eb873138f38720a61cabe589a5d2c8 Gerrit-Change-Number: 22752 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:18:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:18:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 6 Feb 2021 16:18:53 +0000 Subject: Change in osmo-bts[master]: vty: register libosmocore's FSM introspection commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22753 ) Change subject: vty: register libosmocore's FSM introspection commands ...................................................................... Patch Set 1: Code-Review+2 Trivial change, planning to merge soon. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1eb203673259b455c339784719e288bac14145c0 Gerrit-Change-Number: 22753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 06 Feb 2021 16:18:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:18:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:18:56 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Make UTRAN encryption algorithms configurable Allow the user fine-grained control over which UMTS encryption algorithms are permitted, rather than always permitting UEA1 and UEA2 or neither. This brings the handling of UEA in line with the handling of A5 for GERAN. Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Closes: OS#4144 Depends: osmo-iuh.git I6d2d033b0427bdc84fee61e0f3cb7b29935214bf --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/ran_msg.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_iu.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/test_nodes.vty 9 files changed, 37 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/66/22766/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 438ee08..be25b92 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -151,10 +151,8 @@ bool authentication_required; int send_mm_info; - /* Whether to use encryption on UTRAN. - * TODO: we should offer a choice of UEA1 and/or UEA2, and probably replace this bool with a bit-mask of - * permitted Iu encryption algorithms. See also OS#4143 and the 'encryption uea' vty command. */ - bool uea_encryption; + /* bit-mask of permitted encryption algorithms. LSB=UEA0, MSB=UEA7 */ + uint8_t uea_encryption_mask; struct rate_ctr_group *msc_ctrs; struct osmo_stat_item_group *statg; diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index 232e284..b474381 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -102,7 +102,7 @@ struct geran_encr *chosen_key; } geran; struct { - bool uea_encryption; + uint8_t uea_encryption_mask; } utran; }; diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 6379059..d21db3f 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -412,7 +412,7 @@ net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption : net->a5_encryption_mask > 0x01, + is_utran ? net->uea_encryption_mask > 0x01 : net->a5_encryption_mask > 0x01, lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -803,7 +803,7 @@ req->cm_service_type, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption : net->a5_encryption_mask > 0x01, + is_utran ? net->uea_encryption_mask > 0x01 : net->a5_encryption_mask > 0x01, req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1180,7 +1180,7 @@ net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption : net->a5_encryption_mask > 0x01, + is_utran ? net->uea_encryption_mask > 0x01 : net->a5_encryption_mask > 0x01, pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index cfdb774..abfa247 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -333,8 +333,8 @@ .chosen_key = &msc_a->geran_encr, }, .utran = { - .uea_encryption = net->uea_encryption - } + .uea_encryption_mask = net->uea_encryption_mask, + }, }, }; diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 9e3e8b3..d53156b 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -67,7 +67,8 @@ /* Permit a compile-time default of A5/3 and A5/1 */ net->a5_encryption_mask = (1 << 3) | (1 << 1); - net->uea_encryption = true; + /* Permit a compile-time default of UEA2 and UEA1 */ + net->uea_encryption_mask = (1 << 2) | (1 << 1); net->mncc_guard_timeout = 180; net->ncss_guard_timeout = 30; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 79b4daa..402ec89 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -173,36 +173,17 @@ cfg_net_encryption_uea_cmd, "encryption uea <0-2> [<0-2>] [<0-2>]", ENCRYPTION_STR - "UTRAN (3G) encryption algorithms to allow: 0 = UEA0 (no encryption), 1 = UEA1, 2 = UEA2." - " NOTE: the current implementation does not allow free choice of combining encryption algorithms yet." - " The only valid settings are either 'encryption uea 0' or 'encryption uea 1 2'.\n" + "UTRAN (3G) encryption algorithms to allow: 0 = UEA0 (no encryption), 1 = UEA1, 2 = UEA2.\n" "UEAn Algorithm Number\n" "UEAn Algorithm Number\n" "UEAn Algorithm Number\n" ) { unsigned int i; - uint8_t mask = 0; + gsmnet->uea_encryption_mask = 0; for (i = 0; i < argc; i++) - mask |= (1 << atoi(argv[i])); - - if (mask == (1 << 0)) { - /* UEA0. Disable encryption. */ - gsmnet->uea_encryption = false; - } else if (mask == ((1 << 1) | (1 << 2))) { - /* UEA1 and UEA2. Enable encryption. */ - gsmnet->uea_encryption = true; - } else { - vty_out(vty, - "%% Error: the current implementation does not allow free choice of combining%s" - "%% encryption algorithms yet. The only valid settings are either%s" - "%% encryption uea 0%s" - "%% or%s" - "%% encryption uea 1 2%s", - VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); - return CMD_WARNING; - } + gsmnet->uea_encryption_mask |= (1 << atoi(argv[i])); return CMD_SUCCESS; } @@ -385,10 +366,12 @@ } vty_out(vty, "%s", VTY_NEWLINE); - if (!gsmnet->uea_encryption) - vty_out(vty, " encryption uea 0%s", VTY_NEWLINE); - else - vty_out(vty, " encryption uea 1 2%s", VTY_NEWLINE); + vty_out(vty, " encryption uea"); + for (i = 0; i < 8; i++) { + if (gsmnet->uea_encryption_mask & (1 << i)) + vty_out(vty, " %u", i); + } + vty_out(vty, "%s", VTY_NEWLINE); vty_out(vty, " authentication %s%s", gsmnet->authentication_required ? "required" : "optional", VTY_NEWLINE); vty_out(vty, " rrlp mode %s%s", msc_rrlp_mode_name(gsmnet->rrlp.mode), diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 6120918..0c4868e 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -367,9 +367,13 @@ const struct ran_cipher_mode_command *cm) { - LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "Tx RANAP SECURITY MODE COMMAND to RNC, ik %s\n", - osmo_hexdump_nospc(cm->vec->ik, 16)); - return ranap_new_msg_sec_mod_cmd(cm->vec->ik, cm->utran.uea_encryption ? cm->vec->ck : NULL, RANAP_KeyStatus_new); + LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "Tx RANAP SECURITY MODE COMMAND to RNC, IK=%s, CK=%s\n", + osmo_hexdump_nospc(cm->vec->ik, 16), + cm->utran.uea_encryption_mask > 0x01 ? osmo_hexdump_nospc(cm->vec->ck, 16) : "NONE"); + /* TODO: Do we need to check if the UE supports all of the algorithms and build an intersection like + * in the case of A5? */ + return ranap_new_msg_sec_mod_cmd2(cm->vec->ik, cm->utran.uea_encryption_mask > 0x01 ? cm->vec->ck : NULL, + 0x06, cm->utran.uea_encryption_mask, RANAP_KeyStatus_new); } diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 46f8d98..e462ef4 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -50,7 +50,7 @@ "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb" "0c7ac3e9e9b7db05"; bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1) - || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption); + || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption_mask > 0x1); net->authentication_required = true; net->vlr->cfg.assign_tmsi = true; @@ -333,7 +333,7 @@ static void test_umts_authen_utran() { comment_start(); - net->uea_encryption = false; + net->uea_encryption_mask = 0x01; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -341,7 +341,7 @@ static void test_umts_auth_ciph_utran() { comment_start(); - net->uea_encryption = true; + net->uea_encryption_mask = 0x06; _test_umts_authen(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -361,7 +361,7 @@ struct vlr_subscr *vsub; const char *imsi = "901700000010650"; bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1) - || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption); + || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption_mask > 0x1); net->authentication_required = true; net->vlr->cfg.assign_tmsi = true; @@ -588,7 +588,7 @@ static void test_umts_authen_resync_utran() { comment_start(); - net->uea_encryption = false; + net->uea_encryption_mask = 0x01; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } @@ -596,7 +596,7 @@ static void test_umts_auth_ciph_resync_utran() { comment_start(); - net->uea_encryption = true; + net->uea_encryption_mask = 0x06; _test_umts_authen_resync(OSMO_RAT_UTRAN_IU); comment_end(); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index f956a12..8a530a8 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -31,7 +31,7 @@ encryption Encryption options OsmoMSC(config-net)# encryption ? a5 GSM A5 Air Interface Encryption. - uea UTRAN (3G) encryption algorithms to allow: 0 = UEA0 (no encryption), 1 = UEA1, 2 = UEA2. NOTE: the current implementation does not allow free choice of combining encryption algorithms yet. The only valid settings are either 'encryption uea 0' or 'encryption uea 1 2'. + uea UTRAN (3G) encryption algorithms to allow: 0 = UEA0 (no encryption), 1 = UEA1, 2 = UEA2. OsmoMSC(config-net)# encryption uea ? <0-2> UEAn Algorithm Number @@ -187,38 +187,27 @@ ... OsmoMSC(config-net)# encryption uea 1 -% Error: the current implementation does not allow free choice of combining -% encryption algorithms yet. The only valid settings are either -% encryption uea 0 -% or -% encryption uea 1 2 OsmoMSC(config-net)# show running-config ... - encryption uea 0 + encryption uea 1 ... OsmoMSC(config-net)# encryption uea 2 -% Error: the current implementation does not allow free choice of combining -... OsmoMSC(config-net)# show running-config ... - encryption uea 0 + encryption uea 2 ... OsmoMSC(config-net)# encryption uea 0 1 -% Error: the current implementation does not allow free choice of combining -... OsmoMSC(config-net)# show running-config ... - encryption uea 0 + encryption uea 0 1 ... OsmoMSC(config-net)# encryption uea 0 2 -% Error: the current implementation does not allow free choice of combining -... OsmoMSC(config-net)# show running-config ... - encryption uea 0 + encryption uea 0 2 ... OsmoMSC(config-net)# encryption uea 1 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:50:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:50:17 +0000 Subject: Change in osmo-bts[master]: oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22760 ) Change subject: oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() ...................................................................... oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() Change-Id: I2841e15865596bbb24cfe1f27691404514d3b6f0 --- M src/common/oml.c 1 file changed, 3 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index 02b1770..ce76064 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1391,15 +1391,12 @@ uint8_t stream_id = 0; - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) { + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) ip = ntohl(tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP)); - } - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) { + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); - } - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) { + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); - } in.s_addr = htonl(ip); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2841e15865596bbb24cfe1f27691404514d3b6f0 Gerrit-Change-Number: 22760 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:50:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:50:39 +0000 Subject: Change in osmo-pcu[master]: vty: register libosmocore's FSM introspection commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22752 ) Change subject: vty: register libosmocore's FSM introspection commands ...................................................................... vty: register libosmocore's FSM introspection commands Change-Id: Id268e44de6eb873138f38720a61cabe589a5d2c8 --- M src/pcu_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/pcu_vty.c b/src/pcu_vty.c index b0d1ac6..6db8b05 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -1195,6 +1195,7 @@ logging_vty_add_cmds(); osmo_stats_vty_add_cmds(); osmo_talloc_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); install_node(&pcu_node, config_write_pcu); install_element(CONFIG_NODE, &cfg_pcu_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id268e44de6eb873138f38720a61cabe589a5d2c8 Gerrit-Change-Number: 22752 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 16:50:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 6 Feb 2021 16:50:44 +0000 Subject: Change in osmo-bts[master]: vty: register libosmocore's FSM introspection commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22753 ) Change subject: vty: register libosmocore's FSM introspection commands ...................................................................... vty: register libosmocore's FSM introspection commands Change-Id: I1eb203673259b455c339784719e288bac14145c0 --- M src/common/main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/main.c b/src/common/main.c index 16ffd1e..f54a5ca 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -291,6 +291,7 @@ logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); + osmo_fsm_vty_add_cmds(); bts_vty_init(tall_bts_ctx); e1inp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1eb203673259b455c339784719e288bac14145c0 Gerrit-Change-Number: 22753 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 17:12:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 6 Feb 2021 17:12:57 +0000 Subject: Change in osmo-bsc[master]: hide the "smscb-command" vty command; people should use osmo-cbc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22754 ) Change subject: hide the "smscb-command" vty command; people should use osmo-cbc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Gerrit-Change-Number: 22754 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 17:12:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 17:15:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 6 Feb 2021 17:15:56 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c at 209 PS1, Line 209: return 0; IMHO it would make a lot more sense to have a global counter for this instead, but this chnage as a first step is OK. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 17:15:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 17:19:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 6 Feb 2021 17:19:18 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/22756/1/src/ranap_msg_factory.c File src/ranap_msg_factory.c: https://gerrit.osmocom.org/c/osmo-iuh/+/22756/1/src/ranap_msg_factory.c at 205 PS1, Line 205: /*! \brief generate RANAP SECURITY MODE COMMAND message */ Now that masks are passed it would be great having more verbose description. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 17:19:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 19:02:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 6 Feb 2021 19:02:21 +0000 Subject: Change in osmo-bts[master]: oml: avoid redundant ntohl() / htonl() conversion In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22761 ) Change subject: oml: avoid redundant ntohl() / htonl() conversion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 Gerrit-Change-Number: 22761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 19:02:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 6 19:11:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 6 Feb 2021 19:11:07 +0000 Subject: Change in osmo-bts[master]: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22765 ) Change subject: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61 Gerrit-Change-Number: 22765 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 06 Feb 2021 19:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Feb 7 01:48:24 2021 From: admin at opensuse.org (OBS Notification) Date: Sun, 07 Feb 2021 01:48:24 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <601f4705d7622_65302aecf5a6a6008092fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 580s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 580s] [COMPILING libboard/qmod/source/card_pres.c] [ 580s] [COMPILING libboard/qmod/source/wwan_led.c] [ 580s] [COMPILING libboard/qmod/source/i2c.c] [ 581s] [COMPILING libboard/qmod/source/board_qmod.c] [ 581s] [COMPILING apps/dfu/main.c] [ 581s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 581s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 582s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 582s] Memory region Used Size Region Size %age Used [ 582s] rom: 16588 B 16 KB 101.25% [ 582s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 582s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 582s] collect2: error: ld returned 1 exit status [ 582s] % [ 582s] make[2]: *** [Makefile:234: flash] Error 1 [ 582s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 582s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 582s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 582s] dh_auto_build: error: make -j1 returned exit code 2 [ 582s] make: *** [debian/rules:16: build] Error 25 [ 582s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 582s] ### VM INTERACTION START ### [ 585s] [ 558.076374] sysrq: Power Off [ 585s] [ 558.109469] reboot: Power down [ 586s] ### VM INTERACTION END ### [ 586s] [ 586s] lamb01 failed "build simtrace2_0.7.0.70.657c.dsc" at Sun Feb 7 01:48:02 UTC 2021. [ 586s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Feb 7 01:50:07 2021 From: admin at opensuse.org (OBS Notification) Date: Sun, 07 Feb 2021 01:50:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <601f475c6f551_65302aecf5a6a60080959f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 254s] [COMPILING apps/dfu/main.c] [ 255s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 255s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 255s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 255s] Memory region Used Size Region Size %age Used [ 255s] rom: 16580 B 16 KB 101.20% [ 255s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 255s] collect2: error: ld returned 1 exit status [ 255s] % [ 255s] make[2]: *** [Makefile:234: flash] Error 1 [ 255s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 255s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 255s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 255s] dh_auto_build: error: make -j1 returned exit code 2 [ 255s] make: *** [debian/rules:16: build] Error 25 [ 255s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 256s] ### VM INTERACTION START ### [ 259s] [ 239.630951] sysrq: Power Off [ 259s] [ 239.642462] reboot: Power down [ 259s] ### VM INTERACTION END ### [ 259s] [ 259s] lamb03 failed "build simtrace2_0.7.0.70.657c.dsc" at Sun Feb 7 01:50:01 UTC 2021. [ 259s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:26:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:26:49 +0000 Subject: Change in osmo-bsc[master]: power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22767 ) Change subject: power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() ...................................................................... power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() Change-Id: I1c454f447d37cbc4d44b242dc4b2c62297ee3f67 Related: SYS#4918 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/22767/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 03b87b4..567b168 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5209,14 +5209,18 @@ { struct gsm_power_ctrl_params *params = vty->index; struct gsm_power_ctrl_meas_params *avg_params; + const struct gsm_bts *bts; -#if 0 - if (trx->bts->type != GSM_BTS_TYPE_OSMOBTS) { + if (params->dir == GSM_PWR_CTRL_DIR_UL) + bts = container_of(params, struct gsm_bts, ms_power_ctrl); + else + bts = container_of(params, struct gsm_bts, bs_power_ctrl); + + if (bts->type != GSM_BTS_TYPE_OSMOBTS) { vty_out(vty, "%% EWMA is an OsmoBTS specific algorithm, " "it's not usable for other BTS types%s", VTY_NEWLINE); return CMD_WARNING; } -#endif avg_params = POWER_CONTROL_MEAS_AVG_PARAMS(params); avg_params->algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1c454f447d37cbc4d44b242dc4b2c62297ee3f67 Gerrit-Change-Number: 22767 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:26:50 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:26:50 +0000 Subject: Change in osmo-bsc[master]: power_control: enable Uplink DPC by default if format is known References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22768 ) Change subject: power_control: enable Uplink DPC by default if format is known ...................................................................... power_control: enable Uplink DPC by default if format is known So far osmo-bsc would enable Uplink DPC (Dynamic Power Control) only for osmo-bts, and the 'static' mode for all other BTS models. This decision dates back to the time when ip.access specific encoding for dynamic power control parameters was not implemented, and the MS Power Parameters IE was sent empty in the RSL messages. Let's make a step forward by enabling Uplink DPC by default for all BTS models which declare the API for vendor-specific encoding of the power control parameters. Currently this includes osmo-bts and nanoBTS, but supporting ip.access specific format. Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Related: SYS#4918 --- M doc/manuals/chapters/power_control.adoc M src/osmo-bsc/bts.c 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/22768/1 diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc index 5de2b9c..dbe2d13 100644 --- a/doc/manuals/chapters/power_control.adoc +++ b/doc/manuals/chapters/power_control.adoc @@ -117,8 +117,10 @@ <2> Send both RSL MS/BS Power IE and vendor-specific MS/BS Power Parameters IE. <3> Do not send any power control IEs in RSL CHANnel ACTIVation messages. -By default, `static` mode is used for BS power control, while `dyn-bts` is used -for MS power control. Changing the mode at run-time would not affect already +By default, `static` mode is used for BS power control, while `dyn-bts` mode is +automatically enabled for MS power control if vendor-specific format of the power +control parameters (see above) is implemented for particular BTS model. Otherwise +`static` mode is used too. Changing the mode at run-time would not affect already established connections, only the new ones (check flag `l`). For BS power control, there is an additional parameter: diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index ac0e2af..628d301 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -522,9 +522,6 @@ switch (bts->type) { case GSM_BTS_TYPE_OSMOBTS: - /* Enable dynamic Uplink power control by default */ - bts->ms_power_ctrl.mode = GSM_PWR_CTRL_MODE_DYN_BTS; - /* fall-through */ case GSM_BTS_TYPE_NANOBTS: /* Set the default OML Stream ID to 0xff */ bts->oml_tei = 0xff; @@ -543,6 +540,10 @@ break; } + /* Enable dynamic Uplink power control by default (if supported) */ + if (model->power_ctrl_enc_rsl_params != NULL) + bts->ms_power_ctrl.mode = GSM_PWR_CTRL_MODE_DYN_BTS; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Gerrit-Change-Number: 22768 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:38:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:38:41 +0000 Subject: Change in osmo-bsc[master]: power_control: enable Uplink DPC by default if format is known In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22768 to look at the new patch set (#2). Change subject: power_control: enable Uplink DPC by default if format is known ...................................................................... power_control: enable Uplink DPC by default if format is known So far osmo-bsc would enable Uplink DPC (Dynamic Power Control) only for osmo-bts, and the 'static' mode for all other BTS models. This decision dates back to the time when ip.access specific encoding for dynamic power control parameters was not implemented, and the MS Power Parameters IE was sent empty in the RSL messages. Let's make a step forward by enabling Uplink DPC by default for all BTS models which declare the API for vendor-specific encoding of the power control parameters. Currently this includes osmo-bts and nanoBTS, both supporting ip.access specific format. Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Related: SYS#4918 --- M doc/manuals/chapters/power_control.adoc M src/osmo-bsc/bts.c 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/22768/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Gerrit-Change-Number: 22768 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:39:46 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:39:46 +0000 Subject: Change in osmo-bts[master]: oml: avoid redundant ntohl() / htonl() conversion In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22761 ) Change subject: oml: avoid redundant ntohl() / htonl() conversion ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 Gerrit-Change-Number: 22761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 07 Feb 2021 03:39:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:39:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:39:54 +0000 Subject: Change in osmo-bts[master]: oml: avoid redundant ntohl() / htonl() conversion In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22761 ) Change subject: oml: avoid redundant ntohl() / htonl() conversion ...................................................................... oml: avoid redundant ntohl() / htonl() conversion Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 --- M src/common/oml.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index ce76064..b7b86e3 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1384,7 +1384,6 @@ { struct e1inp_sign_link *oml_link = trx->bts->oml_link; uint16_t port = IPA_TCP_PORT_RSL; - uint32_t ip = get_signlink_remote_ip(oml_link); const char *trx_name = gsm_trx_name(trx); struct in_addr in; int rc; @@ -1392,13 +1391,15 @@ uint8_t stream_id = 0; if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) - ip = ntohl(tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP)); + in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); + else + in.s_addr = htonl(get_signlink_remote_ip(oml_link)); + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); - in.s_addr = htonl(ip); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", trx_name, inet_ntoa(in), port, stream_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2ae84dcd2987ff0cee5ca06ced06e65a30847a81 Gerrit-Change-Number: 22761 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:39:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:39:55 +0000 Subject: Change in osmo-bts[master]: oml: make 'struct tlv_parsed' pointer const where possible In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22762 ) Change subject: oml: make 'struct tlv_parsed' pointer const where possible ...................................................................... oml: make 'struct tlv_parsed' pointer const where possible Change-Id: I077f5aba50cc4d1a86feff527784de07394c5c0a --- M src/common/oml.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index b7b86e3..b1ae7b4 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1155,7 +1155,7 @@ * manufacturer related messages */ -static int oml_ipa_mo_set_attr_nse(void *obj, struct tlv_parsed *tp) +static int oml_ipa_mo_set_attr_nse(void *obj, const struct tlv_parsed *tp) { struct gsm_bts *bts = container_of(obj, struct gsm_bts, gprs.nse); @@ -1178,7 +1178,7 @@ return 0; } -static int oml_ipa_mo_set_attr_cell(void *obj, struct tlv_parsed *tp) +static int oml_ipa_mo_set_attr_cell(void *obj, const struct tlv_parsed *tp) { struct gsm_bts *bts = container_of(obj, struct gsm_bts, gprs.cell); struct gprs_rlc_cfg *rlcc = &bts->gprs.cell.rlc_cfg; @@ -1249,7 +1249,7 @@ } static int oml_ipa_mo_set_attr_nsvc(struct gsm_bts_gprs_nsvc *nsvc, - struct tlv_parsed *tp) + const struct tlv_parsed *tp) { if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_NSVCI, 2)) nsvc->nsvci = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_NSVCI)); @@ -1319,7 +1319,7 @@ } static int oml_ipa_mo_set_attr(struct gsm_bts *bts, const struct gsm_abis_mo *mo, - void *obj, struct tlv_parsed *tp) + void *obj, const struct tlv_parsed *tp) { int rc; @@ -1380,7 +1380,7 @@ } static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, - struct tlv_parsed *tp) + const struct tlv_parsed *tp) { struct e1inp_sign_link *oml_link = trx->bts->oml_link; uint16_t port = IPA_TCP_PORT_RSL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I077f5aba50cc4d1a86feff527784de07394c5c0a Gerrit-Change-Number: 22762 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 03:49:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 03:49:39 +0000 Subject: Change in osmo-bts[master]: oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22764 ) Change subject: oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() ...................................................................... oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() Both NM_ATT_IPACC_DST_IP and NM_ATT_IPACC_DST_IP_PORT are defined as TLV_TYPE_FIXED, and NM_ATT_IPACC_STREAM_ID is TLV_TYPE_TV, so the TLV parser already does check the length for us. Change-Id: I1e493e552bb22bb42bb196ce71214e28d23fd19e --- M src/common/oml.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/oml.c b/src/common/oml.c index b1ae7b4..9886fe4 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1390,14 +1390,14 @@ uint8_t stream_id = 0; - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); else in.s_addr = htonl(get_signlink_remote_ip(oml_link)); - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1e493e552bb22bb42bb196ce71214e28d23fd19e Gerrit-Change-Number: 22764 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 11:46:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 11:46:19 +0000 Subject: Change in libosmo-sccp[master]: xua_msg_add_data() Mark input argument as 'const' References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22769 ) Change subject: xua_msg_add_data() Mark input argument as 'const' ...................................................................... xua_msg_add_data() Mark input argument as 'const' We only read from it. Change-Id: I12c17273b9d64a084f59d91fc06ae1512d70855b --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/69/22769/1 diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index e912e02..090d84e 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -74,7 +74,7 @@ struct xua_msg *xua_msg_alloc(void); void xua_msg_free(struct xua_msg *msg); -int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, uint8_t *dat); +int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat); struct xua_msg_part *xua_msg_find_tag(const struct xua_msg *msg, uint16_t tag); int xua_msg_free_tag(struct xua_msg *xua, uint16_t tag); diff --git a/src/xua_msg.c b/src/xua_msg.c index 894bef9..10bedb4 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -59,7 +59,7 @@ } int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, - uint16_t len, uint8_t *dat) + uint16_t len, const uint8_t *dat) { struct xua_msg_part *part; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12c17273b9d64a084f59d91fc06ae1512d70855b Gerrit-Change-Number: 22769 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 11:46:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 11:46:20 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: const-ify input arguments to xua_*_get_u32() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22770 ) Change subject: xua_msg: const-ify input arguments to xua_*_get_u32() ...................................................................... xua_msg: const-ify input arguments to xua_*_get_u32() Change-Id: I517943bd11d73195de9418fb1c5d4151dab77873 --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/70/22770/1 diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index 090d84e..a2cdbf2 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -89,8 +89,8 @@ int msgb_t16l16vp_put(struct msgb *msg, uint16_t tag, uint16_t len, const uint8_t *data); int msgb_t16l16vp_put_u32(struct msgb *msg, uint16_t tag, uint32_t val); int xua_msg_add_u32(struct xua_msg *xua, uint16_t iei, uint32_t val); -uint32_t xua_msg_part_get_u32(struct xua_msg_part *part); -uint32_t xua_msg_get_u32(struct xua_msg *xua, uint16_t iei); +uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part); +uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei); void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt); int xua_msg_add_sccp_addr(struct xua_msg *xua, uint16_t iei, const struct osmo_sccp_addr *addr); diff --git a/src/xua_msg.c b/src/xua_msg.c index 10bedb4..79c358c 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -283,13 +283,13 @@ return xua_msg_add_data(xua, iei, sizeof(val_n), (uint8_t *) &val_n); } -uint32_t xua_msg_part_get_u32(struct xua_msg_part *part) +uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part) { OSMO_ASSERT(part->len >= 4); return ntohl(*(uint32_t *)part->dat); } -uint32_t xua_msg_get_u32(struct xua_msg *xua, uint16_t iei) +uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei) { struct xua_msg_part *part = xua_msg_find_tag(xua, iei); if (!part) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I517943bd11d73195de9418fb1c5d4151dab77873 Gerrit-Change-Number: 22770 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 11:46:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 11:46:20 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22771 ) Change subject: osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() ...................................................................... osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() Change-Id: Id23d90ffea855680cd7d4a16b89e652eed0cf39f --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/71/22771/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 2502407..2b4090e 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -344,8 +344,8 @@ int osmo_ss7_as_add_asp(struct osmo_ss7_as *as, const char *asp_name); int osmo_ss7_as_del_asp(struct osmo_ss7_as *as, const char *asp_name); void osmo_ss7_as_destroy(struct osmo_ss7_as *as); -bool osmo_ss7_as_has_asp(struct osmo_ss7_as *as, - struct osmo_ss7_asp *asp); +bool osmo_ss7_as_has_asp(const struct osmo_ss7_as *as, + const struct osmo_ss7_asp *asp); bool osmo_ss7_as_active(const struct osmo_ss7_as *as); bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt); void osmo_ss7_asp_disconnect(struct osmo_ss7_asp *asp); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 7639c41..2753063 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1056,8 +1056,8 @@ * \param[in] as Application Server in which to look for \ref asp * \param[in] asp Application Server Process to look for in \ref as * \returns true in case \ref asp is part of \ref as; false otherwise */ -bool osmo_ss7_as_has_asp(struct osmo_ss7_as *as, - struct osmo_ss7_asp *asp) +bool osmo_ss7_as_has_asp(const struct osmo_ss7_as *as, + const struct osmo_ss7_asp *asp) { unsigned int i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id23d90ffea855680cd7d4a16b89e652eed0cf39f Gerrit-Change-Number: 22771 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 11:46:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 11:46:21 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Add xua_msg*_get_str() to obtain string IE References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 ) Change subject: xua_msg: Add xua_msg*_get_str() to obtain string IE ...................................................................... xua_msg: Add xua_msg*_get_str() to obtain string IE We copy the contents to a static thread-local buffer to ensure zero termination of the string received by a remote entity. Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/72/22772/1 diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index a2cdbf2..329ba96 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -91,6 +91,8 @@ int xua_msg_add_u32(struct xua_msg *xua, uint16_t iei, uint32_t val); uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part); uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei); +const char *xua_msg_part_get_str(const struct xua_msg_part *part); +const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei); void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt); int xua_msg_add_sccp_addr(struct xua_msg *xua, uint16_t iei, const struct osmo_sccp_addr *addr); diff --git a/src/xua_msg.c b/src/xua_msg.c index 79c358c..42c580d 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -297,6 +297,29 @@ return xua_msg_part_get_u32(part); } +const char *xua_msg_part_get_str(const struct xua_msg_part *part) +{ + static char __thread buf[256]; + + if (part->len == 0) + return ""; + /* RFC3868 3.9.4: Length of the INFO String parameter is from 0 to 255 octets */ + if (part->len > 255) + return ""; + + memcpy(buf, part->dat, part->len); + buf[part->len] = '\0'; + return buf; +} + +const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei) +{ + struct xua_msg_part *part = xua_msg_find_tag(xua, iei); + if (!part) + return NULL; + return xua_msg_part_get_str(part); +} + void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt) { uint16_t *len_ptr; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 Gerrit-Change-Number: 22772 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 11:46:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 11:46:21 +0000 Subject: Change in libosmo-sccp[master]: m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22773 ) Change subject: m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup ...................................................................... m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup Let's factor-out the lookup of the AS into the separate function find_as_for_asp(). This enables us to reuse this code in upcoming support for SNM messages. Change-Id: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6 --- M src/m3ua.c 1 file changed, 42 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/73/22773/1 diff --git a/src/m3ua.c b/src/m3ua.c index 08a89b5..542777e 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -533,7 +533,7 @@ } /* if given ASP only has one AS, return that AS */ -static struct osmo_ss7_as *find_single_as_for_asp(struct osmo_ss7_asp *asp) +static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) { struct osmo_ss7_as *as, *as_found = NULL; @@ -549,11 +549,49 @@ return as_found; } +static int find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, + const struct xua_msg_part *rctx_ie) +{ + *as = NULL; + + if (rctx_ie) { + uint32_t rctx = xua_msg_part_get_u32(rctx_ie); + /* Use routing context IE to look up the AS for which the + * message was received. */ + *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); + if (!*as) { + LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n", + __func__, rctx); + return M3UA_ERR_INVAL_ROUT_CTX; + } + + /* Verify that this ASP is part of the AS. */ + if (!osmo_ss7_as_has_asp(*as, asp)) { + LOGPASP(asp, DLM3UA, LOGL_ERROR, + "%s(): This Application Server Process is not part of the AS %s " + "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx); + return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; + } + } else { + /* no explicit routing context; this only works if there is only one AS in the ASP */ + *as = find_single_as_for_asp(asp); + if (!*as) { + LOGPASP(asp, DLM3UA, LOGL_ERROR, + "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " + "identify the AS for this message\n", __func__); + return M3UA_ERR_INVAL_ROUT_CTX; + } + } + + return 0; +} + static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua) { struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); struct m3ua_data_hdr *dh; struct osmo_ss7_as *as; + int rc; LOGPASP(asp, DLM3UA, LOGL_DEBUG, "m3ua_rx_xfer\n"); @@ -565,34 +603,9 @@ return M3UA_ERR_UNSUPP_MSG_TYPE; } - if (rctx_ie) { - uint32_t rctx = xua_msg_part_get_u32(rctx_ie); - /* Use routing context IE to look up the AS for which the - * message was received. */ - as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); - if (!as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n", - __func__, rctx); - return M3UA_ERR_INVAL_ROUT_CTX; - } - - /* Verify that this ASP is part of the AS. */ - if (!osmo_ss7_as_has_asp(as, asp)) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): This Application Server Process is not part of the AS %s " - "resolved by routing context %u\n", __func__, (as)->cfg.name, rctx); - return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; - } - } else { - /* no explicit routing context; this only works if there is only one AS in the ASP */ - as = find_single_as_for_asp(asp); - if (!as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " - "identify the AS for this message\n", __func__); - return M3UA_ERR_INVAL_ROUT_CTX; - } - } + rc = find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; /* FIXME: check for AS state == ACTIVE */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6 Gerrit-Change-Number: 22773 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 12:46:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 12:46:48 +0000 Subject: Change in libosmo-sccp[master]: Introduce osmo_ss7_asp_get_log_subsys() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22774 ) Change subject: Introduce osmo_ss7_asp_get_log_subsys() ...................................................................... Introduce osmo_ss7_asp_get_log_subsys() This will allow us to write generic code that uses DLM3UA/DSUA depending on the ASP protocol. Change-Id: I7c015b3a2727deff4fc4e6f3bc7bdeeb57e86166 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/74/22774/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 2b4090e..a2263a2 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -451,6 +451,7 @@ int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp); int osmo_ss7_asp_use_default_lm(struct osmo_ss7_asp *asp, int log_level); bool osmo_ss7_asp_active(const struct osmo_ss7_asp *asp); +int osmo_ss7_asp_get_log_subsys(const struct osmo_ss7_asp *asp); /*! Weak function to handle payload for unknown/unsupported PPID or IPA StreamID. * This function can be overridden by application code to implement whatever handling diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 2753063..e549708 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -2258,6 +2258,19 @@ return 0; } +/*! Get the logging subsystem for a given ASP. Used by generic code. */ +int osmo_ss7_asp_get_log_subsys(const struct osmo_ss7_asp *asp) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + return DLM3UA; + case OSMO_SS7_ASP_PROT_SUA: + return DLSUA; + default: + return DLSS7; + } +} + /*! Register a call-back function for unknown SCTP PPID / IPA Stream ID */ void osmo_ss7_register_rx_unknown_cb(osmo_ss7_asp_rx_unknown_cb *cb) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7c015b3a2727deff4fc4e6f3bc7bdeeb57e86166 Gerrit-Change-Number: 22774 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 12:46:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 12:46:49 +0000 Subject: Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 ) Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() ...................................................................... m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() This way the function can be re-used by SUA. Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 --- M src/Makefile.am M src/m3ua.c M src/xua_internal.h A src/xua_shared.c 4 files changed, 108 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/75/22775/1 diff --git a/src/Makefile.am b/src/Makefile.am index 484886c..91084de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ - sccp_user.c sccp_types.c xua_rkm.c xua_default_lm_fsm.c \ + sccp_user.c sccp_types.c xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/m3ua.c b/src/m3ua.c index 542777e..bfb0c23 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -532,60 +532,6 @@ return data_hdr; } -/* if given ASP only has one AS, return that AS */ -static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as, *as_found = NULL; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - /* check if we already had found another AS within this ASP -> not unique */ - if (as_found) - return NULL; - as_found = as; - } - - return as_found; -} - -static int find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, - const struct xua_msg_part *rctx_ie) -{ - *as = NULL; - - if (rctx_ie) { - uint32_t rctx = xua_msg_part_get_u32(rctx_ie); - /* Use routing context IE to look up the AS for which the - * message was received. */ - *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); - if (!*as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n", - __func__, rctx); - return M3UA_ERR_INVAL_ROUT_CTX; - } - - /* Verify that this ASP is part of the AS. */ - if (!osmo_ss7_as_has_asp(*as, asp)) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): This Application Server Process is not part of the AS %s " - "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx); - return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; - } - } else { - /* no explicit routing context; this only works if there is only one AS in the ASP */ - *as = find_single_as_for_asp(asp); - if (!*as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " - "identify the AS for this message\n", __func__); - return M3UA_ERR_INVAL_ROUT_CTX; - } - } - - return 0; -} - static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua) { struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); @@ -603,7 +549,7 @@ return M3UA_ERR_UNSUPP_MSG_TYPE; } - rc = find_as_for_asp(&as, asp, rctx_ie); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); if (rc) return rc; diff --git a/src/xua_internal.h b/src/xua_internal.h index d836fae..65adfb6 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -69,6 +69,8 @@ int xua_as_transmit_msg(struct osmo_ss7_as *as, struct msgb *msg); +int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, + const struct xua_msg_part *rctx_ie); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); diff --git a/src/xua_shared.c b/src/xua_shared.c new file mode 100644 index 0000000..12514af --- /dev/null +++ b/src/xua_shared.c @@ -0,0 +1,104 @@ +/* Shared code between M3UA and SUA implementation */ + +/* (C) 2015-2021 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include +#include + +#include "xua_internal.h" + +/* if given ASP only has one AS, return that AS */ +static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as, *as_found = NULL; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + /* check if we already had found another AS within this ASP -> not unique */ + if (as_found) + return NULL; + as_found = as; + } + + return as_found; +} + +/* this is why we can use the M3UA constants below in a function shared between M3UA + SUA */ +osmo_static_assert(M3UA_ERR_INVAL_ROUT_CTX == SUA_ERR_INVAL_ROUT_CTX, _err_rctx); +osmo_static_assert(M3UA_ERR_NO_CONFGD_AS_FOR_ASP == SUA_ERR_NO_CONFGD_AS_FOR_ASP, _err_as_for_asp); + +/*! Find the AS for given ASP + optional routing context IE. + * if rctx_ie == NULL, we assume that this ASP is only part of a single AS; + * if rctx_ie is given, then we look-up the ASP based on the routing context, + * and verify that this ASP is part of it. + * \param[out] as caller-provided address-of-pointer to store the found AS + * \param[in] asp ASP for which we want to look-up the AS + * \param[in] rctx_ie routing context IE (may be NULL) to use for look-up + * \returns 0 in case of success; M3UA_ERR_* code in case of error. */ +int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, + const struct xua_msg_part *rctx_ie) +{ + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + *as = NULL; + + if (rctx_ie) { + uint32_t rctx = xua_msg_part_get_u32(rctx_ie); + /* Use routing context IE to look up the AS for which the + * message was received. */ + *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); + if (!*as) { + LOGPASP(asp, log_ss, LOGL_ERROR, "%s(): invalid routing context: %u\n", + __func__, rctx); + return M3UA_ERR_INVAL_ROUT_CTX; + } + + /* Verify that this ASP is part of the AS. */ + if (!osmo_ss7_as_has_asp(*as, asp)) { + LOGPASP(asp, log_ss, LOGL_ERROR, + "%s(): This Application Server Process is not part of the AS %s " + "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx); + return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; + } + } else { + /* no explicit routing context; this only works if there is only one AS in the ASP */ + *as = find_single_as_for_asp(asp); + if (!*as) { + LOGPASP(asp, log_ss, LOGL_ERROR, + "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " + "identify the AS for this message\n", __func__); + return M3UA_ERR_INVAL_ROUT_CTX; + } + } + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 12:46:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 12:46:49 +0000 Subject: Change in libosmo-sccp[master]: SUA: Verify routing context IE of incoming CL and CO messages References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 ) Change subject: SUA: Verify routing context IE of incoming CL and CO messages ...................................................................... SUA: Verify routing context IE of incoming CL and CO messages When receiving user-data (connectionless / connection-oriented), we must make sure that there either a) no routing context IE in the message, and only one AS within the ASP, or b) a valid routing context IE for an AS within the ASP This important input validation has been done in M3UA for a long time, but somehow never been implemented on the SUA side so far. Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 --- M src/sua.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/76/22776/1 diff --git a/src/sua.c b/src/sua.c index 4a98b9a..42d43e8 100644 --- a/src/sua.c +++ b/src/sua.c @@ -510,10 +510,17 @@ /* connectionless messages received from socket */ static int sua_rx_cl(struct osmo_ss7_asp *asp, struct xua_msg *xua) { + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); struct osmo_sccp_instance *inst = asp->inst->sccp; + struct osmo_ss7_as *as; + int rc; OSMO_ASSERT(xua->hdr.msg_class == SUA_MSGC_CL); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + switch (xua->hdr.msg_type) { case 0: /* Reserved, permitted by ETSI TS 101 592 5.2.3.2 */ case SUA_CL_CLDT: @@ -531,10 +538,17 @@ /* connection-oriented messages received from socket */ static int sua_rx_co(struct osmo_ss7_asp *asp, struct xua_msg *xua) { + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); struct osmo_sccp_instance *inst = asp->inst->sccp; + struct osmo_ss7_as *as; + int rc; OSMO_ASSERT(xua->hdr.msg_class == SUA_MSGC_CO); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + switch (xua->hdr.msg_type) { case 0: /* Reserved, permitted by ETSI TS 101 592 5.2.3.2 */ case SUA_CO_CORE: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 Gerrit-Change-Number: 22776 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 12:46:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 12:46:50 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... xua: Implement SNM availability/unavailability messaging M3UA and SUA have one sub-protocol called [S]SNM, thorugh which the SG informs the ASP about certain desetinations (point codes) becoming available (DAVA) or unavailable (DUNA) in the SS7 network. This patch adds support for * generating DAVA/DUAN on a SGP when the AS FSM changes to/from AS-ACTIVE * receiving DAVA/DUNA on an ASP and informing other "SG role" AS/ASP * processing DAUD from ASP received by SG, generating relate DAVA/DUNA responses Related: OS#2623 Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 --- M src/Makefile.am M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_internal.h A src/xua_snm.c 6 files changed, 551 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/77/22777/1 diff --git a/src/Makefile.am b/src/Makefile.am index 91084de..41d2a8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ sccp_user.c sccp_types.c xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ - osmo_ss7_vty.c sccp_vty.c ipa.c + xua_snm.c osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) diff --git a/src/m3ua.c b/src/m3ua.c index bfb0c23..86e4078 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -677,6 +677,8 @@ return 0; } +static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua); + /*! \brief process M3UA message received from socket * \param[in] asp Application Server Process receiving \ref msg * \param[in] msg received message buffer @@ -737,10 +739,7 @@ rc = m3ua_rx_rkm(asp, xua); break; case M3UA_MSGC_SNM: - /* FIXME */ - LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA " - "Message Class %u\n", xua->hdr.msg_class); - err = m3ua_gen_error_msg(M3UA_ERR_UNSUPP_MSG_CLASS, msg); + rc = m3ua_rx_snm(asp, xua); break; default: LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unknown M3UA " @@ -760,3 +759,147 @@ return rc; } + +/*********************************************************************** + * SSNM msg generation + ***********************************************************************/ + +/* 3.4.1 Destination Unavailable (DUNA) */ +static struct xua_msg *m3ua_encode_duna(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_DUNA); + xua->hdr.version = M3UA_VERSION; + if (rctx) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * 4, (const uint8_t *)rctx); + + xua_msg_add_data(xua, M3UA_IEI_AFFECTED_PC, num_aff_pc * 4, (const uint8_t *) aff_pc); + + if (info_string) { + xua_msg_add_data(xua, M3UA_IEI_INFO_STRING, + strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} + +/* 3.4.2 Destination Available (DAVA) */ +static struct xua_msg *m3ua_encode_dava(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = m3ua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + if (xua) + xua->hdr.msg_type = M3UA_SNM_DAVA; + return xua; +} + +#if 0 /* not used so far */ +/* 3.4.3 Destination Available (DAUD) */ +static struct xua_msg *m3ua_encode_daud(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = m3ua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + if (xua) + xua->hdr.msg_type = M3UA_SNM_DAUD; + return xua; +} +#endif + + +/* 3.4.5 Destination User Part Unavailable (DUPU) */ +//struct xua_msg *m3ua_encode_dupu() { } + +/*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] + * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] info_string optional information strng (can be NULL). + * \param[in] available are aff_pc now available (true) or unavailable (false */ +void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string, bool available) +{ + struct xua_msg *xua; + + if (available) + xua = m3ua_encode_dava(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + else + xua = m3ua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + + m3ua_tx_xua_asp(asp, xua); +} + +/* received SNM message on ASP side */ +static int m3ua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + int rc; + + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + + /* report those up the stack so both other ASPs and local SCCP users can be notified */ + switch (xua->hdr.msg_type) { + case M3UA_SNM_DUNA: + xua_snm_rx_duna(asp, as, xua); + break; + case M3UA_SNM_DAVA: + xua_snm_rx_dava(asp, as, xua); + break; + case M3UA_SNM_DUPU: + case M3UA_SNM_SCON: + case M3UA_SNM_DRST: + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA SNM message type %u\n", + xua->hdr.msg_type); + /* silently ignore those to not confuse the sender */ + break; + default: + return M3UA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +/* received SNM message on SG side */ +static int m3ua_rx_snm_sg(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + switch (xua->hdr.msg_type) { + case M3UA_SNM_DAUD: /* Audit: ASP inquires about availability of Point Codes */ + xua_snm_rx_daud(asp, xua); + break; + default: + return M3UA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + /* SNM only permitted in ACTIVE state */ + if (asp->fi->state != XUA_ASP_S_ACTIVE) { + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received M3UA SNM while ASP in state %s\n", + osmo_fsm_inst_state_name(asp->fi)); + return M3UA_ERR_UNEXPECTED_MSG; + } + + switch (asp->cfg.role) { + case OSMO_SS7_ASP_ROLE_SG: + return m3ua_rx_snm_sg(asp, xua); + case OSMO_SS7_ASP_ROLE_ASP: + return m3ua_rx_snm_asp(asp, xua); + default: + return M3UA_ERR_UNSUPP_MSG_CLASS; + } +} diff --git a/src/sua.c b/src/sua.c index 42d43e8..064fd5a 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1,6 +1,6 @@ /* Minimal implementation of RFC 3868 - SCCP User Adaptation Layer */ -/* (C) 2015-2017 by Harald Welte +/* (C) 2015-2021 by Harald Welte * All Rights Reserved * * SPDX-License-Identifier: GPL-2.0+ @@ -661,6 +661,8 @@ return 0; } +static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua); + /*! \brief process SUA message received from socket * \param[in] asp Application Server Process receiving \ref msg * \param[in] msg received message buffer @@ -736,6 +738,8 @@ rc = sua_rx_mgmt(asp, xua); break; case SUA_MSGC_SNM: + rc = sua_rx_snm(asp, xua); + break; case SUA_MSGC_RKM: /* FIXME */ LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA " @@ -760,3 +764,149 @@ return rc; } + +/*********************************************************************** + * SSNM msg generation + ***********************************************************************/ + +/* 3.4.1 Destination Unavailable (DUNA) */ +static struct xua_msg *sua_encode_duna(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *ssn, const uint32_t *smi, const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_DUNA); + xua->hdr.version = SUA_VERSION; + if (rctx) + xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * 4, (const uint8_t *)rctx); + + xua_msg_add_data(xua, SUA_IEI_AFFECTED_PC, num_aff_pc * 4, (const uint8_t *) aff_pc); + + if (ssn) + xua_msg_add_u32(xua, SUA_IEI_SSN, *ssn); + + if (smi) + xua_msg_add_u32(xua, SUA_IEI_SSN, *smi); + + if (info_string) { + xua_msg_add_data(xua, SUA_IEI_INFO_STRING, + strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} + +/* 3.4.2 Destination Available (DAVA) */ +static struct xua_msg *sua_encode_dava(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *ssn, const uint32_t *smi, const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = sua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, ssn, smi, info_string); + if (xua) + xua->hdr.msg_type = SUA_SNM_DAVA; + return xua; +} + +#if 0 /* not used so far */ +/* 3.4.3 Destination Available (DAUD) */ +static struct xua_msg *sua_encode_daud(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *ssn, const uint32_t *smi, const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = sua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, ssn, smi, info_string); + if (xua) + xua->hdr.msg_type = SUA_SNM_DAUD; + return xua; +} +#endif + + +/*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] + * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] info_string optional information strng (can be NULL). + * \param[in] available are aff_pc now available (true) or unavailable (false */ +void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string, bool available) +{ + struct xua_msg *xua; + + if (available) + xua = sua_encode_dava(rctx, num_rctx, aff_pc, num_aff_pc, NULL, NULL, info_string); + else + xua = sua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, NULL, NULL, info_string); + + sua_tx_xua_asp(asp, xua); +} + +/* received SNM message on ASP side */ +static int sua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); + int rc; + + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + + switch (xua->hdr.msg_type) { + case SUA_SNM_DUNA: + xua_snm_rx_duna(asp, as, xua); + break; + case SUA_SNM_DAVA: + xua_snm_rx_dava(asp, as, xua); + break; + case SUA_SNM_DUPU: + case SUA_SNM_SCON: + case SUA_SNM_DRST: + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA SNM message type %u\n", + xua->hdr.msg_type); + /* silently ignore those to not confuse the sender */ + break; + default: + return SUA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +/* received SNM message on SG side */ +static int sua_rx_snm_sg(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + switch (xua->hdr.msg_type) { + case SUA_SNM_DAUD: /* Audit: ASP inquires about availability of Point Codes */ + xua_snm_rx_daud(asp, xua); + break; + default: + return SUA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + /* SNM only permitted in ACTIVE state */ + if (asp->fi->state != XUA_ASP_S_ACTIVE) { + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received M3UA SNM while ASP in state %s\n", + osmo_fsm_inst_state_name(asp->fi)); + return SUA_ERR_UNEXPECTED_MSG; + } + + switch (asp->cfg.role) { + case OSMO_SS7_ASP_ROLE_SG: + return sua_rx_snm_sg(asp, xua); + case OSMO_SS7_ASP_ROLE_ASP: + return sua_rx_snm_asp(asp, xua); + default: + return SUA_ERR_UNSUPP_MSG_CLASS; + } +} diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 731504b..7c791cf 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -75,6 +75,26 @@ return sent; } +/* determine which role (SG/ASP/IPSP) we operate in */ +static int get_local_role(struct osmo_ss7_as *as) +{ + unsigned int i; + + /* this is a bit tricky. "osmo_ss7_as" has no configuation of a role, + * only the ASPs have. As they all must be of the same role, let's simply + * find the first one and return its role */ + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + struct osmo_ss7_asp *asp = as->cfg.asps[i]; + + if (!asp) + continue; + + return asp->cfg.role; + } + /* we don't have any ASPs in this AS? Strange */ + return -1; +} + static struct osmo_ss7_asp *xua_as_select_asp_override(struct osmo_ss7_as *as) { struct osmo_ss7_asp *asp; @@ -318,6 +338,17 @@ /* TODO: ASP-Id of ASP triggering this state change */ as_notify_all_asp(xafp->as, &npar); + + /* only if we are the SG, we must start broadcasting availability information + * to everyone else */ + if (get_local_role(xafp->as) == OSMO_SS7_ASP_ROLE_SG) { + /* advertise availability of the routing key to others */ + uint32_t aff_pc = htonl(as->cfg.routing_key.pc); + if (old_state != XUA_AS_S_ACTIVE && fi->state == XUA_AS_S_ACTIVE) + xua_snm_pc_available(as, &aff_pc, 1, NULL, true); + else if (old_state == XUA_AS_S_ACTIVE && fi->state != XUA_AS_S_ACTIVE) + xua_snm_pc_available(as, &aff_pc, 1, NULL, false); + } }; static void xua_as_fsm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/xua_internal.h b/src/xua_internal.h index 65adfb6..8c0e5d3 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -18,10 +18,19 @@ int sua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); int sua_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); +void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string, bool available); struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua); int m3ua_hmdc_rx_from_l2(struct osmo_ss7_instance *inst, struct xua_msg *xua); int m3ua_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); +void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string, bool available); +void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua); +void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); +void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); int m3ua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); struct msgb *m3ua_msgb_alloc(const char *name); @@ -59,6 +68,9 @@ enum osmo_xlm_prim_type prim_type, enum osmo_prim_operation op); +void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, + unsigned int num_aff_pc, const char *info_str, bool available); + extern struct osmo_fsm xua_default_lm_fsm; extern const struct value_string m3ua_rkm_reg_status_vals[]; extern const struct value_string m3ua_rkm_dereg_status_vals[]; diff --git a/src/xua_snm.c b/src/xua_snm.c new file mode 100644 index 0000000..1e9b5ad --- /dev/null +++ b/src/xua_snm.c @@ -0,0 +1,209 @@ +/* M3UA/SUA [S]SNM Handling */ + +/* (C) 2021 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include + +#include +#include +#include + +#include "xua_internal.h" + +/* we can share this code between M3UA and SUA as the below conditions are true */ +osmo_static_assert(M3UA_SNM_DUNA == SUA_SNM_DUNA, _sa_duna); +osmo_static_assert(M3UA_SNM_DAVA == SUA_SNM_DAVA, _sa_dava); +osmo_static_assert(M3UA_SNM_DAUD == SUA_SNM_DAUD, _sa_dava); +osmo_static_assert(M3UA_IEI_AFFECTED_PC == SUA_IEI_AFFECTED_PC, _sa_aff_pc); +osmo_static_assert(M3UA_IEI_ROUTE_CTX == SUA_IEI_ROUTE_CTX, _sa_rctx); +osmo_static_assert(M3UA_IEI_INFO_STRING == SUA_IEI_INFO_STRING, _sa_inf_str); + +static const char *format_affected_pcs_c(void *ctx, const struct osmo_ss7_instance *s7i, + const struct xua_msg_part *ie_aff_pc) +{ + const uint32_t *aff_pc = (const uint32_t *) ie_aff_pc->dat; + unsigned int num_aff_pc = ie_aff_pc->len / sizeof(uint32_t); + char *out = talloc_strdup(ctx, ""); + int i; + + for (i = 0; i < num_aff_pc; i++) { + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + + /* append point code + mask */ + out = talloc_asprintf_append(out, "%s%s/%u, ", i == 0 ? "" : ", ", + osmo_ss7_pointcode_print(s7i, pc), mask); + } + return out; +} + +/* obtain all routing contexts (in network byte order) that exist within the given ASP */ +static unsigned int get_all_rctx_for_asp(uint32_t *rctx, unsigned int rctx_size, + struct osmo_ss7_asp *asp, struct osmo_ss7_as *excl_as) +{ + unsigned int count = 0; + struct osmo_ss7_as *as; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (as == excl_as) + continue; + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + if (as->cfg.routing_key.context == 0) + continue; + rctx[count] = htonl(as->cfg.routing_key.context); + count++; + } + return count; +} + +static void xua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_str, bool available) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); + break; + default: + break; + } +} + +/* advertise availability of point codes (with masks) */ +void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, + unsigned int num_aff_pc, const char *info_str, bool available) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send DAVA/DUNA if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the as that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + xua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); + } +} + +/* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ +void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + struct osmo_ss7_instance *s7i = asp->inst; + unsigned int num_aff_pc; + unsigned int num_rctx; + const uint32_t *aff_pc; + uint32_t rctx[32]; + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + int i; + + OSMO_ASSERT(ie_aff_pc); + aff_pc = (const uint32_t *) ie_aff_pc->dat; + num_aff_pc = ie_aff_pc->len / sizeof(uint32_t); + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, NULL); + + LOGPASP(asp, log_ss, LOGL_INFO, "Rx DAUD(%s) for %s\n", info_str ? info_str : "", + format_affected_pcs_c(OTC_SELECT, asp->inst, ie_aff_pc)); + + /* iterate over list of point codes, generate DAVA/DUPU */ + for (i = 0; i < num_aff_pc; i++) { + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + bool is_available = false; + + if (mask == 0) { + /* one single point code */ + + /* FIXME: don't just check for a route; but also check if the route is "active" */ + if (osmo_ss7_route_lookup(s7i, pc)) + is_available = true; + + xua_tx_snm_available(asp, rctx, num_rctx, &aff_pc[i], 1, "Response to DAUD", + is_available); + } else { + /* TODO: wildcard match */ + LOGPASP(asp, log_ss, LOGL_NOTICE, "DAUD with wildcard match not supported yet\n"); + } + } +} + +/* an incoming xUA DUNA was received from a remote SG */ +void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + /* TODO: should our processing depend on he RCTX included? I somehow don't think so */ + //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + + OSMO_ASSERT(ie_aff_pc); + + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + return; + + LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUNA(%s) for %s\n", info_str ? info_str : "", + format_affected_pcs_c(OTC_SELECT, asp->inst, ie_aff_pc)); + + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, false); +} + +/* an incoming xUA DAVA was received from a remote SG */ +void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + /* TODO: should our processing depend on he RCTX included? I somehow don't think so */ + //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + + OSMO_ASSERT(ie_aff_pc); + + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + return; + + LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DAVA(%s) for %s\n", info_str ? info_str : "", + format_affected_pcs_c(OTC_SELECT, asp->inst, ie_aff_pc)); + + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, true); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 12:46:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 12:46:50 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... sccp: Notify users of point code available/unavailable * add N-PCSTATE.ind and N-STATE.ind definitions to SCCP user SAP * add minimal SCMG (SCCP Management) and LBCS (Local Broadcast) * generate MTP-PAUSE.ind/MTP-RESUME.ind based on received xUA DUNA/DAVA * generate N-PCSTATE.ind towards the local SCCP users Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Related: OS#2623, OS#3403, OS#4701 --- M include/osmocom/sigtran/sccp_sap.h M src/Makefile.am M src/sccp_internal.h A src/sccp_lbcs.c A src/sccp_scmg.c M src/xua_snm.c 6 files changed, 232 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/78/22778/1 diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index de9b24c..76700f3 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -137,6 +137,21 @@ OSMO_SCCP_SSN_BSSAP = 254, }; +/* Q.711 6.3.2.2.5 Signalling point status */ +enum osmo_sccp_sp_status { + OSMO_SCCP_SP_S_INACCESSIBLE = 1, + OSMO_SCCP_SP_S_CONGESTED = 2, + OSMO_SCCP_SP_S_ACCESSIBLE = 3, +}; +/* Q.711 6.3.2.2.6 Remote SCCP status */ +enum osmo_sccp_rem_sccp_status { + OSMO_SCCP_REM_SCCP_S_AVAILABLE = 1, + OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN = 2, + OSMO_SCCP_REM_SCCP_S_UNEQUIPPED = 3, + OSMO_SCCP_REM_SCCP_S_INACCESSIBLE = 4, + OSMO_SCCP_REM_SCCP_S_CONGESTED = 5, +}; + /* legacy shim for name change */ #define OSMO_SCCP_SSN_SMLC_BSSAP OSMO_SCCP_SSN_SMLC_BSSAP_LE @@ -226,6 +241,21 @@ /* user data */ }; +/* OSMO_SCU_PRIM_N_STATE */ +struct osmo_scu_state_param { + uint32_t affected_ssn; + bool user_in_service; /* true: UIS; false: UOS */ + uint32_t ssn_multiplicity_ind; +}; + +/* OSMO_ASCU_PRIM_N_PCSTATE */ +struct osmo_scu_pcstate_param { + uint32_t affected_pc; + uint32_t restricted_importance_level; + enum osmo_sccp_sp_status sp_status; + enum osmo_sccp_rem_sccp_status remote_sccp_status; +}; + struct osmo_scu_prim { struct osmo_prim_hdr oph; union { @@ -235,6 +265,8 @@ struct osmo_scu_reset_param reset; struct osmo_scu_unitdata_param unitdata; struct osmo_scu_notice_param notice; + struct osmo_scu_state_param state; + struct osmo_scu_pcstate_param pcstate; } u; }; diff --git a/src/Makefile.am b/src/Makefile.am index 41d2a8d..4558810 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,8 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ - sccp_user.c sccp_types.c xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ + sccp_user.c sccp_types.c sccp_lbcs.c sccp_scmg.c \ + xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ xua_snm.c osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 98f6d37..b5a10f5 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -129,3 +129,13 @@ bool default_if_unset); void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst); + +/* Local Broadcast (LBCS) */ +void sccp_lbcs_local_bcast_pcstate(struct osmo_sccp_instance *inst, + const struct osmo_scu_pcstate_param *pcstate); +void sccp_lbcs_local_bcast_state(struct osmo_sccp_instance *inst, + const struct osmo_scu_state_param *state); + +/* SCCP MAnagement (SCMG) */ +void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); +void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); diff --git a/src/sccp_lbcs.c b/src/sccp_lbcs.c new file mode 100644 index 0000000..3aa4f7a --- /dev/null +++ b/src/sccp_lbcs.c @@ -0,0 +1,68 @@ +/* SCCP Local Broadcast (LBCS) according to ITU-T Q.713/Q.714 */ + +/* (C) 2021 by Harald Welte + * All Rights reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "xua_internal.h" +#include "sccp_internal.h" + +/* perform a "local broadcast" of a N-PCSTATE.ind */ +void sccp_lbcs_local_bcast_pcstate(struct osmo_sccp_instance *inst, + const struct osmo_scu_pcstate_param *pcstate) +{ + struct osmo_sccp_user *scu; + + llist_for_each_entry(scu, &inst->users, list) { + struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_PCSTATE, + PRIM_OP_INDICATION, upmsg); + prim->u.pcstate = *pcstate; + sccp_user_prim_up(scu, prim); + } +} + +/* perform a "local broadcast" of a N-STATE.ind */ +void sccp_lbcs_local_bcast_state(struct osmo_sccp_instance *inst, + const struct osmo_scu_state_param *state) +{ + struct osmo_sccp_user *scu; + + llist_for_each_entry(scu, &inst->users, list) { + struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_STATE, + PRIM_OP_INDICATION, upmsg); + prim->u.state = *state; + sccp_user_prim_up(scu, prim); + } +} diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c new file mode 100644 index 0000000..4a8ccf6 --- /dev/null +++ b/src/sccp_scmg.c @@ -0,0 +1,83 @@ +/* SCCP Management (SCMG) according to ITU-T Q.713/Q.714 */ + +/* (C) 2021 by Harald Welte + * All Rights reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "xua_internal.h" +#include "sccp_internal.h" + +/*! brief MTP -> SNM (MTP-PAUSE.ind) - inability to providing MTP service Q.714 5.2.2 */ +void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc) +{ + struct osmo_scu_pcstate_param pcstate; + /* 1) Informs the translation function to update the translation tables. */ + /* 2) SCCP management marks as "prohibited" the status of the remote signalling point, the + remote SCCP and each subsystem at the remote signalling point. */ + /* 3) Discontinues all subsystem status tests (including SSN = 1) */ + + /* 4) local broadcast of "user-out-of-service" for each SSN at that dest + * [this would require us to track SSNs at each PC, which we don't] */ + + /* 5) local broadcast of "signaling point inaccessible" */ + /* 6) local broadcast of "remote SCCP unavailable" */ + pcstate = (struct osmo_scu_pcstate_param) { + .affected_pc = dpc, + .restricted_importance_level = 0, + .sp_status = OSMO_SCCP_SP_S_INACCESSIBLE, + .remote_sccp_status = OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN, + }; + sccp_lbcs_local_bcast_pcstate(inst, &pcstate); +} + +/*! brief MTP -> SNM (MTP-RESUME.ind) - ability of providing the MTP service Q.714 5.2.3 */ +void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc) +{ + struct osmo_scu_pcstate_param pcstate; + /* 1) Sets the congestion state of that signalling point */ + /* 2) Instructs the translation function to update the translation tables. */ + /* 3) Marks as "allowed" the status of that destination, and the SCCP */ + /* 4) - not applicable */ + /* 5) Marks as "allowed" the status of remote subsystems */ + + /* 6) local broadcast of "signalling point accessible" */ + /* 7) local broadcast of "remote SCCP accessible" */ + pcstate = (struct osmo_scu_pcstate_param) { + .affected_pc = dpc, + .restricted_importance_level = 0, + .sp_status = OSMO_SCCP_SP_S_ACCESSIBLE, + .remote_sccp_status = OSMO_SCCP_REM_SCCP_S_AVAILABLE, + }; + sccp_lbcs_local_bcast_pcstate(inst, &pcstate); + + /* 8) local broadcast of "user-in-service" + * [this would require us to track SSNs at each PC, which we don't] */ +} diff --git a/src/xua_snm.c b/src/xua_snm.c index 1e9b5ad..00c4de8 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -31,6 +31,7 @@ #include #include "xua_internal.h" +#include "sccp_internal.h" /* we can share this code between M3UA and SUA as the below conditions are true */ osmo_static_assert(M3UA_SNM_DUNA == SUA_SNM_DUNA, _sa_duna); @@ -96,6 +97,37 @@ } } +/* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ +static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, + const uint32_t *aff_pc, unsigned int num_aff_pc, + bool available) +{ + int i; + for (i = 0; i < num_aff_pc; i++) { + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + + if (!mask) { + if (available) + sccp_scmg_rx_mtp_resume(sccp, pc); + else + sccp_scmg_rx_mtp_pause(sccp, pc); + } else { + /* we have to send one MTP primitive for each individual point + * code within that mask */ + uint32_t maskbits = (1 << mask) - 1; + uint32_t fullpc; + for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) { + if (available) + sccp_scmg_rx_mtp_resume(sccp, pc); + else + sccp_scmg_rx_mtp_pause(sccp, pc); + } + } + } +} + /* advertise availability of point codes (with masks) */ void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str, bool available) @@ -105,6 +137,11 @@ uint32_t rctx[32]; unsigned int num_rctx; + /* inform local users via a MTP-{PAUSE, RESUME} primitive */ + if (s7i->sccp) + xua_snm_pc_available_to_sccp(s7i->sccp, aff_pc, num_aff_pc, available); + + /* inform remote ASPs via DUNA/DAVA */ llist_for_each_entry(asp, &s7i->asp_list, list) { /* SSNM is only permitted for ASPs in ACTIVE state */ if (!osmo_ss7_asp_active(asp)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 16:33:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 16:33:36 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22771 ) Change subject: osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id23d90ffea855680cd7d4a16b89e652eed0cf39f Gerrit-Change-Number: 22771 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 07 Feb 2021 16:33:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 16:34:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 16:34:15 +0000 Subject: Change in libosmo-sccp[master]: xua_msg_add_data() Mark input argument as 'const' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22769 ) Change subject: xua_msg_add_data() Mark input argument as 'const' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12c17273b9d64a084f59d91fc06ae1512d70855b Gerrit-Change-Number: 22769 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 07 Feb 2021 16:34:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 16:34:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 16:34:28 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: const-ify input arguments to xua_*_get_u32() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22770 ) Change subject: xua_msg: const-ify input arguments to xua_*_get_u32() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I517943bd11d73195de9418fb1c5d4151dab77873 Gerrit-Change-Number: 22770 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 07 Feb 2021 16:34:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 16:34:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 16:34:35 +0000 Subject: Change in libosmo-sccp[master]: xua_msg_add_data() Mark input argument as 'const' In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22769 ) Change subject: xua_msg_add_data() Mark input argument as 'const' ...................................................................... xua_msg_add_data() Mark input argument as 'const' We only read from it. Change-Id: I12c17273b9d64a084f59d91fc06ae1512d70855b --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index e912e02..090d84e 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -74,7 +74,7 @@ struct xua_msg *xua_msg_alloc(void); void xua_msg_free(struct xua_msg *msg); -int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, uint8_t *dat); +int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat); struct xua_msg_part *xua_msg_find_tag(const struct xua_msg *msg, uint16_t tag); int xua_msg_free_tag(struct xua_msg *xua, uint16_t tag); diff --git a/src/xua_msg.c b/src/xua_msg.c index 894bef9..10bedb4 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -59,7 +59,7 @@ } int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, - uint16_t len, uint8_t *dat) + uint16_t len, const uint8_t *dat) { struct xua_msg_part *part; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12c17273b9d64a084f59d91fc06ae1512d70855b Gerrit-Change-Number: 22769 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 16:34:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 16:34:36 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: const-ify input arguments to xua_*_get_u32() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22770 ) Change subject: xua_msg: const-ify input arguments to xua_*_get_u32() ...................................................................... xua_msg: const-ify input arguments to xua_*_get_u32() Change-Id: I517943bd11d73195de9418fb1c5d4151dab77873 --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index 090d84e..a2cdbf2 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -89,8 +89,8 @@ int msgb_t16l16vp_put(struct msgb *msg, uint16_t tag, uint16_t len, const uint8_t *data); int msgb_t16l16vp_put_u32(struct msgb *msg, uint16_t tag, uint32_t val); int xua_msg_add_u32(struct xua_msg *xua, uint16_t iei, uint32_t val); -uint32_t xua_msg_part_get_u32(struct xua_msg_part *part); -uint32_t xua_msg_get_u32(struct xua_msg *xua, uint16_t iei); +uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part); +uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei); void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt); int xua_msg_add_sccp_addr(struct xua_msg *xua, uint16_t iei, const struct osmo_sccp_addr *addr); diff --git a/src/xua_msg.c b/src/xua_msg.c index 10bedb4..79c358c 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -283,13 +283,13 @@ return xua_msg_add_data(xua, iei, sizeof(val_n), (uint8_t *) &val_n); } -uint32_t xua_msg_part_get_u32(struct xua_msg_part *part) +uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part) { OSMO_ASSERT(part->len >= 4); return ntohl(*(uint32_t *)part->dat); } -uint32_t xua_msg_get_u32(struct xua_msg *xua, uint16_t iei) +uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei) { struct xua_msg_part *part = xua_msg_find_tag(xua, iei); if (!part) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I517943bd11d73195de9418fb1c5d4151dab77873 Gerrit-Change-Number: 22770 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 16:34:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 16:34:36 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22771 ) Change subject: osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() ...................................................................... osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() Change-Id: Id23d90ffea855680cd7d4a16b89e652eed0cf39f --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 2502407..2b4090e 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -344,8 +344,8 @@ int osmo_ss7_as_add_asp(struct osmo_ss7_as *as, const char *asp_name); int osmo_ss7_as_del_asp(struct osmo_ss7_as *as, const char *asp_name); void osmo_ss7_as_destroy(struct osmo_ss7_as *as); -bool osmo_ss7_as_has_asp(struct osmo_ss7_as *as, - struct osmo_ss7_asp *asp); +bool osmo_ss7_as_has_asp(const struct osmo_ss7_as *as, + const struct osmo_ss7_asp *asp); bool osmo_ss7_as_active(const struct osmo_ss7_as *as); bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt); void osmo_ss7_asp_disconnect(struct osmo_ss7_asp *asp); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 7639c41..2753063 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1056,8 +1056,8 @@ * \param[in] as Application Server in which to look for \ref asp * \param[in] asp Application Server Process to look for in \ref as * \returns true in case \ref asp is part of \ref as; false otherwise */ -bool osmo_ss7_as_has_asp(struct osmo_ss7_as *as, - struct osmo_ss7_asp *asp) +bool osmo_ss7_as_has_asp(const struct osmo_ss7_as *as, + const struct osmo_ss7_asp *asp) { unsigned int i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id23d90ffea855680cd7d4a16b89e652eed0cf39f Gerrit-Change-Number: 22771 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 17:19:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 17:19:56 +0000 Subject: Change in osmo-bsc[master]: power_control: make P_CON_INTERVAL parameter configurable References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22779 ) Change subject: power_control: make P_CON_INTERVAL parameter configurable ...................................................................... power_control: make P_CON_INTERVAL parameter configurable Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Related: SYS#4918 --- M doc/manuals/chapters/power_control.adoc M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M tests/power_ctrl.vty 5 files changed, 73 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/22779/1 diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc index dbe2d13..c7da7f9 100644 --- a/doc/manuals/chapters/power_control.adoc +++ b/doc/manuals/chapters/power_control.adoc @@ -88,6 +88,7 @@ ... . l. mode (static|dyn-bts) [reset] . l. bs-power (static|dyn-max) <0-30> + . lv con-interval <0-31> . lv step-size inc <2-6> red <2-4> . lv rxlev-thresh lower <0-63> upper <0-63> . lv rxqual-thresh lower <0-7> upper <0-7> @@ -135,6 +136,27 @@ and a fixed power reduction value in `static` mode. In the later case, no attenuation (0 dB) is applied by default (full power). +==== Power control interval + +Having requested a transmit power level, the MS/BS power control loop may optionally +by suspended for a certain number of SACCH multiframes defined by VTY parameter +`con-interval`. Given that SACCH is relatively slow and transmission of a data block +takes 480 ms, suspension allows an observation of the effect of one power control +decision before initiating the next one. + +---- +OsmoBSC(config-bs-power-ctrl)# con-interval ? + <0-31> P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds) +---- + +By default, the suspension interval is set to 0 for both MS/BS power control loops, +therefore the power control decision is taken every 480 ms (one SACCH block period). +Setting `con-interval` to 1 increases the interval to 960 ms, so basically every +second Uplink SACCH block is skipped; value 2 corresponds to the interval of +1920 ms, so 3/4 received SACCH blocks are skipped. + +3GPP TS 45.008 briefly mentiones this parameter in table A.1 (P_Con_INTERVAL). + ==== Power change step size In order to slow down the reactivity of the power control loop and thus make it more @@ -302,7 +324,6 @@ <4> Osmocom specific EWMA is applied to RxQual values with smoothing factor = 50% (beta=0.5). <5> RxQual: Hreqave and Hreqt values: 2 out of 3 SACCH blocks produce an averaged measurement. -// TODO: Document P_Con_INTERVAL (not implemented yet) // TODO: Document other power control parameters: // OsmoBSC(config-net-bts)# ms max power <0-40> // OsmoBSC(config-net-bts-trx)# max_power_red <0-100> diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index edfae26..0ce9b12 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1346,6 +1346,9 @@ uint8_t inc_step_size_db; /* increasing direction */ uint8_t red_step_size_db; /* reducing direction */ + /* Minimum interval between power level changes */ + uint8_t con_interval; /* 1 step is 2 SACCH periods */ + /* Measurement averaging parameters for RxLev & RxQual */ struct gsm_power_ctrl_meas_params rxqual_meas; struct gsm_power_ctrl_meas_params rxlev_meas; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 567b168..00a80c6 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -957,6 +957,8 @@ if (cp->dir == GSM_PWR_CTRL_DIR_DL) cfg_out(" bs-power dyn-max %u%s", cp->bs_power_max_db, VTY_NEWLINE); + if (cp->con_interval > 0) + cfg_out(" con-interval %u%s", cp->con_interval, VTY_NEWLINE); cfg_out(" step-size inc %u red %u%s", cp->inc_step_size_db, cp->red_step_size_db, VTY_NEWLINE); @@ -4938,6 +4940,21 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_power_ctrl_con_interval, + cfg_power_ctrl_con_interval_cmd, + X(BSC_VTY_ATTR_VENDOR_SPECIFIC) | + X(BSC_VTY_ATTR_NEW_LCHAN), + "con-interval <0-31>", + "Set minimum interval between power level changes (for dynamic mode)\n" + "P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds)\n") +{ + struct gsm_power_ctrl_params *params = vty->index; + + params->con_interval = atoi(argv[0]); + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_power_ctrl_step_size, cfg_power_ctrl_step_size_cmd, X(BSC_VTY_ATTR_VENDOR_SPECIFIC) | @@ -7742,6 +7759,7 @@ install_node(&power_ctrl_node, dummy_config_write); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_mode_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_bs_power_cmd); + install_element(POWER_CTRL_NODE, &cfg_power_ctrl_con_interval_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_step_size_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxlev_thresh_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxqual_thresh_cmd); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 7076908..4edcb24 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -896,8 +896,8 @@ thresh_comp->p4 = cp->rxqual_meas.upper_cmp_p & 0x1f; thresh_comp->n4 = cp->rxqual_meas.upper_cmp_n & 0x1f; - /* FIXME: TIMER_PWR_CON_INTERVAL (P_Con_INTERVAL) */ - thresh_comp->pc_interval = 0; /* 0 .. 30 seconds */ + /* Minimum interval between power level changes (P_CON_INTERVAL) */ + thresh_comp->pc_interval = cp->con_interval; /* Change step limitations: POWER_{INC,RED}_STEP_SIZE */ thresh_comp->inc_step_size = cp->inc_step_size_db & 0x0f; diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty index 7e4382a..76f83a2 100644 --- a/tests/power_ctrl.vty +++ b/tests/power_ctrl.vty @@ -29,6 +29,7 @@ ... . l. mode (static|dyn-bts) [reset] . l. bs-power (static|dyn-max) <0-30> + . lv con-interval <0-31> . lv step-size inc <2-6> red <2-4> . lv rxlev-thresh lower <0-63> upper <0-63> . lv rxqual-thresh lower <0-7> upper <0-7> @@ -83,12 +84,23 @@ mode dyn-bts ... !bs-power +OsmoBSC(config-bs-power-ctrl)# con-interval 31 +OsmoBSC(config-bs-power-ctrl)# show running-config +... + bs-power-control +... + con-interval 31 +... !con-interval + ms-power-control +... !con-interval + OsmoBSC(config-bs-power-ctrl)# exit OsmoBSC(config-net-bts)# ms-power-control OsmoBSC(config-ms-power-ctrl)# list with-flags ... . l. mode (static|dyn-bts) [reset] . l. bs-power (static|dyn-max) <0-30> + . lv con-interval <0-31> . lv step-size inc <2-6> red <2-4> . lv rxlev-thresh lower <0-63> upper <0-63> . lv rxqual-thresh lower <0-7> upper <0-7> @@ -119,6 +131,20 @@ OsmoBSC(config-ms-power-ctrl)# bs-power dyn-max 30 % This command is only valid for 'bs-power-control' node +OsmoBSC(config-ms-power-ctrl)# con-interval 2 +OsmoBSC(config-ms-power-ctrl)# show running-config +... + bs-power-control + mode dyn-bts +... + con-interval 31 +... !con-interval + ms-power-control + mode dyn-bts +... + con-interval 2 +... !con-interval + OsmoBSC(config-ms-power-ctrl)# step-size inc 5 red 4 % Power change step size must be an even number OsmoBSC(config-ms-power-ctrl)# step-size inc 2 red 3 @@ -131,11 +157,12 @@ ... bs-power-control mode dyn-bts - bs-power dyn-max 30 +... step-size inc 4 red 2 ... ms-power-control mode dyn-bts +... step-size inc 6 red 4 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Gerrit-Change-Number: 22779 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 17:27:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 17:27:26 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 to look at the new patch set (#2). Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... oml: reuse the given msgb in oml_fom_ack_nack() This would allow to compose ACK/NACK messages with additional IEs not present in the original message. Also, this change basically eliminates unnecessary msgb_copy() / free(). Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Related: OS#3791 --- M src/common/oml.c 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/22763/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 18:20:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 18:20:19 +0000 Subject: Change in osmo-bsc[master]: power_control: make P_CON_INTERVAL parameter configurable In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22779 to look at the new patch set (#2). Change subject: power_control: make P_CON_INTERVAL parameter configurable ...................................................................... power_control: make P_CON_INTERVAL parameter configurable Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Related: SYS#4918 --- M doc/manuals/chapters/power_control.adoc M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M tests/power_ctrl.vty 5 files changed, 73 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/22779/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Gerrit-Change-Number: 22779 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 18:24:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 18:24:33 +0000 Subject: Change in libosmo-sccp[master]: sccp_sap: Fix string for N-PCSTATE primitive References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 ) Change subject: sccp_sap: Fix string for N-PCSTATE primitive ...................................................................... sccp_sap: Fix string for N-PCSTATE primitive Change-Id: Ib42f46661e27b1730badc3647ca2e021e93021b7 --- M src/sccp_sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/80/22780/1 diff --git a/src/sccp_sap.c b/src/sccp_sap.c index 526179e..7c9ce65 100644 --- a/src/sccp_sap.c +++ b/src/sccp_sap.c @@ -37,7 +37,7 @@ /* management */ { OSMO_SCU_PRIM_N_COORD, "N-COORD" }, { OSMO_SCU_PRIM_N_STATE, "N-STATE" }, - { OSMO_SCU_PRIM_N_PCSTATE, "N-PCSATE" }, + { OSMO_SCU_PRIM_N_PCSTATE, "N-PCSTATE" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib42f46661e27b1730badc3647ca2e021e93021b7 Gerrit-Change-Number: 22780 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 18:28:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 18:28:43 +0000 Subject: Change in libosmo-sccp[master]: sccp_sap: Fix string for N-PCSTATE primitive In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 ) Change subject: sccp_sap: Fix string for N-PCSTATE primitive ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib42f46661e27b1730badc3647ca2e021e93021b7 Gerrit-Change-Number: 22780 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 07 Feb 2021 18:28:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 18:28:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 18:28:51 +0000 Subject: Change in libosmo-sccp[master]: sccp_sap: Fix string for N-PCSTATE primitive In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 ) Change subject: sccp_sap: Fix string for N-PCSTATE primitive ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib42f46661e27b1730badc3647ca2e021e93021b7 Gerrit-Change-Number: 22780 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 07 Feb 2021 18:28:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 18:28:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 18:28:53 +0000 Subject: Change in libosmo-sccp[master]: sccp_sap: Fix string for N-PCSTATE primitive In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 ) Change subject: sccp_sap: Fix string for N-PCSTATE primitive ...................................................................... sccp_sap: Fix string for N-PCSTATE primitive Change-Id: Ib42f46661e27b1730badc3647ca2e021e93021b7 --- M src/sccp_sap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/src/sccp_sap.c b/src/sccp_sap.c index 526179e..7c9ce65 100644 --- a/src/sccp_sap.c +++ b/src/sccp_sap.c @@ -37,7 +37,7 @@ /* management */ { OSMO_SCU_PRIM_N_COORD, "N-COORD" }, { OSMO_SCU_PRIM_N_STATE, "N-STATE" }, - { OSMO_SCU_PRIM_N_PCSTATE, "N-PCSATE" }, + { OSMO_SCU_PRIM_N_PCSTATE, "N-PCSTATE" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib42f46661e27b1730badc3647ca2e021e93021b7 Gerrit-Change-Number: 22780 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 21:13:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 21:13:40 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22781 ) Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... power_control: implement handling of P_Con_INTERVAL parameter Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Related: SYS#4918 --- M include/osmo-bts/gsm_data.h M src/common/power_control.c M src/common/rsl.c M src/common/vty.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok M tests/power/ms_power_loop_test.c M tests/power/ms_power_loop_test.err M tests/power/ms_power_loop_test.ok 10 files changed, 320 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/22781/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 8071a28..05b6cf2 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -201,6 +201,9 @@ /* MS/BS Power Control parameters */ struct gsm_power_ctrl_params { + /* Minimum interval between power level changes */ + uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ + /* Power change step size (maximum) */ uint8_t inc_step_size_db; /* increasing direction */ uint8_t red_step_size_db; /* reducing direction */ @@ -231,6 +234,8 @@ const struct gsm_power_ctrl_params *dpc_params; /* Measurement pre-processing state (for dynamic mode) */ struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; + /* Number of SACCH blocks to skip (for dynamic mode) */ + int skip_block_num; /* Depending on the context (MS or BS power control), fields 'current' and 'max' * reflect either the MS power level (magic numbers), or BS Power reduction level diff --git a/src/common/power_control.c b/src/common/power_control.c index be74a41..4f5d15e 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -1,7 +1,8 @@ /* MS Power Control Loop L1 */ /* (C) 2014 by Holger Hans Peter Freyther - * Contributions by sysmocom - s.m.f.c. GmbH + * (C) 2020-2021 by sysmocom - s.m.f.c. GmbH + * Author: Vadim Yanitskiy * * All Rights Reserved * @@ -160,6 +161,17 @@ if (params == NULL) return 0; + /* Power control interval: how many blocks do we skip? */ + if (state->skip_block_num-- > 0) + return 0; + + /* Reset the number of SACCH blocks to be skipped: + * ctrl_interval=0 => 0 blocks to skip, + * ctrl_interval=1 => 1 blocks to skip, + * ctrl_interval=2 => 3 blocks to skip, + * so basically ctrl_interval * 2 - 1. */ + state->skip_block_num = params->ctrl_interval * 2 - 1; + ms_dbm = ms_pwr_dbm(band, ms_power_lvl); if (ms_dbm < 0) { LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, @@ -265,6 +277,17 @@ lchan->tch.dtx.dl_active ? "enabled" : "disabled", lchan->tch.dtx.dl_active ? "SUB" : "FULL"); + /* Power control interval: how many blocks do we skip? */ + if (state->skip_block_num-- > 0) + return 0; + + /* Reset the number of SACCH blocks to be skipped: + * ctrl_interval=0 => 0 blocks to skip, + * ctrl_interval=1 => 1 blocks to skip, + * ctrl_interval=2 => 3 blocks to skip, + * so basically ctrl_interval * 2 - 1. */ + state->skip_block_num = params->ctrl_interval * 2 - 1; + /* If DTx is active on Downlink, use the '-SUB' */ if (lchan->tch.dtx.dl_active) { rxqual = rxqual_sub; diff --git a/src/common/rsl.c b/src/common/rsl.c index bde53a1..3023ffa 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -763,7 +763,8 @@ params->rxqual_meas.upper_cmp_p = thresh_comp->p4; params->rxqual_meas.upper_cmp_n = thresh_comp->n4; - /* FIXME: TIMER_PWR_CON_INTERVAL (P_Con_INTERVAL) */ + /* Minimum interval between power level changes (P_Con_INTERVAL) */ + params->ctrl_interval = thresh_comp->pc_interval; /* Power increase / reduce step size: POWER_{INC,RED}_STEP_SIZE */ params->inc_step_size_db = thresh_comp->inc_step_size; diff --git a/src/common/vty.c b/src/common/vty.c index 9dd0c1a..f36c09e 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1269,6 +1269,11 @@ static void dump_dpc_params(struct vty *vty, const unsigned int indent, const struct gsm_power_ctrl_params *cp) { + cfg_out(vty, "Power control interval: %u ms (every %u SACCH block(s))%s", + cp->ctrl_interval ? cp->ctrl_interval * 2 * 480 : 480, + cp->ctrl_interval ? cp->ctrl_interval * 2 : 1, + VTY_NEWLINE); + cfg_out(vty, "Power increase step size: %u%s", cp->inc_step_size_db, VTY_NEWLINE); cfg_out(vty, "Power reduce step size: %u%s", diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 5271324..6f5f2bf 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -1,5 +1,5 @@ /* - * (C) 2020 by sysmocom - s.m.f.c. GmbH + * (C) 2020-2021 by sysmocom - s.m.f.c. GmbH * Author: Vadim Yanitskiy * * All Rights Reserved @@ -56,6 +56,7 @@ PWR_TEST_ST_IND_MEAS = 0, PWR_TEST_ST_IND_DUMMY, PWR_TEST_ST_SET_STATE, + PWR_TEST_ST_SET_CTRL_INTERVAL, PWR_TEST_ST_SET_STEP_SIZE, PWR_TEST_ST_SET_RXLEV_PARAMS, PWR_TEST_ST_ENABLE_DTXD, @@ -84,6 +85,8 @@ uint8_t inc; uint8_t red; } step_size; + /* Power control interval */ + uint8_t ctrl_interval; }; /* Expected Tx power reduction */ uint8_t exp_txred; @@ -159,6 +162,11 @@ printf("#%02u %s() <- Dynamic power control is disabled\n", n, __func__); lchan->bs_power_ctrl.dpc_params = NULL; return 0; /* we're done */ + case PWR_TEST_ST_SET_CTRL_INTERVAL: + printf("#%02u %s() <- (Re)set power control interval: %u -> %u\n", + n, __func__, lchan->bs_dpc_params.ctrl_interval, step->ctrl_interval); + lchan->bs_dpc_params.ctrl_interval = step->ctrl_interval; + return 0; /* we're done */ case PWR_TEST_ST_SET_STEP_SIZE: printf("#%02u %s() <- Set step size: inc %u dB, red %u dB\n", n, __func__, step->step_size.inc, step->step_size.red); @@ -411,6 +419,49 @@ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, }; +/* Verify handling of optional power control interval (P_Con_INTERVAL). */ +static const struct power_test_step TC_ctrl_interval[] = { + /* Initial state: 0 dB, up to 20 dB */ + { .type = PWR_TEST_ST_SET_STATE, + .state = { .current = 0, .max = 2 * 10 } }, + + /* P_Con_INTERVAL=0 (480 ms): every SACCH block is handled */ + { .type = PWR_TEST_ST_SET_CTRL_INTERVAL, .ctrl_interval = 0 }, + + /* MS indicates high RxLev values (-50 dBm), red step is 2 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 2 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 6 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 }, + + /* MS indicates low RxLev values (-100 dBm), inc step is 4 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, + + /* P_Con_INTERVAL=1 (960 ms): 1 out of 2 SACCH blocks is handled */ + { .type = PWR_TEST_ST_SET_CTRL_INTERVAL, .ctrl_interval = 1 }, + + /* MS indicates high RxLev values (-50 dBm), red step is 2 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 2 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 2 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 6 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 6 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 }, /* skipped */ + + /* P_Con_INTERVAL=2 (1920 ms): 1 out of 4 SACCH blocks is handled */ + { .type = PWR_TEST_ST_SET_CTRL_INTERVAL, .ctrl_interval = 2 }, + + /* MS indicates low RxLev values (-100 dBm), inc step is 4 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, +}; + /* Verify that small deviations from the target do not trigger any changes. */ static const struct power_test_step TC_rxlev_hyst[] = { /* Initial state: 16 dB, up to 20 dB */ @@ -488,6 +539,7 @@ exec_test(TC_dtxd_mode); exec_test(TC_rxqual_ber); exec_test(TC_inval_dummy); + exec_test(TC_ctrl_interval); exec_test(TC_rxlev_hyst); exec_test(TC_rxlev_pf_ewma); diff --git a/tests/power/bs_power_loop_test.err b/tests/power/bs_power_loop_test.err index 7fcfb1e..c4726b1 100644 --- a/tests/power/bs_power_loop_test.err +++ b/tests/power/bs_power_loop_test.err @@ -135,6 +135,37 @@ (bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 16 dB (maximum 20 dB, suggested delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 16 dB (maximum 20 dB, suggested delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 6 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 6 -> 8 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 8 -> 4 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 0 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 6 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 6 -> 8 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 8 -> 4 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 0 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(31), RXQUAL-FULL(0), RXLEV-SUB(31), RXQUAL-SUB(0), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 12 -> 13 dB (maximum 16 dB, suggested delta 1 dB, RxLev current 31 (-79 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(28), RXQUAL-FULL(0), RXLEV-SUB(28), RXQUAL-SUB(0), DTx is disabled => using FULL diff --git a/tests/power/bs_power_loop_test.ok b/tests/power/bs_power_loop_test.ok index 4371c9d..2c12392 100644 --- a/tests/power/bs_power_loop_test.ok +++ b/tests/power/bs_power_loop_test.ok @@ -268,6 +268,70 @@ #07 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) Test case verdict: SUCCESS +Starting test case 'TC_ctrl_interval' +#00 exec_power_step() <- State (re)set (current 0 dB, max 20 dB) +#01 exec_power_step() <- (Re)set power control interval: 0 -> 0 +#02 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#02 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#02 lchan_bs_pwr_ctrl() -> BS power reduction: 0 -> 2 (expected 2) +#03 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#03 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#03 lchan_bs_pwr_ctrl() -> BS power reduction: 2 -> 4 (expected 4) +#04 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#04 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#04 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 6 (expected 6) +#05 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#05 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#05 lchan_bs_pwr_ctrl() -> BS power reduction: 6 -> 8 (expected 8) +#06 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#06 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#06 lchan_bs_pwr_ctrl() -> BS power reduction: 8 -> 4 (expected 4) +#07 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#07 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#07 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 0 (expected 0) +#08 exec_power_step() <- (Re)set power control interval: 0 -> 1 +#09 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#09 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#09 lchan_bs_pwr_ctrl() -> BS power reduction: 0 -> 2 (expected 2) +#10 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#10 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#10 lchan_bs_pwr_ctrl() -> BS power reduction: 2 -> 2 (expected 2) +#11 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#11 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#11 lchan_bs_pwr_ctrl() -> BS power reduction: 2 -> 4 (expected 4) +#12 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#12 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#12 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#13 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#13 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#13 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 6 (expected 6) +#14 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#14 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#14 lchan_bs_pwr_ctrl() -> BS power reduction: 6 -> 6 (expected 6) +#15 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#15 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#15 lchan_bs_pwr_ctrl() -> BS power reduction: 6 -> 8 (expected 8) +#16 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#16 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#16 lchan_bs_pwr_ctrl() -> BS power reduction: 8 -> 8 (expected 8) +#17 exec_power_step() <- (Re)set power control interval: 1 -> 2 +#18 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#18 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#18 lchan_bs_pwr_ctrl() -> BS power reduction: 8 -> 4 (expected 4) +#19 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#19 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#19 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#20 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#20 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#20 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#21 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#21 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#21 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#22 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#22 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#22 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 0 (expected 0) +Test case verdict: SUCCESS + Starting test case 'TC_rxlev_hyst' #00 exec_power_step() <- State (re)set (current 12 dB, max 16 dB) #01 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(31), RXQUAL-FULL(0), RXLEV-SUB(31), RXQUAL-SUB(0) diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index eb0e3e9..2bb4561 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -248,6 +248,71 @@ apply_power_test(lchan, PWR_TEST_RXLEV_TARGET_DBM - 10, 1, 13); } +static void test_power_ctrl_interval(void) +{ + struct gsm_lchan *lchan; + unsigned int i, j; + + init_test(__func__); + lchan = &g_trx->ts[0].lchan[0]; + + lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 26); + OSMO_ASSERT(lchan->ms_power_ctrl.max == 2); + + static const int script[][8][3] = { + { /* P_Con_INTERVAL=0 (480 ms) */ + /* { UL RxLev, expected rc, expected Tx power level } */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 13 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 9 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 7 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 5 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 3 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 2 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 2 }, + }, + { /* P_Con_INTERVAL=1 (960 ms) */ + /* { UL RxLev, expected rc, expected Tx power level } */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 13 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 9 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 9 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 7 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 7 }, /* skipped */ + }, + { /* P_Con_INTERVAL=2 (1920 ms) */ + /* { UL RxLev, expected rc, expected Tx power level } */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 13 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + }, + }; + + for (i = 0; i < ARRAY_SIZE(script); i++) { + lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0); + OSMO_ASSERT(lchan->ms_power_ctrl.current == 15); + + /* Set the corresponding power control interval */ + printf("%s(): power control interval is now %u\n", __func__, i); + lchan->ms_dpc_params.ctrl_interval = i; + + for (j = 0; j < ARRAY_SIZE(script[i]); j++) { + apply_power_test(lchan, script[i][j][0], /* UL RxLev */ + script[i][j][1], /* expected rc */ + script[i][j][2]); /* expected Tx power level */ + } + + printf("\n"); + } +} + int main(int argc, char **argv) { printf("Testing power loop...\n"); @@ -264,6 +329,7 @@ test_power_loop(); test_pf_algo_ewma(); test_power_hysteresis(); + test_power_ctrl_interval(); printf("Power loop test OK\n"); diff --git a/tests/power/ms_power_loop_test.err b/tests/power/ms_power_loop_test.err index 7f8779c..ae8ad03 100644 --- a/tests/power/ms_power_loop_test.err +++ b/tests/power/ms_power_loop_test.err @@ -35,3 +35,17 @@ (bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 15, 0 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -70 dBm, rx-target -75 dBm) (bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 15, 0 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -80 dBm, rx-target -75 dBm) (bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -85 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 11 (8 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 11, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 9 (12 dBm) to 7, 16 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 7 (16 dBm) to 5, 20 dBm (rx-ms-pwr-lvl 7, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 5 (20 dBm) to 3, 24 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 3 (24 dBm) to 2, 26 dBm (rx-ms-pwr-lvl 3, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 2, 26 dBm (rx-ms-pwr-lvl 2, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 11 (8 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 11, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 9 (12 dBm) to 7, 16 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) diff --git a/tests/power/ms_power_loop_test.ok b/tests/power/ms_power_loop_test.ok index 4293d28..e6da0d9 100644 --- a/tests/power/ms_power_loop_test.ok +++ b/tests/power/ms_power_loop_test.ok @@ -88,4 +88,60 @@ MS current power 15 -> 15 (expected 15) lchan_ms_pwr_ctrl(RxLvl=-85 dBm) returns 1 (expected 1) MS current power 15 -> 13 (expected 13) + +Starting test case 'test_power_ctrl_interval' +test_power_ctrl_interval(): power control interval is now 0 +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 15 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 13 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 11 -> 9 (expected 9) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 9 -> 7 (expected 7) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 7 -> 5 (expected 5) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 5 -> 3 (expected 3) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 3 -> 2 (expected 2) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 1) + MS current power 2 -> 2 (expected 2) + +test_power_ctrl_interval(): power control interval is now 1 +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 15 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 13 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 1) + MS current power 11 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 11 -> 9 (expected 9) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 1) + MS current power 9 -> 9 (expected 9) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 9 -> 7 (expected 7) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 1) + MS current power 7 -> 7 (expected 7) + +test_power_ctrl_interval(): power control interval is now 2 +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 15 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 13 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) + Power loop test OK -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 22:03:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 22:03:13 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 to look at the new patch set (#2). Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... power_control: implement handling of P_Con_INTERVAL parameter Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Related: SYS#4918 --- M include/osmo-bts/gsm_data.h M src/common/power_control.c M src/common/rsl.c M src/common/vty.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok M tests/power/ms_power_loop_test.c M tests/power/ms_power_loop_test.err M tests/power/ms_power_loop_test.ok 10 files changed, 320 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/22781/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 22:03:15 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 22:03:15 +0000 Subject: Change in osmo-bts[master]: power_control: cosmetic: fix swapped {L, U}_RXQUAL_XX_P comments References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22782 ) Change subject: power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments ...................................................................... power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments Change-Id: I2fe198f9275f4e5407ad6fdfa68d4fa7d603e333 Related: SYS#4918 --- M src/common/gsm_data.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/22782/1 diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index b3f9f2d..7cf48bf 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -441,8 +441,8 @@ /* RxQual measurement parameters */ .rxqual_meas = { /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */ - .lower_thresh = 3, /* U_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ - .upper_thresh = 0, /* L_RXQUAL_XX_P (BER < 0.2%) */ + .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ + .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */ /* FIXME: RxQual averaging is not yet implemented */ .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2fe198f9275f4e5407ad6fdfa68d4fa7d603e333 Gerrit-Change-Number: 22782 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 22:07:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 22:07:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 ) Change subject: stp: Ignore M3UA SSNM messages in tests ...................................................................... stp: Ignore M3UA SSNM messages in tests The tests were written without considering the arrival of such messages; however, it is well within the M3UA spec that such messages appear at any time indicating remote point code availability etc. In libosmo-sccp.git Id92be4691b0fd77598a6edb642c028bbd8c5b623 we start generating those messages in osmo-stp. Let's ignore them in the tests to avoid unexpected failures. Later on, we likely will introduce / adapt tests to actually expect those messages whenever appropriate. Change-Id: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Related: OS#2623 --- M library/M3UA_Templates.ttcn M library/SCCP_Templates.ttcn M stp/STP_Tests_M3UA.ttcn 3 files changed, 150 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/22783/1 diff --git a/library/M3UA_Templates.ttcn b/library/M3UA_Templates.ttcn index 1063b50..1c95024 100644 --- a/library/M3UA_Templates.ttcn +++ b/library/M3UA_Templates.ttcn @@ -379,6 +379,97 @@ } } +/*********************************************************************** + * SSNM Class + ***********************************************************************/ + +template (present) PDU_M3UA tr_M3UA_DUNA := { + m3UA_DUNA := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0201'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := *, + affected_Point_Codes := ?, + info_String := * + } + } +} + +template (present) PDU_M3UA tr_M3UA_DAVA := { + m3UA_DAVA := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0202'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := *, + affected_Point_Codes := ?, + info_String := * + } + } +} + +template (present) PDU_M3UA tr_M3UA_DAUD := { + m3UA_DAUD := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0203'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := *, + affected_Point_Codes := ?, + info_String := * + } + } +} + +template (present) PDU_M3UA tr_M3UA_SCON := { + m3UA_SCON := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0204'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := *, + affected_Point_Codes := ?, + info_String := * + } + } +} + +template (present) PDU_M3UA tr_M3UA_DUPU := { + m3UA_DUPU := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0205'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := *, + affected_Point_Codes := ?, + info_String := * + } + } +} + +template (present) PDU_M3UA tr_M3UA_DRST := { + m3UA_DRST := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0206'O, + messageLength := ?, + messageParameters := ? + } +} + +template (present) PDU_M3UA tr_M3UA_SSNM := (tr_M3UA_DUNA, tr_M3UA_DAVA, tr_M3UA_DAUD, + tr_M3UA_SCON, tr_M3UA_DUPU, tr_M3UA_DRST); /*********************************************************************** * MGMT Class diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index b0e6df7..2b279c6 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -215,5 +215,55 @@ } } +template (value) PDU_SCMG_message ts_SCCP_SSA(template (value) SCMG_param_AffectedSSN ssn, + template (value) SCMG_param_AffectedPointCode pc) := { + messageType := sSAallowed, + affectedSSN := ssn, + affectedPC := pc, + smi := { '00'B, '000000'B }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCCP_SSA(template (present) SCMG_param_AffectedSSN ssn := ?, + template (present) SCMG_param_AffectedPointCode pc := ?) := { + messageType := sSAallowed, + affectedSSN := ssn, + affectedPC := pc, + smi := { ?, '000000'B }, + congLevel := omit +} + +template (value) PDU_SCMG_message ts_SCCP_SSP(template (value) SCMG_param_AffectedSSN ssn, + template (value) SCMG_param_AffectedPointCode pc) := { + messageType := sSPprohib, + affectedSSN := ssn, + affectedPC := pc, + smi := { '00'B, '000000'B }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCCP_SSP(template (present) SCMG_param_AffectedSSN ssn := ?, + template (present) SCMG_param_AffectedPointCode pc := ?) := { + messageType := sSPprohib, + affectedSSN := ssn, + affectedPC := pc, + smi := { ?, '000000'B }, + congLevel := omit +} + +template (value) PDU_SCMG_message ts_SCCP_SST(template (value) SCMG_param_AffectedSSN ssn, + template (value) SCMG_param_AffectedPointCode pc) := { + messageType := sSTstaTest, + affectedSSN := ssn, + affectedPC := pc, + smi := { '00'B, '000000'B }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCCP_SST(template (present) SCMG_param_AffectedSSN ssn := ?, + template (present) SCMG_param_AffectedPointCode pc := ?) := { + messageType := sSTstaTest, + affectedSSN := ssn, + affectedPC := pc, + smi := { ?, '000000'B }, + congLevel := omit +} } diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 22272f3..b76d9be 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -75,6 +75,14 @@ [] any from M3UA.receive(tr_SctpPeerAddrChange) { repeat; } } +private altstep as_m3ua_ssnm_ignore() runs on RAW_M3UA_CT { + var M3UA_RecvFrom rx; + [] any from M3UA.receive(t_M3UA_RecvFrom(tr_M3UA_SSNM)) -> value rx { + log("Ignoring M3UA SSNM", rx); + repeat; + } +} + friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, template integer stream := 0) runs on RAW_M3UA_CT { M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, stream)); @@ -183,6 +191,7 @@ f_init_common(); activate(as_m3ua_sctp()); + activate(as_m3ua_ssnm_ignore()); for (i := 0; i < NR_M3UA; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 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: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Gerrit-Change-Number: 22783 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 22:07:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 7 Feb 2021 22:07:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 ) Change subject: stp: Less magic numbers; centralize M3UA configuration ...................................................................... stp: Less magic numbers; centralize M3UA configuration We shouldn't be having magic numbers for point codes etc. in each test case. Change-Id: Id8a6241657e1f02f15d6722934eb040fc98beab1 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 89 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/22784/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index b76d9be..ee78c9c 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -34,18 +34,58 @@ import from STP_Tests_Common all; -modulepar { - HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" }; - HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" }; - integer mp_stp_m3ua_port := 2905; - integer mp_stp_m3ua_clnt_port := 2906; - integer mp_local_m3ua_port := 9999; - integer mp_recovery_timeout_msec := 2000; -} - private const integer NR_M3UA := 3; /* number of M3UA clients in ATS */ private const integer NR_M3UA_SRV := 1; /* number of M3UA servres in ATS */ +modulepar { + /* STP-side IP addresses */ + HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" }; + /* local IP addresses */ + HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" }; + M3uaConfigs mp_m3ua_configs := { + /* as-sender: One ASP within AS */ + { + remote_sctp_port := 2905, + local_sctp_port := 9999, + point_code := 23, + routing_ctx := 1023 + }, + /* as-reeiver: Two ASP within AS */ + { + remote_sctp_port := 2905, + local_sctp_port := 10000, + point_code := 42, + routing_ctx := 1042 + }, { + remote_sctp_port := 2905, + local_sctp_port := 10001, + point_code := 42, + routing_ctx := 1042 + }, + /* as-client: One ASP within AS */ + { + remote_sctp_port := 2906, + local_sctp_port := 10002, + point_code := 55, + routing_ctx := 1055 + } + }; + integer mp_recovery_timeout_msec := 2000; + charstring mp_sccp_service_type := "mtp3_itu"; +} + +type record M3uaConfig { + /* STP-side SCTP port for M3UA */ + integer remote_sctp_port, + /* local M3UA base port on TTCN3 side */ + integer local_sctp_port, + /* point code routed via this M3U */ + integer point_code, + /* associated routing context */ + integer routing_ctx +}; +type record length (NR_M3UA+NR_M3UA_SRV) of M3uaConfig M3uaConfigs; + private function M3UA_SRV(integer idx) return integer { return NR_M3UA+idx; } @@ -121,6 +161,7 @@ var Option opt_add_local_addrs; var OptionList opt_list := {}; var template SocketList opt_add_remote_addrs; + var M3uaConfig m3cfg := mp_m3ua_configs[i]; if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) { setverdict(fail, "Empty local or remote address trying to connect SCTP socket: ", @@ -136,15 +177,15 @@ if (lengthof(mp_stp_m3ua_ip) > 1) { for (var integer j := 1; j < lengthof(mp_stp_m3ua_ip); j := j + 1) { - var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], mp_stp_m3ua_port)); + var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], m3cfg.remote_sctp_port)); opt_add_remote_addrs[j - 1] := sk; } } else { opt_add_remote_addrs := omit; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], mp_stp_m3ua_port, - mp_local_m3ua_ip[0], mp_local_m3ua_port+i, 0, + res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_sctp_port, + mp_local_m3ua_ip[0], m3cfg.local_sctp_port, 0, {sctp:=valueof(ts_SCTP(3, 0, opt_add_remote_addrs))}, opt_list); if (not ispresent(res.connId)) { @@ -164,6 +205,7 @@ var Result res; var Option opt_add_local_addrs; var OptionList opt_list := {}; + var M3uaConfig m3cfg := mp_m3ua_configs[i]; if (lengthof(mp_local_m3ua_ip) == 0 ) { setverdict(fail, "Empty local address trying to bind SCTP socket: ", @@ -177,7 +219,7 @@ opt_list := {opt_add_local_addrs}; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], mp_local_m3ua_port+i, + res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_sctp_port, {sctp:=valueof(ts_SCTP)}, opt_list); if (not ispresent(res.connId)) { setverdict(fail, "Could not bind M3UA socket, check your configuration"); @@ -329,10 +371,10 @@ /* test whether the STP accepts M3UA DATA without Routing Context IE */ testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); f_init_m3ua(); /* bring up the sender specifying a routing context */ @@ -361,10 +403,10 @@ /* test "traffic-mode override" behavior */ testcase TC_tmt_override() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); f_init_m3ua(); @@ -398,10 +440,10 @@ /* test "traffic-mode load-share" behavior */ testcase TC_tmt_loadshare() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); var integer i; f_init_m3ua(); @@ -451,10 +493,10 @@ /* test "traffic-mode broadcast" behavior */ testcase TC_tmt_broadcast() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); var integer i; f_init_m3ua(); @@ -513,8 +555,8 @@ /* Send RKM registration; expect OK as RCTX does match config */ testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT { - var OCT3 dpc := int2oct(23, 3); // must match config - var OCT4 rctx := int2oct(1023, 4); // must match config + var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must match config + var OCT4 rctx := int2oct(mp_m3ua_configs[0].routing_ctx, 4); // must match config f_init_m3ua(); @@ -543,7 +585,7 @@ /* try to de-register a routing key that was never registered -> error */ testcase TC_rkm_unreg_never_registered() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(1023,4)))); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(mp_m3ua_configs[0].routing_ctx,4)))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_NOT_REG)})); f_clear_m3ua(); } @@ -559,15 +601,15 @@ /* try to de-register a routing key that was registered -> OK*/ testcase TC_rkm_unreg_registered() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(1023,4)))); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(mp_m3ua_configs[0].routing_ctx,4)))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_SUCCESS)})); f_clear_m3ua(); } /* try to de-register a routing key for an active ASP -> ERROR */ testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT { - var OCT3 dpc := int2oct(23, 3); // must match config - var OCT4 rctx := int2oct(1023, 4); // must match config + var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must match config + var OCT4 rctx := int2oct(mp_m3ua_configs[0].routing_ctx, 4); // must match config f_init_m3ua(); @@ -634,7 +676,7 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_clear_m3ua(); } @@ -646,7 +688,7 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_clear_m3ua(); } @@ -654,16 +696,16 @@ /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) */ testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1055, 4); - var OCT4 pc_receiver := int2oct(55, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(0)].point_code, 4); f_init_m3ua(); f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_sleep(1.0); @@ -676,16 +718,16 @@ /* Test traffic being routed through "client" side STP (M3UA ASP), coming back in "server" * side STP (M3UA SG) */ testcase TC_clnt_asp_to_sg() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1055, 4); - var OCT4 pc_sender := int2oct(55, 4); - var OCT4 rctx_receiver := int2oct(1023, 4); - var OCT4 pc_receiver := int2oct(23, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[M3UA_SRV(0)].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[0].point_code, 4); f_init_m3ua(); f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 22:09:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 7 Feb 2021 22:09:01 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 to look at the new patch set (#3). Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... power_control: implement handling of P_Con_INTERVAL parameter Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Related: SYS#4918 --- M include/osmo-bts/gsm_data.h M src/common/power_control.c M src/common/rsl.c M src/common/vty.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok M tests/power/ms_power_loop_test.c M tests/power/ms_power_loop_test.err M tests/power/ms_power_loop_test.ok 10 files changed, 320 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/22781/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 7 23:00:58 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sun, 7 Feb 2021 23:00:58 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: make independent of libosmocore talloc References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22785 ) Change subject: msc_vlr_tests: make independent of libosmocore talloc ...................................................................... msc_vlr_tests: make independent of libosmocore talloc The msc_vlr_tests verify whether any of the tests run contain msgb or talloc memory leaks. So far they did so by fixating a specific number of talloc blocks, which may break by library implementations changing. Instead, verify that the test leaks no allocations by comparing talloc blocks before and after each test. When a leak is detected, print the full talloc report to stderr, which makes the expected output mismatch the actual output and fails the test. Related: OS#4311 Change-Id: I8537fa76d460c951302932a1bad4299f7fe398c9 --- M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 13 files changed, 18 insertions(+), 346 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/85/22785/1 diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 7e6f261..43237cf 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_twice_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -509,9 +506,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_twice_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_twice_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1041,9 +1035,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_twice_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_infinitely_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1657,9 +1648,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_infinitely_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_infinitely_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2301,9 +2289,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_infinitely_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_auth_reuse_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2693,9 +2678,6 @@ llist_count(&msub_list) == 0 ===== test_no_auth_reuse_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_auth_reuse_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3101,9 +3083,3 @@ llist_count(&msub_list) == 0 ===== test_no_auth_reuse_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 21ccd2c..1bcc489 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mo - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -473,9 +470,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_call_mo: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mt - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -944,9 +938,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 5) ===== test_call_mt: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mt2 - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1369,9 +1360,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 5) ===== test_call_mt2: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mo_to_unknown - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1797,9 +1785,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_call_mo_to_unknown: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mo_to_unknown_timeout - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2221,9 +2206,3 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_call_mo_to_unknown_timeout: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 3677a36..f27d826 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -589,9 +586,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1420,9 +1414,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1734,9 +1725,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_imei_nack - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2001,9 +1989,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_imei_nack: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_imei_err - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2269,9 +2254,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_imei_err: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2624,9 +2606,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_milenage_authen - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3188,9 +3167,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_milenage_authen: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_wrong_sres_length - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3333,9 +3309,3 @@ llist_count(&msub_list) == 0 ===== test_wrong_sres_length: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 2410ff6..e55c14c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -657,9 +654,6 @@ llist_count(&msub_list) == 0 ===== test_ciph: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1363,9 +1357,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1684,9 +1675,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_imeisv - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1970,9 +1958,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_imeisv: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2332,9 +2317,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_ciph_in_umts_env - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2935,9 +2917,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_ciph_in_umts_env: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3585,9 +3564,6 @@ llist_count(&msub_list) == 0 ===== test_a5_3_supported: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_cm_service_needs_classmark_update - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -4213,9 +4189,3 @@ llist_count(&msub_list) == 0 ===== test_cm_service_needs_classmark_update: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index d4ed53a..40b26d2 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_unknown_imsi - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -100,9 +97,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_rej_auth_info_unknown_imsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_net_fail - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -201,9 +195,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_rej_auth_info_net_fail: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_net_fail_reuse_tuples @@ -531,9 +522,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_hlr_rej_auth_info_net_fail_reuse_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples @@ -799,9 +787,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples @@ -1068,9 +1053,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_acc_but_no_auth_tuples - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1168,9 +1150,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_acc_but_no_auth_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_lu - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1273,9 +1252,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_rej_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_no_insert_data - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1391,9 +1367,3 @@ DVLR freeing VLR subscr IMSI-901700000004620 (max total use count was 5) ===== test_hlr_no_insert_data: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 51aa913..0821a71 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_timeout_lu_auth_info - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -109,9 +106,6 @@ lu_result_sent == 2 ===== test_hlr_timeout_lu_auth_info: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_timeout_lu_upd_loc_result - Total time passed: 0.000000 s - Location Update request causes a GSUP LU request to HLR @@ -238,9 +232,3 @@ lu_result_sent == 2 ===== test_hlr_timeout_lu_upd_loc_result: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index a64672a..0663f9d 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ms_timeout_lu_auth_resp - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -128,9 +125,6 @@ lu_result_sent == 2 ===== test_ms_timeout_lu_auth_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ms_timeout_cm_auth_resp - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -403,9 +397,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_ms_timeout_cm_auth_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ms_timeout_paging - Total time passed: 0.000000 s - Location Update request causes a GSUP LU request to HLR @@ -713,9 +704,6 @@ llist_count(&msub_list) == 0 ===== test_ms_timeout_paging: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_classmark_update_timeout - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -866,9 +854,3 @@ lu_result_sent == 2 ===== test_classmark_update_timeout: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index a353949..755f463 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -456,9 +453,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_tmsi - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1147,9 +1141,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imei - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1400,9 +1391,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_tmsi_imei - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1688,9 +1676,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1911,9 +1896,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv_imei - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2145,9 +2127,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv_tmsi - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2615,9 +2594,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv_tmsi_imei - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2886,9 +2862,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_subscr_expire - Total time passed: 0.000000 s - Total time passed: 61.000000 s @@ -3023,9 +2996,3 @@ llist_count(&msub_list) == 0 ===== test_no_authen_subscr_expire: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 9faec63..b211fbf 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_2nd_conn - Location Update Request on one connection MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -191,9 +188,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_2nd_conn: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_lu_during_lu - Location Update Request MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -334,9 +328,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_lu_during_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_cm_during_lu - Location Update Request MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -482,9 +473,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_cm_during_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_paging_resp_during_lu - Location Update Request MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -624,9 +612,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_paging_resp_during_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_lu_during_cm @@ -864,9 +849,6 @@ llist_count(&msub_list) == 0 ===== test_reject_lu_during_cm: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_cm_during_cm @@ -1109,9 +1091,6 @@ llist_count(&msub_list) == 0 ===== test_reject_cm_during_cm: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_paging_resp_during_cm @@ -1338,9 +1317,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_paging_resp_during_cm: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_lu_during_paging_resp @@ -1642,9 +1618,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 6) ===== test_reject_lu_during_paging_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_accept_cm_during_paging_resp @@ -1970,9 +1943,6 @@ llist_count(&msub_list) == 0 ===== test_accept_cm_during_paging_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_paging_resp_during_paging_resp @@ -2271,9 +2241,3 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 6) ===== test_reject_paging_resp_during_paging_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 5e44f31..f27108c 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_cm_service_without_lu - CM Service Request without a prior Location Updating MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ @@ -64,9 +61,6 @@ llist_count(&msub_list) == 0 ===== test_cm_service_without_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_two_lu - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -407,9 +401,6 @@ llist_count(&msub_list) == 0 ===== test_two_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_lu_unknown_tmsi - Location Update request with unknown TMSI sends ID Request for IMSI MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -589,9 +580,3 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 (max total use count was 5) ===== test_lu_unknown_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 3b324d3..e83cb01 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ss_ussd_mo_geran - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -240,9 +237,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_ss_ussd_mo_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ss_ussd_no_geran - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -506,9 +500,3 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_ss_ussd_no_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 42ed422..be858b5 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -607,9 +604,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1215,9 +1209,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_auth_ciph_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1847,9 +1838,6 @@ llist_count(&msub_list) == 0 ===== test_umts_auth_ciph_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_resync_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2081,9 +2069,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_umts_authen_resync_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2315,9 +2300,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_umts_authen_resync_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_auth_ciph_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2559,9 +2541,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_umts_auth_ciph_resync_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_short_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2677,9 +2656,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_short_res_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_short_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2795,9 +2771,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_short_res_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_long_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2913,9 +2886,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_long_res_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_long_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3031,9 +3001,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_long_res_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_only_sres_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3149,9 +3116,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_only_sres_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_only_sres_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3267,9 +3231,3 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_only_sres_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 07a3927..87d1abd 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -45,6 +45,7 @@ #include "msc_vlr_tests.h" void *msc_vlr_tests_ctx = NULL; +void *msgb_ctx = NULL; bool _log_lines = false; @@ -1043,42 +1044,6 @@ fake_time_passes(0, 0); } -static void check_talloc(void *msgb_ctx, void *msc_vlr_tests_ctx) -{ - /* Verifying that the msgb context is empty */ - talloc_report_full(msgb_ctx, stderr); - /* Expecting these to stick around in msc_vlr_tests_ctx: - * full talloc report on 'msgb' (total 0 bytes in 1 blocks) - * talloc_total_blocks(tall_bsc_ctx) == 21 - * full talloc report on 'msc_vlr_tests_ctx' (total 6571 bytes in 21 blocks) - * struct osmo_gsup_client contains 264 bytes in 1 blocks (ref 0) 0x5605f2ea2e90 - * struct gsm_network contains 4806 bytes in 13 blocks (ref 0) 0x5605f2ea1b60 - * struct mgcp_client contains 688 bytes in 1 blocks (ref 0) 0x5605f2ea3200 - * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x5605f2ea3100 - * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x5605f2ea3000 - * struct gsup_client_mux contains 152 bytes in 2 blocks (ref 0) 0x5605f2ea2d20 - * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x5605f2ea2de0 - * struct vlr_instance contains 264 bytes in 2 blocks (ref 0) 0x5605f2ea2b40 - * struct osmo_nri_ranges contains 16 bytes in 1 blocks (ref 0) 0x5605f2ea2ca0 - * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x5605f2ea2ac0 - * stat_item.c:96 contains 144 bytes in 2 blocks (ref 0) 0x5605f2ea2950 - * stat_item.c:118 contains 96 bytes in 1 blocks (ref 0) 0x5605f2ea29f0 - * rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x5605f2ea1fb0 - * sms.db contains 7 bytes in 1 blocks (ref 0) 0x5605f2ea1f40 - * logging contains 1501 bytes in 5 blocks (ref 0) 0x5605f2ea1360 - * struct log_target contains 244 bytes in 2 blocks (ref 0) 0x5605f2ea1990 - * struct log_category contains 76 bytes in 1 blocks (ref 0) 0x5605f2ea1aa0 - * struct log_info contains 1256 bytes in 2 blocks (ref 0) 0x5605f2ea13d0 - * struct log_info_cat contains 1216 bytes in 1 blocks (ref 0) 0x5605f2ea1460 - * msgb contains 0 bytes in 1 blocks (ref 0) 0x5605f2ea12f0 - */ - fprintf(stderr, "talloc_total_blocks(tall_bsc_ctx) == %zu\n", - talloc_total_blocks(msc_vlr_tests_ctx)); - if (talloc_total_blocks(msc_vlr_tests_ctx) != 21) - talloc_report_full(msc_vlr_tests_ctx, stderr); - fprintf(stderr, "\n"); -} - static struct { bool verbose; int run_test_nr; @@ -1130,28 +1095,39 @@ } } -void *msgb_ctx = NULL; - static void run_tests(int nr) { int test_nr; - check_talloc(msgb_ctx, msc_vlr_tests_ctx); - nr--; /* arg's first test is 1, in here it's 0 */ for (test_nr = 0; msc_vlr_tests[test_nr]; test_nr++) { + size_t talloc_blocks_before_test; + if (nr >= 0 && test_nr != nr) continue; if (cmdline_opts.verbose) fprintf(stderr, "(test nr %d)\n", test_nr + 1); + talloc_blocks_before_test = talloc_total_blocks(msc_vlr_tests_ctx); + msc_vlr_tests[test_nr](); + if (talloc_total_blocks(msc_vlr_tests_ctx) != talloc_blocks_before_test) { + fprintf(stderr, "ERROR: talloc leak: %zu blocks\n", + talloc_total_blocks(msc_vlr_tests_ctx) - talloc_blocks_before_test); + talloc_report_full(msc_vlr_tests_ctx, stderr); + fprintf(stderr, "\n"); + } + + if (talloc_total_blocks(msgb_ctx) > 1) { + fprintf(stderr, "ERROR: msgb leak:\n"); + talloc_report_full(msgb_ctx, stderr); + fprintf(stderr, "\n"); + } + if (cmdline_opts.verbose) fprintf(stderr, "(test nr %d)\n", test_nr + 1); - - check_talloc(msgb_ctx, msc_vlr_tests_ctx); } } @@ -1256,6 +1232,5 @@ printf("Done\n"); - check_talloc(msgb_ctx, msc_vlr_tests_ctx); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8537fa76d460c951302932a1bad4299f7fe398c9 Gerrit-Change-Number: 22785 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 8 02:04:05 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 08 Feb 2021 02:04:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60209c247d10a_65302aecf5a6a60011993cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 203s] [COMPILING apps/dfu/main.c] [ 203s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 203s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 203s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 203s] Memory region Used Size Region Size %age Used [ 203s] rom: 16580 B 16 KB 101.20% [ 203s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 203s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 203s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 203s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 203s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 203s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 203s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 203s] collect2: error: ld returned 1 exit status [ 203s] % [ 203s] make[2]: *** [Makefile:234: flash] Error 1 [ 203s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 203s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 203s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 203s] dh_auto_build: error: make -j1 returned exit code 2 [ 203s] make: *** [debian/rules:16: build] Error 25 [ 203s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 203s] ### VM INTERACTION START ### [ 206s] [ 179.320323] sysrq: Power Off [ 206s] [ 179.326358] reboot: Power down [ 207s] ### VM INTERACTION END ### [ 207s] [ 207s] lamb28 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 8 02:03:57 UTC 2021. [ 207s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Feb 8 02:27:31 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 08 Feb 2021 02:27:31 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6020a1a3b2c5a_65302aecf5a6a6001205650@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 128s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 128s] [COMPILING libboard/qmod/source/card_pres.c] [ 128s] [COMPILING libboard/qmod/source/wwan_led.c] [ 128s] [COMPILING libboard/qmod/source/i2c.c] [ 128s] [COMPILING libboard/qmod/source/board_qmod.c] [ 128s] [COMPILING apps/dfu/main.c] [ 129s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 129s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 129s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 129s] Memory region Used Size Region Size %age Used [ 129s] rom: 16588 B 16 KB 101.25% [ 129s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 129s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 129s] collect2: error: ld returned 1 exit status [ 129s] % [ 129s] make[2]: *** [Makefile:234: flash] Error 1 [ 129s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 129s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 129s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 129s] dh_auto_build: error: make -j1 returned exit code 2 [ 129s] make: *** [debian/rules:16: build] Error 25 [ 129s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 129s] ### VM INTERACTION START ### [ 132s] [ 113.507514] sysrq: Power Off [ 132s] [ 113.514415] reboot: Power down [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] goat15 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 8 02:27:24 UTC 2021. [ 132s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 8 03:25:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 8 Feb 2021 03:25:47 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: make independent of libosmocore talloc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22785 ) Change subject: msc_vlr_tests: make independent of libosmocore talloc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8537fa76d460c951302932a1bad4299f7fe398c9 Gerrit-Change-Number: 22785 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 08 Feb 2021 03:25:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:03:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:03:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 to look at the new patch set (#2). Change subject: stp: Ignore M3UA SSNM messages in tests ...................................................................... stp: Ignore M3UA SSNM messages in tests The tests were written without considering the arrival of such messages; however, it is well within the M3UA spec that such messages appear at any time indicating remote point code availability etc. In libosmo-sccp.git Id92be4691b0fd77598a6edb642c028bbd8c5b623 we start generating those messages in osmo-stp. Let's ignore them in the tests to avoid unexpected failures. Later on, we likely will introduce / adapt tests to actually expect those messages whenever appropriate. Change-Id: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Related: OS#2623 --- M library/M3UA_Templates.ttcn M library/SCCP_Templates.ttcn M stp/STP_Tests_M3UA.ttcn 3 files changed, 271 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/22783/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 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: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Gerrit-Change-Number: 22783 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:03:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:03:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Time out after 5s if expected M3UA doesn't arrive References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 ) Change subject: stp: Time out after 5s if expected M3UA doesn't arrive ...................................................................... stp: Time out after 5s if expected M3UA doesn't arrive No need to wait for the global timeout here. Change-Id: I279aacf2215ccd63a6e52c6a71cda3b500a3795c --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/22786/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index b76d9be..1c25bae 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -90,6 +90,8 @@ friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg) runs on RAW_M3UA_CT { var M3UA_RecvFrom rx; + timer T := 5.0; + T.start; alt { [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) { setverdict(pass); @@ -99,6 +101,10 @@ "while waiting for ", msg); mtc.stop; } + [] T.timeout { + setverdict(fail, "Timeout waiting for M3UA[", idx, "] ", msg); + mtc.stop; + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 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: I279aacf2215ccd63a6e52c6a71cda3b500a3795c Gerrit-Change-Number: 22786 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:03:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:03:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Introduce M3UA SSNM tests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 ) Change subject: stp: Introduce M3UA SSNM tests ...................................................................... stp: Introduce M3UA SSNM tests Tests for M3UA SSNM behavior. This is just being introduced in osmo-stp, so all tests will fail on 'latest', and some will still fail until SSNM processing inside osmo-stp is becoming more complete. Change-Id: I5074dccde9940956439235e8d02e6a722b8da5f5 Related: OS#2623 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 137 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/22787/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 3264421..f51b3a0 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -233,13 +233,15 @@ } } -friend function f_init_m3ua() runs on RAW_M3UA_CT { +friend function f_init_m3ua(boolean ignore_ssnm := true) runs on RAW_M3UA_CT { var integer i; f_init_common(); activate(as_m3ua_sctp()); - activate(as_m3ua_ssnm_ignore()); + if (ignore_ssnm) { + activate(as_m3ua_ssnm_ignore()); + } for (i := 0; i < NR_M3UA; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); @@ -304,6 +306,12 @@ f_M3UA_exp(idx, tr_M3UA_ASPAC_ACK(tmt, rctx)); } +/* perform an outbound ASP-INACTIVATE procedure */ +friend function f_M3UA_asp_inact(integer idx, template (omit) OCT4 rctx := omit) runs on RAW_M3UA_CT { + f_M3UA_send(idx, ts_M3UA_ASPIA(rctx)); + f_M3UA_exp(idx, tr_M3UA_ASPIA_ACK(rctx)); +} + /* perform outbound ASP-UP and ASP-ACT, optionally expect interemittent NOTIFY */ friend function f_M3UA_asp_up_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, template (omit) OCT4 rctx := omit, @@ -742,6 +750,126 @@ f_clear_m3ua(); } +/* Test if ASPAC / ASPIA of one ASP generates DAVA / DUNA on other ASP */ +testcase TC_ssnm_aspac_dava_aspia_duna() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + + f_init_m3ua(ignore_ssnm := false); + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate the second ASP */ + f_M3UA_asp_up_act(1, c_M3UA_TMT_override, omit); + /* expect DAVA for PC of second ASP on first ASP */ + f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(mp_m3ua_configs[1].point_code, 0)}, rctx0)); + /* TODO: expect no DAVA on second ASP */ + + /* deactivate the second ASP */ + f_M3UA_asp_inact(1); + /* expect DUNA for PC of second ASP on first ASP */ + f_M3UA_exp(0, tr_M3UA_DUNA({ts_M3UA_PC(mp_m3ua_configs[1].point_code, 0)}, rctx0)); + /* TODO: expect no DUNA on second ASP */ + + f_clear_m3ua(); +} + +/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_dava_duna() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a DAVA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA({adv_pc}, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DAVA({adv_pc}, rctx0)); + + /* transmit a DUNA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA({adv_pc}, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DUNA({adv_pc}, rctx0)); +} + +/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_dava_duna_multipc() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Codes adv_pcs := { ts_M3UA_PC(1234, 0), ts_M3UA_PC(5678, 0) }; + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a DAVA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA(adv_pcs, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DAVA(adv_pcs, rctx0)); + + /* transmit a DUNA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA(adv_pcs, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DUNA(adv_pcs, rctx0)); +} + +/* Test if DUPU sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_dupu() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a DUPU to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctx0)); +} + +/* Test if SCON sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_scon() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a SCON to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_SCON({adv_pc}, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); +} control { @@ -776,6 +904,13 @@ execute( TC_clnt_sg_to_asp() ); execute( TC_clnt_asp_to_sg() ); + /* M3UA SSNM tests */ + execute( TC_ssnm_aspac_dava_aspia_duna() ); + execute( TC_ssnm_distribution_dava_duna() ); + execute( TC_ssnm_distribution_dava_duna_multipc() ); + execute( TC_ssnm_distribution_dupu() ); + execute( TC_ssnm_distribution_scon() ); + /* put this one last as it changes the stp side config */ execute( TC_clnt_asp_act_tmt_loadshare() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 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: I5074dccde9940956439235e8d02e6a722b8da5f5 Gerrit-Change-Number: 22787 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:05:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:05:22 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: make independent of libosmocore talloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22785 ) Change subject: msc_vlr_tests: make independent of libosmocore talloc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8537fa76d460c951302932a1bad4299f7fe398c9 Gerrit-Change-Number: 22785 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 09:05:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:05:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:05:25 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: make independent of libosmocore talloc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22785 ) Change subject: msc_vlr_tests: make independent of libosmocore talloc ...................................................................... msc_vlr_tests: make independent of libosmocore talloc The msc_vlr_tests verify whether any of the tests run contain msgb or talloc memory leaks. So far they did so by fixating a specific number of talloc blocks, which may break by library implementations changing. Instead, verify that the test leaks no allocations by comparing talloc blocks before and after each test. When a leak is detected, print the full talloc report to stderr, which makes the expected output mismatch the actual output and fails the test. Related: OS#4311 Change-Id: I8537fa76d460c951302932a1bad4299f7fe398c9 --- M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 13 files changed, 18 insertions(+), 346 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 7e6f261..43237cf 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_twice_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -509,9 +506,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_twice_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_twice_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1041,9 +1035,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_twice_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_infinitely_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1657,9 +1648,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_infinitely_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_auth_use_infinitely_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2301,9 +2289,6 @@ llist_count(&msub_list) == 0 ===== test_auth_use_infinitely_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_auth_reuse_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2693,9 +2678,6 @@ llist_count(&msub_list) == 0 ===== test_no_auth_reuse_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_auth_reuse_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3101,9 +3083,3 @@ llist_count(&msub_list) == 0 ===== test_no_auth_reuse_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 21ccd2c..1bcc489 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mo - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -473,9 +470,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_call_mo: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mt - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -944,9 +938,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 5) ===== test_call_mt: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mt2 - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1369,9 +1360,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 5) ===== test_call_mt2: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mo_to_unknown - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1797,9 +1785,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_call_mo_to_unknown: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_call_mo_to_unknown_timeout - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2221,9 +2206,3 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_call_mo_to_unknown_timeout: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 3677a36..f27d826 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -589,9 +586,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1420,9 +1414,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1734,9 +1725,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_imei_nack - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2001,9 +1989,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_imei_nack: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_imei_err - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2269,9 +2254,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_imei_err: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_authen_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2624,9 +2606,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_authen_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_milenage_authen - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3188,9 +3167,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_milenage_authen: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_wrong_sres_length - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3333,9 +3309,3 @@ llist_count(&msub_list) == 0 ===== test_wrong_sres_length: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index 2410ff6..e55c14c 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -657,9 +654,6 @@ llist_count(&msub_list) == 0 ===== test_ciph: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1363,9 +1357,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1684,9 +1675,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_imeisv - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1970,9 +1958,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_imeisv: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ciph_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2332,9 +2317,6 @@ llist_count(&msub_list) == 0 ===== test_ciph_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_gsm_ciph_in_umts_env - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2935,9 +2917,6 @@ llist_count(&msub_list) == 0 ===== test_gsm_ciph_in_umts_env: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3585,9 +3564,6 @@ llist_count(&msub_list) == 0 ===== test_a5_3_supported: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_cm_service_needs_classmark_update - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -4213,9 +4189,3 @@ llist_count(&msub_list) == 0 ===== test_cm_service_needs_classmark_update: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index d4ed53a..40b26d2 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_unknown_imsi - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -100,9 +97,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_rej_auth_info_unknown_imsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_net_fail - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -201,9 +195,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_rej_auth_info_net_fail: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_net_fail_reuse_tuples @@ -531,9 +522,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_hlr_rej_auth_info_net_fail_reuse_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples @@ -799,9 +787,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples @@ -1068,9 +1053,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_acc_but_no_auth_tuples - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1168,9 +1150,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_acc_but_no_auth_tuples: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_rej_lu - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1273,9 +1252,6 @@ llist_count(&msub_list) == 0 ===== test_hlr_rej_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_no_insert_data - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1391,9 +1367,3 @@ DVLR freeing VLR subscr IMSI-901700000004620 (max total use count was 5) ===== test_hlr_no_insert_data: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 51aa913..0821a71 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_timeout_lu_auth_info - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -109,9 +106,6 @@ lu_result_sent == 2 ===== test_hlr_timeout_lu_auth_info: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_hlr_timeout_lu_upd_loc_result - Total time passed: 0.000000 s - Location Update request causes a GSUP LU request to HLR @@ -238,9 +232,3 @@ lu_result_sent == 2 ===== test_hlr_timeout_lu_upd_loc_result: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index a64672a..0663f9d 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ms_timeout_lu_auth_resp - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -128,9 +125,6 @@ lu_result_sent == 2 ===== test_ms_timeout_lu_auth_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ms_timeout_cm_auth_resp - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -403,9 +397,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_ms_timeout_cm_auth_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ms_timeout_paging - Total time passed: 0.000000 s - Location Update request causes a GSUP LU request to HLR @@ -713,9 +704,6 @@ llist_count(&msub_list) == 0 ===== test_ms_timeout_paging: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_classmark_update_timeout - Total time passed: 0.000000 s - Location Update request causes a GSUP Send Auth Info request to HLR @@ -866,9 +854,3 @@ lu_result_sent == 2 ===== test_classmark_update_timeout: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index a353949..755f463 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -456,9 +453,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_tmsi - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1147,9 +1141,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imei - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1400,9 +1391,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_tmsi_imei - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1688,9 +1676,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1911,9 +1896,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv_imei - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2145,9 +2127,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv_tmsi - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2615,9 +2594,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_imeisv_tmsi_imei - Location Update request causes an IMEISV ID request back to the MS MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2886,9 +2862,6 @@ llist_count(&msub_list) == 0 ===== test_no_authen_imeisv_tmsi_imei: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_no_authen_subscr_expire - Total time passed: 0.000000 s - Total time passed: 61.000000 s @@ -3023,9 +2996,3 @@ llist_count(&msub_list) == 0 ===== test_no_authen_subscr_expire: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 9faec63..b211fbf 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_2nd_conn - Location Update Request on one connection MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -191,9 +188,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_2nd_conn: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_lu_during_lu - Location Update Request MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -334,9 +328,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_lu_during_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_cm_during_lu - Location Update Request MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -482,9 +473,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_cm_during_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_paging_resp_during_lu - Location Update Request MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -624,9 +612,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_paging_resp_during_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_lu_during_cm @@ -864,9 +849,6 @@ llist_count(&msub_list) == 0 ===== test_reject_lu_during_cm: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_cm_during_cm @@ -1109,9 +1091,6 @@ llist_count(&msub_list) == 0 ===== test_reject_cm_during_cm: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_paging_resp_during_cm @@ -1338,9 +1317,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_reject_paging_resp_during_cm: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_lu_during_paging_resp @@ -1642,9 +1618,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 6) ===== test_reject_lu_during_paging_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_accept_cm_during_paging_resp @@ -1970,9 +1943,6 @@ llist_count(&msub_list) == 0 ===== test_accept_cm_during_paging_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_reject_paging_resp_during_paging_resp @@ -2271,9 +2241,3 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 6) ===== test_reject_paging_resp_during_paging_resp: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 5e44f31..f27108c 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_cm_service_without_lu - CM Service Request without a prior Location Updating MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ @@ -64,9 +61,6 @@ llist_count(&msub_list) == 0 ===== test_cm_service_without_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_two_lu - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -407,9 +401,6 @@ llist_count(&msub_list) == 0 ===== test_two_lu: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_lu_unknown_tmsi - Location Update request with unknown TMSI sends ID Request for IMSI MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -589,9 +580,3 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 (max total use count was 5) ===== test_lu_unknown_tmsi: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 3b324d3..e83cb01 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ss_ussd_mo_geran - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -240,9 +237,6 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_ss_ussd_mo_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_ss_ussd_no_geran - Location Update request causes a GSUP LU request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -506,9 +500,3 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_ss_ussd_no_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 42ed422..be858b5 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -1,7 +1,4 @@ DLMGCP MGCP client: using endpoint domain '@mgw' -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -607,9 +604,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1215,9 +1209,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_auth_ciph_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -1847,9 +1838,6 @@ llist_count(&msub_list) == 0 ===== test_umts_auth_ciph_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_resync_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2081,9 +2069,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_umts_authen_resync_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2315,9 +2300,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_umts_authen_resync_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_auth_ciph_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2559,9 +2541,6 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max total use count was 4) ===== test_umts_auth_ciph_resync_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_short_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2677,9 +2656,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_short_res_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_short_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2795,9 +2771,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_short_res_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_long_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -2913,9 +2886,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_long_res_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_too_long_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3031,9 +3001,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_too_long_res_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_only_sres_geran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3149,9 +3116,6 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_only_sres_geran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - ===== test_umts_authen_only_sres_utran - Location Update request causes a GSUP Send Auth Info request to HLR MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST @@ -3267,9 +3231,3 @@ llist_count(&msub_list) == 0 ===== test_umts_authen_only_sres_utran: SUCCESS -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - -full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 21 - diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 07a3927..87d1abd 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -45,6 +45,7 @@ #include "msc_vlr_tests.h" void *msc_vlr_tests_ctx = NULL; +void *msgb_ctx = NULL; bool _log_lines = false; @@ -1043,42 +1044,6 @@ fake_time_passes(0, 0); } -static void check_talloc(void *msgb_ctx, void *msc_vlr_tests_ctx) -{ - /* Verifying that the msgb context is empty */ - talloc_report_full(msgb_ctx, stderr); - /* Expecting these to stick around in msc_vlr_tests_ctx: - * full talloc report on 'msgb' (total 0 bytes in 1 blocks) - * talloc_total_blocks(tall_bsc_ctx) == 21 - * full talloc report on 'msc_vlr_tests_ctx' (total 6571 bytes in 21 blocks) - * struct osmo_gsup_client contains 264 bytes in 1 blocks (ref 0) 0x5605f2ea2e90 - * struct gsm_network contains 4806 bytes in 13 blocks (ref 0) 0x5605f2ea1b60 - * struct mgcp_client contains 688 bytes in 1 blocks (ref 0) 0x5605f2ea3200 - * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x5605f2ea3100 - * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x5605f2ea3000 - * struct gsup_client_mux contains 152 bytes in 2 blocks (ref 0) 0x5605f2ea2d20 - * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x5605f2ea2de0 - * struct vlr_instance contains 264 bytes in 2 blocks (ref 0) 0x5605f2ea2b40 - * struct osmo_nri_ranges contains 16 bytes in 1 blocks (ref 0) 0x5605f2ea2ca0 - * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x5605f2ea2ac0 - * stat_item.c:96 contains 144 bytes in 2 blocks (ref 0) 0x5605f2ea2950 - * stat_item.c:118 contains 96 bytes in 1 blocks (ref 0) 0x5605f2ea29f0 - * rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x5605f2ea1fb0 - * sms.db contains 7 bytes in 1 blocks (ref 0) 0x5605f2ea1f40 - * logging contains 1501 bytes in 5 blocks (ref 0) 0x5605f2ea1360 - * struct log_target contains 244 bytes in 2 blocks (ref 0) 0x5605f2ea1990 - * struct log_category contains 76 bytes in 1 blocks (ref 0) 0x5605f2ea1aa0 - * struct log_info contains 1256 bytes in 2 blocks (ref 0) 0x5605f2ea13d0 - * struct log_info_cat contains 1216 bytes in 1 blocks (ref 0) 0x5605f2ea1460 - * msgb contains 0 bytes in 1 blocks (ref 0) 0x5605f2ea12f0 - */ - fprintf(stderr, "talloc_total_blocks(tall_bsc_ctx) == %zu\n", - talloc_total_blocks(msc_vlr_tests_ctx)); - if (talloc_total_blocks(msc_vlr_tests_ctx) != 21) - talloc_report_full(msc_vlr_tests_ctx, stderr); - fprintf(stderr, "\n"); -} - static struct { bool verbose; int run_test_nr; @@ -1130,28 +1095,39 @@ } } -void *msgb_ctx = NULL; - static void run_tests(int nr) { int test_nr; - check_talloc(msgb_ctx, msc_vlr_tests_ctx); - nr--; /* arg's first test is 1, in here it's 0 */ for (test_nr = 0; msc_vlr_tests[test_nr]; test_nr++) { + size_t talloc_blocks_before_test; + if (nr >= 0 && test_nr != nr) continue; if (cmdline_opts.verbose) fprintf(stderr, "(test nr %d)\n", test_nr + 1); + talloc_blocks_before_test = talloc_total_blocks(msc_vlr_tests_ctx); + msc_vlr_tests[test_nr](); + if (talloc_total_blocks(msc_vlr_tests_ctx) != talloc_blocks_before_test) { + fprintf(stderr, "ERROR: talloc leak: %zu blocks\n", + talloc_total_blocks(msc_vlr_tests_ctx) - talloc_blocks_before_test); + talloc_report_full(msc_vlr_tests_ctx, stderr); + fprintf(stderr, "\n"); + } + + if (talloc_total_blocks(msgb_ctx) > 1) { + fprintf(stderr, "ERROR: msgb leak:\n"); + talloc_report_full(msgb_ctx, stderr); + fprintf(stderr, "\n"); + } + if (cmdline_opts.verbose) fprintf(stderr, "(test nr %d)\n", test_nr + 1); - - check_talloc(msgb_ctx, msc_vlr_tests_ctx); } } @@ -1256,6 +1232,5 @@ printf("Done\n"); - check_talloc(msgb_ctx, msc_vlr_tests_ctx); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8537fa76d460c951302932a1bad4299f7fe398c9 Gerrit-Change-Number: 22785 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:06:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:06:35 +0000 Subject: Change in osmo-bsc[master]: power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22767 ) Change subject: power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1c454f447d37cbc4d44b242dc4b2c62297ee3f67 Gerrit-Change-Number: 22767 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 09:06:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:07:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:07:17 +0000 Subject: Change in osmo-bsc[master]: power_control: enable Uplink DPC by default if format is known In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22768 ) Change subject: power_control: enable Uplink DPC by default if format is known ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Gerrit-Change-Number: 22768 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 09:07:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:07:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:07:30 +0000 Subject: Change in osmo-bsc[master]: power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22767 ) Change subject: power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() ...................................................................... power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() Change-Id: I1c454f447d37cbc4d44b242dc4b2c62297ee3f67 Related: SYS#4918 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 03b87b4..567b168 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5209,14 +5209,18 @@ { struct gsm_power_ctrl_params *params = vty->index; struct gsm_power_ctrl_meas_params *avg_params; + const struct gsm_bts *bts; -#if 0 - if (trx->bts->type != GSM_BTS_TYPE_OSMOBTS) { + if (params->dir == GSM_PWR_CTRL_DIR_UL) + bts = container_of(params, struct gsm_bts, ms_power_ctrl); + else + bts = container_of(params, struct gsm_bts, bs_power_ctrl); + + if (bts->type != GSM_BTS_TYPE_OSMOBTS) { vty_out(vty, "%% EWMA is an OsmoBTS specific algorithm, " "it's not usable for other BTS types%s", VTY_NEWLINE); return CMD_WARNING; } -#endif avg_params = POWER_CONTROL_MEAS_AVG_PARAMS(params); avg_params->algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1c454f447d37cbc4d44b242dc4b2c62297ee3f67 Gerrit-Change-Number: 22767 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:07:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:07:30 +0000 Subject: Change in osmo-bsc[master]: power_control: enable Uplink DPC by default if format is known In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22768 ) Change subject: power_control: enable Uplink DPC by default if format is known ...................................................................... power_control: enable Uplink DPC by default if format is known So far osmo-bsc would enable Uplink DPC (Dynamic Power Control) only for osmo-bts, and the 'static' mode for all other BTS models. This decision dates back to the time when ip.access specific encoding for dynamic power control parameters was not implemented, and the MS Power Parameters IE was sent empty in the RSL messages. Let's make a step forward by enabling Uplink DPC by default for all BTS models which declare the API for vendor-specific encoding of the power control parameters. Currently this includes osmo-bts and nanoBTS, both supporting ip.access specific format. Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Related: SYS#4918 --- M doc/manuals/chapters/power_control.adoc M src/osmo-bsc/bts.c 2 files changed, 8 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc index 5de2b9c..dbe2d13 100644 --- a/doc/manuals/chapters/power_control.adoc +++ b/doc/manuals/chapters/power_control.adoc @@ -117,8 +117,10 @@ <2> Send both RSL MS/BS Power IE and vendor-specific MS/BS Power Parameters IE. <3> Do not send any power control IEs in RSL CHANnel ACTIVation messages. -By default, `static` mode is used for BS power control, while `dyn-bts` is used -for MS power control. Changing the mode at run-time would not affect already +By default, `static` mode is used for BS power control, while `dyn-bts` mode is +automatically enabled for MS power control if vendor-specific format of the power +control parameters (see above) is implemented for particular BTS model. Otherwise +`static` mode is used too. Changing the mode at run-time would not affect already established connections, only the new ones (check flag `l`). For BS power control, there is an additional parameter: diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index ac0e2af..628d301 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -522,9 +522,6 @@ switch (bts->type) { case GSM_BTS_TYPE_OSMOBTS: - /* Enable dynamic Uplink power control by default */ - bts->ms_power_ctrl.mode = GSM_PWR_CTRL_MODE_DYN_BTS; - /* fall-through */ case GSM_BTS_TYPE_NANOBTS: /* Set the default OML Stream ID to 0xff */ bts->oml_tei = 0xff; @@ -543,6 +540,10 @@ break; } + /* Enable dynamic Uplink power control by default (if supported) */ + if (model->power_ctrl_enc_rsl_params != NULL) + bts->ms_power_ctrl.mode = GSM_PWR_CTRL_MODE_DYN_BTS; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86d27d4332af3d82f862737340d061e42e34eba Gerrit-Change-Number: 22768 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:07:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:07:58 +0000 Subject: Change in osmo-bsc[master]: power_control: make P_CON_INTERVAL parameter configurable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22779 ) Change subject: power_control: make P_CON_INTERVAL parameter configurable ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Gerrit-Change-Number: 22779 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 09:07:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:08:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:08:19 +0000 Subject: Change in osmo-bts[master]: power_control: cosmetic: fix swapped {L, U}_RXQUAL_XX_P comments In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22782 ) Change subject: power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2fe198f9275f4e5407ad6fdfa68d4fa7d603e333 Gerrit-Change-Number: 22782 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 09:08:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:09:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:09:15 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22781 ) Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 09:09:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:12:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:12:53 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... Patch Set 2: I'm still not convinced why this is a good idea. How many of those ACK/NACKs do we need to send per second in order to be optimizing it? Why can additional IEs not be added toa copy? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 09:12:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:41:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 09:41:05 +0000 Subject: Change in libosmo-sccp[master]: m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22773 ) Change subject: m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6 Gerrit-Change-Number: 22773 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 09:41:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:45:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 09:45:46 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Add xua_msg*_get_str() to obtain string IE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 ) Change subject: xua_msg: Add xua_msg*_get_str() to obtain string IE ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22772/1/src/xua_msg.c File src/xua_msg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22772/1/src/xua_msg.c at 306 PS1, Line 306: /* RFC3868 3.9.4: Length of the INFO String parameter is from 0 to 255 octets */ It may make sense to have this 256 as a define in some include, having reference to this spec. https://gerrit.osmocom.org/c/libosmo-sccp/+/22772/1/src/xua_msg.c at 319 PS1, Line 319: return NULL; does it make sense returning NULL here? or ""? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 Gerrit-Change-Number: 22772 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 09:45:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:47:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 09:47:06 +0000 Subject: Change in libosmo-sccp[master]: Introduce osmo_ss7_asp_get_log_subsys() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22774 ) Change subject: Introduce osmo_ss7_asp_get_log_subsys() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7c015b3a2727deff4fc4e6f3bc7bdeeb57e86166 Gerrit-Change-Number: 22774 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 09:47:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 09:48:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 09:48:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 to look at the new patch set (#3). Change subject: stp: Ignore M3UA SSNM messages in tests ...................................................................... stp: Ignore M3UA SSNM messages in tests The tests were written without considering the arrival of such messages; however, it is well within the M3UA spec that such messages appear at any time indicating remote point code availability etc. In libosmo-sccp.git Id92be4691b0fd77598a6edb642c028bbd8c5b623 we start generating those messages in osmo-stp. Let's ignore them in the tests to avoid unexpected failures. Later on, we likely will introduce / adapt tests to actually expect those messages whenever appropriate. Change-Id: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Related: OS#2623 --- M library/M3UA_Templates.ttcn M stp/STP_Tests_M3UA.ttcn 2 files changed, 221 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/22783/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 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: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Gerrit-Change-Number: 22783 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:02:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:02:19 +0000 Subject: Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 ) Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22775/1/src/xua_shared.c File src/xua_shared.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22775/1/src/xua_shared.c at 67 PS1, Line 67: * \returns 0 in case of success; M3UA_ERR_* code in case of error. */ M3UA_ERR_*/SUA_ERR_* -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:02:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:03:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:03:21 +0000 Subject: Change in libosmo-sccp[master]: SUA: Verify routing context IE of incoming CL and CO messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 ) Change subject: SUA: Verify routing context IE of incoming CL and CO messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 Gerrit-Change-Number: 22776 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:03:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:20:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:20:38 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 1: (10 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1//COMMIT_MSG at 10 PS1, Line 10: SG informs the ASP about certain desetinations (point codes) becoming destinations https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 777 PS1, Line 777: xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * 4, (const uint8_t *)rctx); * sizeof(*rctx) would be clearer. https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 779 PS1, Line 779: xua_msg_add_data(xua, M3UA_IEI_AFFECTED_PC, num_aff_pc * 4, (const uint8_t *) aff_pc); same for aff_pc https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 817 PS1, Line 817: //struct xua_msg *m3ua_encode_dupu() { } This line can be dropped? https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 820 PS1, Line 820: * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. typo: which https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 825 PS1, Line 825: * \param[in] info_string optional information strng (can be NULL). typo: string https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 826 PS1, Line 826: * \param[in] available are aff_pc now available (true) or unavailable (false */ false) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c at 57 PS1, Line 57: out = talloc_asprintf_append(out, "%s%s/%u, ", i == 0 ? "" : ", ", I assume this frees+malloc new string? https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c at 70 PS1, Line 70: llist_for_each_entry(as, &asp->inst->as_list, list) { You are missing buffer overflow check against rctx_size here. https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c at 118 PS1, Line 118: /* this can happen if the given ASP is only in the as that reports the change, AS -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:20:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:28:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:28:40 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22778/1/src/sccp_internal.h File src/sccp_internal.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/22778/1/src/sccp_internal.h at 139 PS1, Line 139: /* SCCP MAnagement (SCMG) */ Management -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:28:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:34:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:34:59 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22781 ) Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22781/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/22781/3//COMMIT_MSG at 8 PS3, Line 8: SOme further description here would be nice. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:34:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:37:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:37:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 ) Change subject: stp: Less magic numbers; centralize M3UA configuration ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784/3/stp/STP_Tests_M3UA.ttcn File stp/STP_Tests_M3UA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784/3/stp/STP_Tests_M3UA.ttcn at 53 PS3, Line 53: /* as-reeiver: Two ASP within AS */ receiver -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:37:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:37:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:37:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Time out after 5s if expected M3UA doesn't arrive In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 ) Change subject: stp: Time out after 5s if expected M3UA doesn't arrive ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 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: I279aacf2215ccd63a6e52c6a71cda3b500a3795c Gerrit-Change-Number: 22786 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:37:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:39:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 10:39:13 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Add xua_msg*_get_str() to obtain string IE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 ) Change subject: xua_msg: Add xua_msg*_get_str() to obtain string IE ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22772/1/src/xua_msg.c File src/xua_msg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22772/1/src/xua_msg.c at 306 PS1, Line 306: /* RFC3868 3.9.4: Length of the INFO String parameter is from 0 to 255 octets */ > It may make sense to have this 256 as a define in some include, having reference to this spec. as we only use it here, in this function, and the comment is just three lines below, I wouldn't bother. https://gerrit.osmocom.org/c/libosmo-sccp/+/22772/1/src/xua_msg.c at 319 PS1, Line 319: return NULL; > does it make sense returning NULL here? or ""? I wanted to distinguish the situation where an empty tring was received, or no IE was present at all. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 Gerrit-Change-Number: 22772 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:39:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:40:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:40:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Introduce M3UA SSNM tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 ) Change subject: stp: Introduce M3UA SSNM tests ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 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: I5074dccde9940956439235e8d02e6a722b8da5f5 Gerrit-Change-Number: 22787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:40:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:40:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 10:40:41 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Add xua_msg*_get_str() to obtain string IE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 ) Change subject: xua_msg: Add xua_msg*_get_str() to obtain string IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 Gerrit-Change-Number: 22772 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:40:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:40:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 10:40:46 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Add xua_msg*_get_str() to obtain string IE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 ) Change subject: xua_msg: Add xua_msg*_get_str() to obtain string IE ...................................................................... xua_msg: Add xua_msg*_get_str() to obtain string IE We copy the contents to a static thread-local buffer to ensure zero termination of the string received by a remote entity. Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 25 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index a2cdbf2..329ba96 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -91,6 +91,8 @@ int xua_msg_add_u32(struct xua_msg *xua, uint16_t iei, uint32_t val); uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part); uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei); +const char *xua_msg_part_get_str(const struct xua_msg_part *part); +const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei); void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt); int xua_msg_add_sccp_addr(struct xua_msg *xua, uint16_t iei, const struct osmo_sccp_addr *addr); diff --git a/src/xua_msg.c b/src/xua_msg.c index 79c358c..42c580d 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -297,6 +297,29 @@ return xua_msg_part_get_u32(part); } +const char *xua_msg_part_get_str(const struct xua_msg_part *part) +{ + static char __thread buf[256]; + + if (part->len == 0) + return ""; + /* RFC3868 3.9.4: Length of the INFO String parameter is from 0 to 255 octets */ + if (part->len > 255) + return ""; + + memcpy(buf, part->dat, part->len); + buf[part->len] = '\0'; + return buf; +} + +const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei) +{ + struct xua_msg_part *part = xua_msg_find_tag(xua, iei); + if (!part) + return NULL; + return xua_msg_part_get_str(part); +} + void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt) { uint16_t *len_ptr; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8cbb7aeaf0cb64db0ce01c21e5fca9ab3cd932b6 Gerrit-Change-Number: 22772 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:40:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 10:40:47 +0000 Subject: Change in libosmo-sccp[master]: Introduce osmo_ss7_asp_get_log_subsys() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22774 ) Change subject: Introduce osmo_ss7_asp_get_log_subsys() ...................................................................... Introduce osmo_ss7_asp_get_log_subsys() This will allow us to write generic code that uses DLM3UA/DSUA depending on the ASP protocol. Change-Id: I7c015b3a2727deff4fc4e6f3bc7bdeeb57e86166 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 2b4090e..a2263a2 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -451,6 +451,7 @@ int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp); int osmo_ss7_asp_use_default_lm(struct osmo_ss7_asp *asp, int log_level); bool osmo_ss7_asp_active(const struct osmo_ss7_asp *asp); +int osmo_ss7_asp_get_log_subsys(const struct osmo_ss7_asp *asp); /*! Weak function to handle payload for unknown/unsupported PPID or IPA StreamID. * This function can be overridden by application code to implement whatever handling diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 2753063..e549708 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -2258,6 +2258,19 @@ return 0; } +/*! Get the logging subsystem for a given ASP. Used by generic code. */ +int osmo_ss7_asp_get_log_subsys(const struct osmo_ss7_asp *asp) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + return DLM3UA; + case OSMO_SS7_ASP_PROT_SUA: + return DLSUA; + default: + return DLSS7; + } +} + /*! Register a call-back function for unknown SCTP PPID / IPA Stream ID */ void osmo_ss7_register_rx_unknown_cb(osmo_ss7_asp_rx_unknown_cb *cb) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7c015b3a2727deff4fc4e6f3bc7bdeeb57e86166 Gerrit-Change-Number: 22774 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:41:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 10:41:03 +0000 Subject: Change in libosmo-sccp[master]: m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22773 ) Change subject: m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup ...................................................................... m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup Let's factor-out the lookup of the AS into the separate function find_as_for_asp(). This enables us to reuse this code in upcoming support for SNM messages. Change-Id: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6 --- M src/m3ua.c 1 file changed, 42 insertions(+), 29 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/m3ua.c b/src/m3ua.c index 08a89b5..542777e 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -533,7 +533,7 @@ } /* if given ASP only has one AS, return that AS */ -static struct osmo_ss7_as *find_single_as_for_asp(struct osmo_ss7_asp *asp) +static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) { struct osmo_ss7_as *as, *as_found = NULL; @@ -549,11 +549,49 @@ return as_found; } +static int find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, + const struct xua_msg_part *rctx_ie) +{ + *as = NULL; + + if (rctx_ie) { + uint32_t rctx = xua_msg_part_get_u32(rctx_ie); + /* Use routing context IE to look up the AS for which the + * message was received. */ + *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); + if (!*as) { + LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n", + __func__, rctx); + return M3UA_ERR_INVAL_ROUT_CTX; + } + + /* Verify that this ASP is part of the AS. */ + if (!osmo_ss7_as_has_asp(*as, asp)) { + LOGPASP(asp, DLM3UA, LOGL_ERROR, + "%s(): This Application Server Process is not part of the AS %s " + "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx); + return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; + } + } else { + /* no explicit routing context; this only works if there is only one AS in the ASP */ + *as = find_single_as_for_asp(asp); + if (!*as) { + LOGPASP(asp, DLM3UA, LOGL_ERROR, + "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " + "identify the AS for this message\n", __func__); + return M3UA_ERR_INVAL_ROUT_CTX; + } + } + + return 0; +} + static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua) { struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); struct m3ua_data_hdr *dh; struct osmo_ss7_as *as; + int rc; LOGPASP(asp, DLM3UA, LOGL_DEBUG, "m3ua_rx_xfer\n"); @@ -565,34 +603,9 @@ return M3UA_ERR_UNSUPP_MSG_TYPE; } - if (rctx_ie) { - uint32_t rctx = xua_msg_part_get_u32(rctx_ie); - /* Use routing context IE to look up the AS for which the - * message was received. */ - as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); - if (!as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n", - __func__, rctx); - return M3UA_ERR_INVAL_ROUT_CTX; - } - - /* Verify that this ASP is part of the AS. */ - if (!osmo_ss7_as_has_asp(as, asp)) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): This Application Server Process is not part of the AS %s " - "resolved by routing context %u\n", __func__, (as)->cfg.name, rctx); - return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; - } - } else { - /* no explicit routing context; this only works if there is only one AS in the ASP */ - as = find_single_as_for_asp(asp); - if (!as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " - "identify the AS for this message\n", __func__); - return M3UA_ERR_INVAL_ROUT_CTX; - } - } + rc = find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; /* FIXME: check for AS state == ACTIVE */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6 Gerrit-Change-Number: 22773 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:43:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:43:01 +0000 Subject: Change in osmo-bsc[master]: power_control: make P_CON_INTERVAL parameter configurable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22779 ) Change subject: power_control: make P_CON_INTERVAL parameter configurable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Gerrit-Change-Number: 22779 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:43:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:45:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 8 Feb 2021 10:45:30 +0000 Subject: Change in osmo-ci[master]: repo-install-test: run on all build slaves again References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again ...................................................................... repo-install-test: run on all build slaves again It was not possible to reproduce the weird rpm errors on admin2-deb9build, which had lead to limiting the build slaves to build2-deb9build-ansible. Enable building on all again. Closes: OS#4567 Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba --- M jobs/repo-install-test.yml 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/88/22788/1 diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 425357d..64b66cb 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -40,11 +40,6 @@ default: 'master' axes: - axis: - type: slave - name: label - # Force using "build2-deb9build-ansible": https://osmocom.org/issues/4563#note-10 - values: !!python/tuple [build2-deb9build-ansible] - - axis: type: user-defined name: feed values: '{obj:feeds}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 10:54:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 10:54:05 +0000 Subject: Change in osmo-ci[master]: repo-install-test: run on all build slaves again In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 10:54:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:00:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 8 Feb 2021 11:00:09 +0000 Subject: Change in osmo-bsc[master]: power_control: make P_CON_INTERVAL parameter configurable In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22779 ) Change subject: power_control: make P_CON_INTERVAL parameter configurable ...................................................................... power_control: make P_CON_INTERVAL parameter configurable Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Related: SYS#4918 --- M doc/manuals/chapters/power_control.adoc M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M tests/power_ctrl.vty 5 files changed, 73 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc index dbe2d13..4c1a275 100644 --- a/doc/manuals/chapters/power_control.adoc +++ b/doc/manuals/chapters/power_control.adoc @@ -88,6 +88,7 @@ ... . l. mode (static|dyn-bts) [reset] . l. bs-power (static|dyn-max) <0-30> + . lv ctrl-interval <0-31> . lv step-size inc <2-6> red <2-4> . lv rxlev-thresh lower <0-63> upper <0-63> . lv rxqual-thresh lower <0-7> upper <0-7> @@ -135,6 +136,27 @@ and a fixed power reduction value in `static` mode. In the later case, no attenuation (0 dB) is applied by default (full power). +==== Power control interval + +Having requested a transmit power level, the MS/BS power control loop may optionally +by suspended for a certain number of SACCH multiframes defined by VTY parameter +`ctrl-interval`. Given that SACCH is relatively slow and transmission of a data block +takes 480 ms, suspension allows an observation of the effect of one power control +decision before initiating the next one. + +---- +OsmoBSC(config-bs-power-ctrl)# ctrl-interval ? + <0-31> P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds) +---- + +By default, the suspension interval is set to 0 for both MS/BS power control loops, +therefore the power control decision is taken every 480 ms (one SACCH block period). +Setting `ctrl-interval` to 1 increases the interval to 960 ms, so basically every +second Uplink SACCH block is skipped; value 2 corresponds to the interval of +1920 ms, so 3/4 received SACCH blocks are skipped. + +3GPP TS 45.008 briefly mentiones this parameter in table A.1 (P_Con_INTERVAL). + ==== Power change step size In order to slow down the reactivity of the power control loop and thus make it more @@ -302,7 +324,6 @@ <4> Osmocom specific EWMA is applied to RxQual values with smoothing factor = 50% (beta=0.5). <5> RxQual: Hreqave and Hreqt values: 2 out of 3 SACCH blocks produce an averaged measurement. -// TODO: Document P_Con_INTERVAL (not implemented yet) // TODO: Document other power control parameters: // OsmoBSC(config-net-bts)# ms max power <0-40> // OsmoBSC(config-net-bts-trx)# max_power_red <0-100> diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index edfae26..af1c8e8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1346,6 +1346,9 @@ uint8_t inc_step_size_db; /* increasing direction */ uint8_t red_step_size_db; /* reducing direction */ + /* Minimum interval between power level changes */ + uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ + /* Measurement averaging parameters for RxLev & RxQual */ struct gsm_power_ctrl_meas_params rxqual_meas; struct gsm_power_ctrl_meas_params rxlev_meas; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 567b168..26941e2 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -957,6 +957,8 @@ if (cp->dir == GSM_PWR_CTRL_DIR_DL) cfg_out(" bs-power dyn-max %u%s", cp->bs_power_max_db, VTY_NEWLINE); + if (cp->ctrl_interval > 0) + cfg_out(" ctrl-interval %u%s", cp->ctrl_interval, VTY_NEWLINE); cfg_out(" step-size inc %u red %u%s", cp->inc_step_size_db, cp->red_step_size_db, VTY_NEWLINE); @@ -4938,6 +4940,21 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_power_ctrl_ctrl_interval, + cfg_power_ctrl_ctrl_interval_cmd, + X(BSC_VTY_ATTR_VENDOR_SPECIFIC) | + X(BSC_VTY_ATTR_NEW_LCHAN), + "ctrl-interval <0-31>", + "Set power control interval (for dynamic mode)\n" + "P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds)\n") +{ + struct gsm_power_ctrl_params *params = vty->index; + + params->ctrl_interval = atoi(argv[0]); + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_power_ctrl_step_size, cfg_power_ctrl_step_size_cmd, X(BSC_VTY_ATTR_VENDOR_SPECIFIC) | @@ -7742,6 +7759,7 @@ install_node(&power_ctrl_node, dummy_config_write); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_mode_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_bs_power_cmd); + install_element(POWER_CTRL_NODE, &cfg_power_ctrl_ctrl_interval_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_step_size_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxlev_thresh_cmd); install_element(POWER_CTRL_NODE, &cfg_power_ctrl_rxqual_thresh_cmd); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 7076908..16fa201 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -896,8 +896,8 @@ thresh_comp->p4 = cp->rxqual_meas.upper_cmp_p & 0x1f; thresh_comp->n4 = cp->rxqual_meas.upper_cmp_n & 0x1f; - /* FIXME: TIMER_PWR_CON_INTERVAL (P_Con_INTERVAL) */ - thresh_comp->pc_interval = 0; /* 0 .. 30 seconds */ + /* Minimum interval between power level changes (P_CON_INTERVAL) */ + thresh_comp->pc_interval = cp->ctrl_interval; /* Change step limitations: POWER_{INC,RED}_STEP_SIZE */ thresh_comp->inc_step_size = cp->inc_step_size_db & 0x0f; diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty index 7e4382a..ff387ce 100644 --- a/tests/power_ctrl.vty +++ b/tests/power_ctrl.vty @@ -29,6 +29,7 @@ ... . l. mode (static|dyn-bts) [reset] . l. bs-power (static|dyn-max) <0-30> + . lv ctrl-interval <0-31> . lv step-size inc <2-6> red <2-4> . lv rxlev-thresh lower <0-63> upper <0-63> . lv rxqual-thresh lower <0-7> upper <0-7> @@ -83,12 +84,23 @@ mode dyn-bts ... !bs-power +OsmoBSC(config-bs-power-ctrl)# ctrl-interval 31 +OsmoBSC(config-bs-power-ctrl)# show running-config +... + bs-power-control +... + ctrl-interval 31 +... !ctrl-interval + ms-power-control +... !ctrl-interval + OsmoBSC(config-bs-power-ctrl)# exit OsmoBSC(config-net-bts)# ms-power-control OsmoBSC(config-ms-power-ctrl)# list with-flags ... . l. mode (static|dyn-bts) [reset] . l. bs-power (static|dyn-max) <0-30> + . lv ctrl-interval <0-31> . lv step-size inc <2-6> red <2-4> . lv rxlev-thresh lower <0-63> upper <0-63> . lv rxqual-thresh lower <0-7> upper <0-7> @@ -119,6 +131,20 @@ OsmoBSC(config-ms-power-ctrl)# bs-power dyn-max 30 % This command is only valid for 'bs-power-control' node +OsmoBSC(config-ms-power-ctrl)# ctrl-interval 2 +OsmoBSC(config-ms-power-ctrl)# show running-config +... + bs-power-control + mode dyn-bts +... + ctrl-interval 31 +... !ctrl-interval + ms-power-control + mode dyn-bts +... + ctrl-interval 2 +... !ctrl-interval + OsmoBSC(config-ms-power-ctrl)# step-size inc 5 red 4 % Power change step size must be an even number OsmoBSC(config-ms-power-ctrl)# step-size inc 2 red 3 @@ -131,11 +157,12 @@ ... bs-power-control mode dyn-bts - bs-power dyn-max 30 +... step-size inc 4 red 2 ... ms-power-control mode dyn-bts +... step-size inc 6 red 4 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6e0fae81cc60f708e49d5eb8dfc0bbcad926b18f Gerrit-Change-Number: 22779 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:01:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 11:01:13 +0000 Subject: Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 to look at the new patch set (#2). Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() ...................................................................... m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() This way the function can be re-used by SUA. Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 --- M src/Makefile.am M src/m3ua.c M src/xua_internal.h A src/xua_shared.c 4 files changed, 108 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/75/22775/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:01:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 11:01:13 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 to look at the new patch set (#2). Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... xua: Implement SNM availability/unavailability messaging M3UA and SUA have one sub-protocol called [S]SNM, through which the SG informs the ASP about certain destinations (point codes) becoming available (DAVA) or unavailable (DUNA) in the SS7 network. This patch adds support for * generating DAVA/DUAN on a SGP when the AS FSM changes to/from AS-ACTIVE * receiving DAVA/DUNA on an ASP and informing other "SG role" AS/ASP * processing DAUD from ASP received by SG, generating relate DAVA/DUNA responses Related: OS#2623 Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 --- M src/Makefile.am M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_internal.h A src/xua_snm.c 6 files changed, 552 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/77/22777/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:01:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 11:01:22 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 2: (9 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1//COMMIT_MSG at 10 PS1, Line 10: SG informs the ASP about certain desetinations (point codes) becoming > destinations Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 777 PS1, Line 777: xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * 4, (const uint8_t *)rctx); > * sizeof(*rctx) would be clearer. Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 779 PS1, Line 779: xua_msg_add_data(xua, M3UA_IEI_AFFECTED_PC, num_aff_pc * 4, (const uint8_t *) aff_pc); > same for aff_pc Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 817 PS1, Line 817: //struct xua_msg *m3ua_encode_dupu() { } > This line can be dropped? Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 820 PS1, Line 820: * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. > typo: which Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 825 PS1, Line 825: * \param[in] info_string optional information strng (can be NULL). > typo: string Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c at 57 PS1, Line 57: out = talloc_asprintf_append(out, "%s%s/%u, ", i == 0 ? "" : ", ", > I assume this frees+malloc new string? it performs talloc_realloc() internally as needed. https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c at 70 PS1, Line 70: llist_for_each_entry(as, &asp->inst->as_list, list) { > You are missing buffer overflow check against rctx_size here. Ack https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/xua_snm.c at 118 PS1, Line 118: /* this can happen if the given ASP is only in the as that reports the change, > AS Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:01:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:02:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 11:02:35 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 to look at the new patch set (#2). Change subject: sccp: Notify users of point code available/unavailable ...................................................................... sccp: Notify users of point code available/unavailable * add N-PCSTATE.ind and N-STATE.ind definitions to SCCP user SAP * add minimal SCMG (SCCP Management) and LBCS (Local Broadcast) * generate MTP-PAUSE.ind/MTP-RESUME.ind based on received xUA DUNA/DAVA * generate N-PCSTATE.ind towards the local SCCP users Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Related: OS#2623, OS#3403, OS#4701 --- M include/osmocom/sigtran/sccp_sap.h M src/Makefile.am M src/sccp_internal.h A src/sccp_lbcs.c A src/sccp_scmg.c M src/xua_snm.c 6 files changed, 232 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/78/22778/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:02:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 11:02:42 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22778/1/src/sccp_internal.h File src/sccp_internal.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/22778/1/src/sccp_internal.h at 139 PS1, Line 139: /* SCCP MAnagement (SCMG) */ > Management Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:02:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:09:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 8 Feb 2021 11:09:09 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22781 ) Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22781/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/22781/3//COMMIT_MSG at 8 PS3, Line 8: > SOme further description here would be nice. I am planning to add some a small chapter about power control to the user manual. For now, description of this parameter can be found in the OsmoBSC manual. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:09:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:09:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 8 Feb 2021 11:09:24 +0000 Subject: Change in osmo-bts[master]: power_control: cosmetic: fix swapped {L, U}_RXQUAL_XX_P comments In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22782 ) Change subject: power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments ...................................................................... power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments Change-Id: I2fe198f9275f4e5407ad6fdfa68d4fa7d603e333 Related: SYS#4918 --- M src/common/gsm_data.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index b3f9f2d..7cf48bf 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -441,8 +441,8 @@ /* RxQual measurement parameters */ .rxqual_meas = { /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */ - .lower_thresh = 3, /* U_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ - .upper_thresh = 0, /* L_RXQUAL_XX_P (BER < 0.2%) */ + .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ + .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */ /* FIXME: RxQual averaging is not yet implemented */ .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2fe198f9275f4e5407ad6fdfa68d4fa7d603e333 Gerrit-Change-Number: 22782 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:09:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 8 Feb 2021 11:09:24 +0000 Subject: Change in osmo-bts[master]: power_control: implement handling of P_Con_INTERVAL parameter In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22781 ) Change subject: power_control: implement handling of P_Con_INTERVAL parameter ...................................................................... power_control: implement handling of P_Con_INTERVAL parameter Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Related: SYS#4918 --- M include/osmo-bts/gsm_data.h M src/common/power_control.c M src/common/rsl.c M src/common/vty.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok M tests/power/ms_power_loop_test.c M tests/power/ms_power_loop_test.err M tests/power/ms_power_loop_test.ok 10 files changed, 320 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 8071a28..05b6cf2 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -201,6 +201,9 @@ /* MS/BS Power Control parameters */ struct gsm_power_ctrl_params { + /* Minimum interval between power level changes */ + uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ + /* Power change step size (maximum) */ uint8_t inc_step_size_db; /* increasing direction */ uint8_t red_step_size_db; /* reducing direction */ @@ -231,6 +234,8 @@ const struct gsm_power_ctrl_params *dpc_params; /* Measurement pre-processing state (for dynamic mode) */ struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; + /* Number of SACCH blocks to skip (for dynamic mode) */ + int skip_block_num; /* Depending on the context (MS or BS power control), fields 'current' and 'max' * reflect either the MS power level (magic numbers), or BS Power reduction level diff --git a/src/common/power_control.c b/src/common/power_control.c index be74a41..4f5d15e 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -1,7 +1,8 @@ /* MS Power Control Loop L1 */ /* (C) 2014 by Holger Hans Peter Freyther - * Contributions by sysmocom - s.m.f.c. GmbH + * (C) 2020-2021 by sysmocom - s.m.f.c. GmbH + * Author: Vadim Yanitskiy * * All Rights Reserved * @@ -160,6 +161,17 @@ if (params == NULL) return 0; + /* Power control interval: how many blocks do we skip? */ + if (state->skip_block_num-- > 0) + return 0; + + /* Reset the number of SACCH blocks to be skipped: + * ctrl_interval=0 => 0 blocks to skip, + * ctrl_interval=1 => 1 blocks to skip, + * ctrl_interval=2 => 3 blocks to skip, + * so basically ctrl_interval * 2 - 1. */ + state->skip_block_num = params->ctrl_interval * 2 - 1; + ms_dbm = ms_pwr_dbm(band, ms_power_lvl); if (ms_dbm < 0) { LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, @@ -265,6 +277,17 @@ lchan->tch.dtx.dl_active ? "enabled" : "disabled", lchan->tch.dtx.dl_active ? "SUB" : "FULL"); + /* Power control interval: how many blocks do we skip? */ + if (state->skip_block_num-- > 0) + return 0; + + /* Reset the number of SACCH blocks to be skipped: + * ctrl_interval=0 => 0 blocks to skip, + * ctrl_interval=1 => 1 blocks to skip, + * ctrl_interval=2 => 3 blocks to skip, + * so basically ctrl_interval * 2 - 1. */ + state->skip_block_num = params->ctrl_interval * 2 - 1; + /* If DTx is active on Downlink, use the '-SUB' */ if (lchan->tch.dtx.dl_active) { rxqual = rxqual_sub; diff --git a/src/common/rsl.c b/src/common/rsl.c index bde53a1..3023ffa 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -763,7 +763,8 @@ params->rxqual_meas.upper_cmp_p = thresh_comp->p4; params->rxqual_meas.upper_cmp_n = thresh_comp->n4; - /* FIXME: TIMER_PWR_CON_INTERVAL (P_Con_INTERVAL) */ + /* Minimum interval between power level changes (P_Con_INTERVAL) */ + params->ctrl_interval = thresh_comp->pc_interval; /* Power increase / reduce step size: POWER_{INC,RED}_STEP_SIZE */ params->inc_step_size_db = thresh_comp->inc_step_size; diff --git a/src/common/vty.c b/src/common/vty.c index 9dd0c1a..f36c09e 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1269,6 +1269,11 @@ static void dump_dpc_params(struct vty *vty, const unsigned int indent, const struct gsm_power_ctrl_params *cp) { + cfg_out(vty, "Power control interval: %u ms (every %u SACCH block(s))%s", + cp->ctrl_interval ? cp->ctrl_interval * 2 * 480 : 480, + cp->ctrl_interval ? cp->ctrl_interval * 2 : 1, + VTY_NEWLINE); + cfg_out(vty, "Power increase step size: %u%s", cp->inc_step_size_db, VTY_NEWLINE); cfg_out(vty, "Power reduce step size: %u%s", diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 5271324..6f5f2bf 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -1,5 +1,5 @@ /* - * (C) 2020 by sysmocom - s.m.f.c. GmbH + * (C) 2020-2021 by sysmocom - s.m.f.c. GmbH * Author: Vadim Yanitskiy * * All Rights Reserved @@ -56,6 +56,7 @@ PWR_TEST_ST_IND_MEAS = 0, PWR_TEST_ST_IND_DUMMY, PWR_TEST_ST_SET_STATE, + PWR_TEST_ST_SET_CTRL_INTERVAL, PWR_TEST_ST_SET_STEP_SIZE, PWR_TEST_ST_SET_RXLEV_PARAMS, PWR_TEST_ST_ENABLE_DTXD, @@ -84,6 +85,8 @@ uint8_t inc; uint8_t red; } step_size; + /* Power control interval */ + uint8_t ctrl_interval; }; /* Expected Tx power reduction */ uint8_t exp_txred; @@ -159,6 +162,11 @@ printf("#%02u %s() <- Dynamic power control is disabled\n", n, __func__); lchan->bs_power_ctrl.dpc_params = NULL; return 0; /* we're done */ + case PWR_TEST_ST_SET_CTRL_INTERVAL: + printf("#%02u %s() <- (Re)set power control interval: %u -> %u\n", + n, __func__, lchan->bs_dpc_params.ctrl_interval, step->ctrl_interval); + lchan->bs_dpc_params.ctrl_interval = step->ctrl_interval; + return 0; /* we're done */ case PWR_TEST_ST_SET_STEP_SIZE: printf("#%02u %s() <- Set step size: inc %u dB, red %u dB\n", n, __func__, step->step_size.inc, step->step_size.red); @@ -411,6 +419,49 @@ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, }; +/* Verify handling of optional power control interval (P_Con_INTERVAL). */ +static const struct power_test_step TC_ctrl_interval[] = { + /* Initial state: 0 dB, up to 20 dB */ + { .type = PWR_TEST_ST_SET_STATE, + .state = { .current = 0, .max = 2 * 10 } }, + + /* P_Con_INTERVAL=0 (480 ms): every SACCH block is handled */ + { .type = PWR_TEST_ST_SET_CTRL_INTERVAL, .ctrl_interval = 0 }, + + /* MS indicates high RxLev values (-50 dBm), red step is 2 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 2 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 6 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 }, + + /* MS indicates low RxLev values (-100 dBm), inc step is 4 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, + + /* P_Con_INTERVAL=1 (960 ms): 1 out of 2 SACCH blocks is handled */ + { .type = PWR_TEST_ST_SET_CTRL_INTERVAL, .ctrl_interval = 1 }, + + /* MS indicates high RxLev values (-50 dBm), red step is 2 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 2 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 2 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 6 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 6 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 }, + { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 }, /* skipped */ + + /* P_Con_INTERVAL=2 (1920 ms): 1 out of 4 SACCH blocks is handled */ + { .type = PWR_TEST_ST_SET_CTRL_INTERVAL, .ctrl_interval = 2 }, + + /* MS indicates low RxLev values (-100 dBm), inc step is 4 dB */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 4 }, /* skipped */ + { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, +}; + /* Verify that small deviations from the target do not trigger any changes. */ static const struct power_test_step TC_rxlev_hyst[] = { /* Initial state: 16 dB, up to 20 dB */ @@ -488,6 +539,7 @@ exec_test(TC_dtxd_mode); exec_test(TC_rxqual_ber); exec_test(TC_inval_dummy); + exec_test(TC_ctrl_interval); exec_test(TC_rxlev_hyst); exec_test(TC_rxlev_pf_ewma); diff --git a/tests/power/bs_power_loop_test.err b/tests/power/bs_power_loop_test.err index 7fcfb1e..c4726b1 100644 --- a/tests/power/bs_power_loop_test.err +++ b/tests/power/bs_power_loop_test.err @@ -135,6 +135,37 @@ (bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 16 dB (maximum 20 dB, suggested delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Keeping Downlink attenuation at 16 dB (maximum 20 dB, suggested delta 0 dB, RxLev current 30 (-80 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 6 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 6 -> 8 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 8 -> 4 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 0 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 0 -> 2 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 2 -> 4 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 6 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 6 -> 8 dB (maximum 20 dB, suggested delta 2 dB, RxLev current 60 (-50 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 8 -> 4 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0), DTx is disabled => using FULL +(bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 4 -> 0 dB (maximum 20 dB, suggested delta -4 dB, RxLev current 10 (-100 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(31), RXQUAL-FULL(0), RXLEV-SUB(31), RXQUAL-SUB(0), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Changing Downlink attenuation: 12 -> 13 dB (maximum 16 dB, suggested delta 1 dB, RxLev current 31 (-79 dBm), thresholds 30 .. 30) (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(28), RXQUAL-FULL(0), RXLEV-SUB(28), RXQUAL-SUB(0), DTx is disabled => using FULL diff --git a/tests/power/bs_power_loop_test.ok b/tests/power/bs_power_loop_test.ok index 4371c9d..2c12392 100644 --- a/tests/power/bs_power_loop_test.ok +++ b/tests/power/bs_power_loop_test.ok @@ -268,6 +268,70 @@ #07 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) Test case verdict: SUCCESS +Starting test case 'TC_ctrl_interval' +#00 exec_power_step() <- State (re)set (current 0 dB, max 20 dB) +#01 exec_power_step() <- (Re)set power control interval: 0 -> 0 +#02 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#02 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#02 lchan_bs_pwr_ctrl() -> BS power reduction: 0 -> 2 (expected 2) +#03 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#03 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#03 lchan_bs_pwr_ctrl() -> BS power reduction: 2 -> 4 (expected 4) +#04 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#04 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#04 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 6 (expected 6) +#05 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#05 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#05 lchan_bs_pwr_ctrl() -> BS power reduction: 6 -> 8 (expected 8) +#06 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#06 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#06 lchan_bs_pwr_ctrl() -> BS power reduction: 8 -> 4 (expected 4) +#07 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#07 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#07 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 0 (expected 0) +#08 exec_power_step() <- (Re)set power control interval: 0 -> 1 +#09 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#09 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#09 lchan_bs_pwr_ctrl() -> BS power reduction: 0 -> 2 (expected 2) +#10 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#10 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#10 lchan_bs_pwr_ctrl() -> BS power reduction: 2 -> 2 (expected 2) +#11 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#11 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#11 lchan_bs_pwr_ctrl() -> BS power reduction: 2 -> 4 (expected 4) +#12 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#12 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#12 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#13 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#13 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#13 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 6 (expected 6) +#14 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#14 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#14 lchan_bs_pwr_ctrl() -> BS power reduction: 6 -> 6 (expected 6) +#15 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#15 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#15 lchan_bs_pwr_ctrl() -> BS power reduction: 6 -> 8 (expected 8) +#16 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0) +#16 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3c 3c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#16 lchan_bs_pwr_ctrl() -> BS power reduction: 8 -> 8 (expected 8) +#17 exec_power_step() <- (Re)set power control interval: 1 -> 2 +#18 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#18 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#18 lchan_bs_pwr_ctrl() -> BS power reduction: 8 -> 4 (expected 4) +#19 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#19 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#19 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#20 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#20 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#20 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#21 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#21 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#21 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 4 (expected 4) +#22 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(10), RXQUAL-FULL(0), RXLEV-SUB(10), RXQUAL-SUB(0) +#22 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 0a 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +#22 lchan_bs_pwr_ctrl() -> BS power reduction: 4 -> 0 (expected 0) +Test case verdict: SUCCESS + Starting test case 'TC_rxlev_hyst' #00 exec_power_step() <- State (re)set (current 12 dB, max 16 dB) #01 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(31), RXQUAL-FULL(0), RXLEV-SUB(31), RXQUAL-SUB(0) diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index eb0e3e9..c58812b 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -248,6 +248,71 @@ apply_power_test(lchan, PWR_TEST_RXLEV_TARGET_DBM - 10, 1, 13); } +static void test_power_ctrl_interval(void) +{ + struct gsm_lchan *lchan; + unsigned int i, j; + + init_test(__func__); + lchan = &g_trx->ts[0].lchan[0]; + + lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 26); + OSMO_ASSERT(lchan->ms_power_ctrl.max == 2); + + static const int script[][8][3] = { + { /* P_Con_INTERVAL=0 (480 ms) */ + /* { UL RxLev, expected rc, expected Tx power level } */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 13 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 9 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 7 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 5 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 3 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 2 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 2 }, + }, + { /* P_Con_INTERVAL=1 (960 ms) */ + /* { UL RxLev, expected rc, expected Tx power level } */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 13 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 9 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 9 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 7 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 7 }, /* skipped */ + }, + { /* P_Con_INTERVAL=2 (1920 ms) */ + /* { UL RxLev, expected rc, expected Tx power level } */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 13 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 13 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 1, 11 }, + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + { PWR_TEST_RXLEV_TARGET_DBM - 15, 0, 11 }, /* skipped */ + }, + }; + + for (i = 0; i < ARRAY_SIZE(script); i++) { + lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0); + OSMO_ASSERT(lchan->ms_power_ctrl.current == 15); + + /* Set the corresponding power control interval */ + printf("%s(): power control interval is now %u\n", __func__, i); + lchan->ms_dpc_params.ctrl_interval = i; + + for (j = 0; j < ARRAY_SIZE(script[i]); j++) { + apply_power_test(lchan, script[i][j][0], /* UL RxLev */ + script[i][j][1], /* expected rc */ + script[i][j][2]); /* expected Tx power level */ + } + + printf("\n"); + } +} + int main(int argc, char **argv) { printf("Testing power loop...\n"); @@ -264,6 +329,7 @@ test_power_loop(); test_pf_algo_ewma(); test_power_hysteresis(); + test_power_ctrl_interval(); printf("Power loop test OK\n"); diff --git a/tests/power/ms_power_loop_test.err b/tests/power/ms_power_loop_test.err index 7f8779c..ae8ad03 100644 --- a/tests/power/ms_power_loop_test.err +++ b/tests/power/ms_power_loop_test.err @@ -35,3 +35,17 @@ (bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 15, 0 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -70 dBm, rx-target -75 dBm) (bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 15, 0 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -80 dBm, rx-target -75 dBm) (bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -85 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 11 (8 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 11, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 9 (12 dBm) to 7, 16 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 7 (16 dBm) to 5, 20 dBm (rx-ms-pwr-lvl 7, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 5 (20 dBm) to 3, 24 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 3 (24 dBm) to 2, 26 dBm (rx-ms-pwr-lvl 3, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 2, 26 dBm (rx-ms-pwr-lvl 2, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 11 (8 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 11, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 9 (12 dBm) to 7, 16 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) +(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm) diff --git a/tests/power/ms_power_loop_test.ok b/tests/power/ms_power_loop_test.ok index 4293d28..5fea474 100644 --- a/tests/power/ms_power_loop_test.ok +++ b/tests/power/ms_power_loop_test.ok @@ -88,4 +88,60 @@ MS current power 15 -> 15 (expected 15) lchan_ms_pwr_ctrl(RxLvl=-85 dBm) returns 1 (expected 1) MS current power 15 -> 13 (expected 13) + +Starting test case 'test_power_ctrl_interval' +test_power_ctrl_interval(): power control interval is now 0 +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 15 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 13 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 11 -> 9 (expected 9) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 9 -> 7 (expected 7) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 7 -> 5 (expected 5) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 5 -> 3 (expected 3) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 3 -> 2 (expected 2) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 1) + MS current power 2 -> 2 (expected 2) + +test_power_ctrl_interval(): power control interval is now 1 +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 15 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 13 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 11 -> 9 (expected 9) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 9 -> 9 (expected 9) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 9 -> 7 (expected 7) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 7 -> 7 (expected 7) + +test_power_ctrl_interval(): power control interval is now 2 +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 15 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 13 -> 13 (expected 13) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1) + MS current power 13 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) +lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0) + MS current power 11 -> 11 (expected 11) + Power loop test OK -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf9956b2c6d829b38e9fda7d1f29790036219f42 Gerrit-Change-Number: 22781 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:13:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:13:14 +0000 Subject: Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 ) Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:13:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:15:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:15:08 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/1/src/m3ua.c at 826 PS1, Line 826: * \param[in] available are aff_pc now available (true) or unavailable (false */ > false) This one is still missing. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:15:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:15:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:15:28 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:15:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:18:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:18:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22724 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: Iac84facc0041b928f04a5e2d2311dfd9d642c5a9 Gerrit-Change-Number: 22724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:18:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:18:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: The value returned by function is not used In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726 ) Change subject: pcu: Fix warning: The value returned by function is not used ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22726 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: Id7068e74439d1532c32c6113e642d0b3b063aaf3 Gerrit-Change-Number: 22726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:37:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:37:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 to look at the new patch set (#2). Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function ...................................................................... BSSGP_Emulation: Fix warning: control reaches end of non-void function Change-Id: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 16 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/22722/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:37:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:37:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 to look at the new patch set (#3). Change subject: GSM_Types: Fix warning: control reaches end of non-void function ...................................................................... GSM_Types: Fix warning: control reaches end of non-void function Change-Id: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 --- M library/GSM_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/22735/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:37:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:37:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 to look at the new patch set (#3). Change subject: pcu: Fix warning: control reaches end of non-void function ...................................................................... pcu: Fix warning: control reaches end of non-void function Change-Id: I2c8b343fba5fabda9f78af8711e2a837536518e9 --- M pcu/GPRS_TBF.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/22736/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 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: I2c8b343fba5fabda9f78af8711e2a837536518e9 Gerrit-Change-Number: 22736 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:37:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:37:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 to look at the new patch set (#3). Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function ...................................................................... Osmocom_Gb_Types: Fix warning: control reaches end of non-void function Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/22738/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c Gerrit-Change-Number: 22738 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:37:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 11:37:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 to look at the new patch set (#3). Change subject: StatsD_Checker: Check f_IPL4_listen result ...................................................................... StatsD_Checker: Check f_IPL4_listen result Change-Id: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 --- M library/StatsD_Checker.ttcn 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/22741/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 Gerrit-Change-Number: 22741 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:52:38 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 8 Feb 2021 11:52:38 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 3: Verified+1 Everything else has been adjusted, merging. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:52:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:52:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 8 Feb 2021 11:52:57 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:52:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 11:53:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 8 Feb 2021 11:53:57 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: remove (moved to own repository) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 ) Change subject: gbproxy: remove (moved to own repository) ...................................................................... Patch Set 4: -Verified (waiting for jenkins to give verified +1 after rebase) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I37f7cebaf2a06bd93627a452f5df44edcfc0f87a Gerrit-Change-Number: 22591 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 11:53:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 12:11:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 12:11:07 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 to look at the new patch set (#3). Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... xua: Implement SNM availability/unavailability messaging M3UA and SUA have one sub-protocol called [S]SNM, through which the SG informs the ASP about certain destinations (point codes) becoming available (DAVA) or unavailable (DUNA) in the SS7 network. This patch adds support for * generating DAVA/DUAN on a SGP when the AS FSM changes to/from AS-ACTIVE * receiving DAVA/DUNA on an ASP and informing other "SG role" AS/ASP * processing DAUD from ASP received by SG, generating relate DAVA/DUNA responses Related: OS#2623 Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 --- M src/Makefile.am M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_internal.h A src/xua_snm.c 6 files changed, 554 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/77/22777/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 12:11:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 12:11:07 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 to look at the new patch set (#3). Change subject: sccp: Notify users of point code available/unavailable ...................................................................... sccp: Notify users of point code available/unavailable * add N-PCSTATE.ind and N-STATE.ind definitions to SCCP user SAP * add minimal SCMG (SCCP Management) and LBCS (Local Broadcast) * generate MTP-PAUSE.ind/MTP-RESUME.ind based on received xUA DUNA/DAVA * generate N-PCSTATE.ind towards the local SCCP users Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Related: OS#2623, OS#3403, OS#4701 --- M include/osmocom/sigtran/sccp_sap.h M src/Makefile.am M src/sccp_internal.h A src/sccp_lbcs.c A src/sccp_scmg.c M src/xua_snm.c 6 files changed, 233 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/78/22778/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 12:11:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 12:11:08 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... sccp: Add minimalistic SCMG implementation SCMG (SCCP Management) is a special sub-system that normally resides at SSN=1. In Osmcoom we so far ignored its existence. However, in terms of interop with other implementation, we should implement at least some basic features. The only procedure implemented in this initial commit is the response to an incoming SST (Subsystem Test) message. If we don't respond to this message, a remote SCCP entity could assume the SSN is dead on our side, rendering communication impossible. Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 --- M include/osmocom/sigtran/Makefile.am A include/osmocom/sigtran/protocol/sccp_scmg.h M src/sccp_internal.h M src/sccp_scmg.c M src/sccp_user.c 5 files changed, 166 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/22789/1 diff --git a/include/osmocom/sigtran/Makefile.am b/include/osmocom/sigtran/Makefile.am index 0aa90cb..d9cc20c 100644 --- a/include/osmocom/sigtran/Makefile.am +++ b/include/osmocom/sigtran/Makefile.am @@ -3,5 +3,6 @@ sigtrandir = $(includedir)/osmocom/sigtran -sigtran_prot_HEADERS = protocol/sua.h protocol/m3ua.h protocol/mtp.h +sigtran_prot_HEADERS = protocol/sua.h protocol/m3ua.h protocol/mtp.h \ + protocol/sccp_scmg.h sigtran_protdir = $(includedir)/osmocom/sigtran/protocol diff --git a/include/osmocom/sigtran/protocol/sccp_scmg.h b/include/osmocom/sigtran/protocol/sccp_scmg.h new file mode 100644 index 0000000..5d97828 --- /dev/null +++ b/include/osmocom/sigtran/protocol/sccp_scmg.h @@ -0,0 +1,25 @@ +#pragma once + +/* SCCP Management as per Section 5.3 of ITU-T Q.713 */ + +enum sccp_scmg_msg_type { + SCCP_SCMG_MSGT_SSA = 0x01, /* Subsystem Allowed */ + SCCP_SCMG_MSGT_SSP = 0x02, /* Subsystem Prohibited */ + SCCP_SCMG_MSGT_SST = 0x03, /* Subsystem Status Test */ + SCCP_SCMG_MSGT_SOR = 0x04, /* Subsystem Out-of-service Request */ + SCCP_SCMG_MSGT_SOG = 0x05, /* Subsystem Out-of-service Grant */ + SCCP_SCMG_MSGT_SSC = 0x06, /* Subsystem Congested */ +}; + +struct sccp_scmg_msg { + uint8_t msg_type; /* enum sccp_scmg_msg_type */ + uint8_t affected_ssn; + uint16_t affected_pc; + uint8_t smi; + /* one octet, only in case of SSC */ + uint8_t ssc_congestion_lvl[0]; +} __attribute__ ((packed)); + +extern const struct value_string sccp_scmg_msgt_names[]; +static inline const char *sccp_scmg_msgt_name(enum sccp_scmg_msg_type msgt) +{ return get_value_string(sccp_scmg_msgt_names, msgt); } diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 6ad7ee3..6bd2af9 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -139,3 +139,4 @@ /* SCCP Management (SCMG) */ void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); +int sccp_scmg_init(struct osmo_sccp_instance *inst); diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 4a8ccf6..4364e16 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -30,6 +30,7 @@ #include #include +#include #include #include "xua_internal.h" @@ -81,3 +82,133 @@ /* 8) local broadcast of "user-in-service" * [this would require us to track SSNs at each PC, which we don't] */ } + +const struct value_string sccp_scmg_msgt_names[] = { + { SCCP_SCMG_MSGT_SSA, "SSA (Subsystem Allowed)" }, + { SCCP_SCMG_MSGT_SSP, "SSP (Subsystem Prohibited)" }, + { SCCP_SCMG_MSGT_SST, "SST (Subsystem Status Test)" }, + { SCCP_SCMG_MSGT_SOR, "SOR (Subsystem Out-of-service Request)" }, + { SCCP_SCMG_MSGT_SOG, "SOG (Subsystem Out-of-service Grant)" }, + { SCCP_SCMG_MSGT_SSC, "SSC (Subsystem Congested)" }, + { 0, NULL } +}; + +static int sccp_scmg_tx(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, + uint8_t msg_type, uint8_t ssn, uint16_t pc, uint8_t smi, uint8_t *ssc_cong_lvl) +{ + struct msgb *msg = sccp_msgb_alloc(__func__); + struct osmo_scu_prim *prim; + struct osmo_scu_unitdata_param *param; + struct sccp_scmg_msg *scmg; + + /* fill primitive header */ + prim = (struct osmo_scu_prim *) msgb_put(msg, sizeof(*prim)); + param = &prim->u.unitdata; + memcpy(¶m->calling_addr, calling_addr, sizeof(*calling_addr)); + memcpy(¶m->called_addr, called_addr, sizeof(*called_addr)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST, msg); + + /* Fill the actual SCMG message */ + msg->l2h = msgb_put(msg, sizeof(*scmg)); + scmg = (struct sccp_scmg_msg *) msg->l2h; + scmg->msg_type = msg_type; + scmg->affected_ssn = ssn; + scmg->affected_pc = pc; + scmg->smi = smi; + + /* add congestion level in case of SSC message */ + if (msg_type == SCCP_SCMG_MSGT_SSC) { + msgb_put(msg, 1); + OSMO_ASSERT(ssc_cong_lvl); + scmg->ssc_congestion_lvl[1] = *ssc_cong_lvl; + } + + return osmo_sccp_user_sap_down(scu, &prim->oph); +} + + +/* Subsystem Test received */ +static int scmg_rx_sst(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *sst) +{ + /* Q.714 5.3.4.3 Actions at the receiving side (of SST) */ + + /* check "ignore subsystem status test" and bail out */ + /* check if SSN in question is available. If yes, return SSA. If not, ignore */ + scu = sccp_user_find(scu->inst, sst->affected_ssn, sst->affected_pc); + if (!scu) + return 0; + + /* is subsystem available? */ + if (0 /* !subsys_available(scu) */) + return 0; + + return sccp_scmg_tx(scu, called_addr, calling_addr, SCCP_SCMG_MSGT_SSA, + sst->affected_ssn, sst->affected_pc, 0, NULL); +} + +static int scmg_rx(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *scmg) +{ + switch (scmg->msg_type) { + case SCCP_SCMG_MSGT_SST: + return scmg_rx_sst(scu, calling_addr, called_addr, scmg); + case SCCP_SCMG_MSGT_SSP: + case SCCP_SCMG_MSGT_SSA: + case SCCP_SCMG_MSGT_SOR: + case SCCP_SCMG_MSGT_SOG: + case SCCP_SCMG_MSGT_SSC: + default: + LOGP(DLSCCP, LOGL_NOTICE, "Rx unsupported SCCP SCMG %s, ignoring", + sccp_scmg_msgt_name(scmg->msg_type)); + break; + } + return 0; +} + +/* main entry point for SCCP user primitives from SCRC/SCOC */ +static int scmg_prim_cb(struct osmo_prim_hdr *oph, void *_scu) +{ + struct osmo_sccp_user *scu = _scu; + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; + struct osmo_scu_unitdata_param *param; + struct sccp_scmg_msg *scmg; + int rc = 0; + + switch (OSMO_PRIM_HDR(oph)) { + case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): + param = &prim->u.unitdata; + scmg = msgb_l2(oph->msg); + /* ensure minimum length based on message type */ + if (msgb_l2len(oph->msg) < sizeof(*scmg)) { + rc = -1; + break; + } + if (scmg->msg_type == SCCP_SCMG_MSGT_SSC && msgb_l2len(oph->msg) < sizeof(*scmg)+1) { + rc = -1; + break; + } + /* PC is encoded in little endian ?!? */ + scmg->affected_pc = osmo_load16le(&scmg->affected_pc); + rc = scmg_rx(scu, ¶m->calling_addr, ¶m->called_addr, scmg); + break; + default: + LOGP(DLSCCP, LOGL_ERROR, "unsupported SCCP user primitive %s\n", + osmo_scu_prim_name(oph)); + break; + } + + msgb_free(oph->msg); + return rc; +} + +/* register SCMG as SCCP user for SSN=1 */ +int sccp_scmg_init(struct osmo_sccp_instance *inst) +{ + struct osmo_sccp_user *scu; + scu = osmo_sccp_user_bind(inst, "SCCP Maangement", scmg_prim_cb, SCCP_SSN_MANAGEMENT); + if (!scu) + return -1; + return 0; +} diff --git a/src/sccp_user.c b/src/sccp_user.c index 880cab1..d8e78f0 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -220,6 +220,7 @@ osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv) { struct osmo_sccp_instance *inst; + int rc; inst = talloc_zero(ss7, struct osmo_sccp_instance); if (!inst) @@ -235,6 +236,12 @@ inst->ss7_user.prim_cb = mtp_user_prim_cb; inst->ss7_user.priv = inst; + rc = sccp_scmg_init(inst); + if (rc < 0) { + talloc_free(inst); + return NULL; + } + osmo_ss7_user_register(ss7, MTP_SI_SCCP, &inst->ss7_user); llist_add_tail(&inst->list, &sccp_instances); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 13:10:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 13:10:03 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/xua_snm.c at 91 PS3, Line 91: m3ua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); so these new params don't exist in M3UA? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 13:10:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 13:10:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 13:10:31 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/m3ua.c File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/m3ua.c at 825 PS3, Line 825: * \param[in] available are aff_pc now available (true) or unavailable (false */ (false) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 13:10:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 13:11:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 13:11:19 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 13:11:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 13:17:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 13:17:37 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1//COMMIT_MSG at 10 PS1, Line 10: at SSN=1. In Osmcoom we so far ignored its existence. However, Osmocom https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1/src/sccp_scmg.c File src/sccp_scmg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1/src/sccp_scmg.c at 192 PS1, Line 192: /* PC is encoded in little endian ?!? */ does this mean you tested against some implementation not following our expectations? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 13:17:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:17:41 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 16:17:41 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME ...................................................................... Patch Set 1: (1 comment) See comments below, thanks https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599/1/src/osmo_gsm_tester/obj/epc_amarisoft.py File src/osmo_gsm_tester/obj/epc_amarisoft.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599/1/src/osmo_gsm_tester/obj/epc_amarisoft.py at 154 PS1, Line 154: sub_count = self.testenv.suite().config().get('modem', None) > how do you fill this information in 'modem'? Can you show me an example? Yes, see here: $ cat sysmocom/scenarios/cfg-ms-count at .conf config: modem: count: ${param1} -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:17:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:17:56 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 16:17:56 +0000 Subject: Change in osmo-gsm-tester[master]: enb, ue, process: move stdout counter helper to process objects In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 ) Change subject: enb,ue,process: move stdout counter helper to process objects ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042/4/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042/4/src/osmo_gsm_tester/obj/enb.py at 351 PS4, Line 351: raise log.Error('get_counter() not implemented!') > this should simply be "pass". [?] sorry, fixed that now -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 Gerrit-Change-Number: 22042 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:17:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:19:51 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 16:19:51 +0000 Subject: Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs ...................................................................... Patch Set 1: (1 comment) See comments below. Thanks https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/1/src/osmo_gsm_tester/obj/srslte_common.py File src/osmo_gsm_tester/obj/srslte_common.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/1/src/osmo_gsm_tester/obj/srslte_common.py at 62 PS1, Line 62: if 'ue_added' not in stdout_kpi: > Why this stuff here? What's the rationale behind this specialties here? Later in the testcase, I am checking how many UE's have been added to the eNB. So I do a lookup in the dict. I could handle the missing entry in the TC, or here. But I thought handling it once here and making sure the value is set to 0 reduces code. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:19:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:30:13 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 16:30:13 +0000 Subject: Change in osmo-gsm-tester[master]: enb, ue, process: move stdout counter helper to process objects In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 to look at the new patch set (#5). Change subject: enb,ue,process: move stdout counter helper to process objects ...................................................................... enb,ue,process: move stdout counter helper to process objects this patch adds the stdout counter to count events happening on the stdout (known from the UE already) to the common process class so they can also be used from the eNB (and other objects) In addition, we add a PRACH counter to be used for tests. Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 --- M src/osmo_gsm_tester/core/process.py M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 6 files changed, 31 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/42/22042/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 Gerrit-Change-Number: 22042 Gerrit-PatchSet: 5 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:30:13 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 16:30:13 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 to look at the new patch set (#2). Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... enb,epc: implement stdout/log KPI getter in eNB/EPC base class add implementation of get_stdout_kpi/get_log_kpi to base class of EPC/eNB. The base implementation return empty KPIs by default. The methods can be overwritten if more advanced KPI analysis is available. But the base implementation makes sure testcases don't fail if this isn't the case. Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/epc.py 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/01/22601/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:32:12 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 16:32:12 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... Patch Set 2: (3 comments) See below, thanks https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 358 PS1, Line 358: > Remove this whitespace Ack https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 364 PS1, Line 364: def get_log_kpis(self): > I'm not sure what's the point in splitting between log and kpi, is there some rationale behind this? the idea is that we have some KPI that we always get from stdout (like when a UE connects) and some that we get from the logs, but only if the log level is set accordingly https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 368 PS1, Line 368: def get_num_phy_errors(self, kpi): > What about this function? looks not related to this patch? It's used in one of the TC to check for erros, like also KPI. We never ran the tests with Amarisoft eNB, so I didn't see it was an issue there. So now I've moved the method to enb.py -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:32:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:47:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 16:47:12 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce Android UEs as new modems In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21302 ) Change subject: Introduce Android UEs as new modems ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I79a5d803e869a868d4dac5e0d4c2feb38038dc5c Gerrit-Change-Number: 21302 Gerrit-PatchSet: 7 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:47:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:47:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 16:47:15 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce Android UEs as new modems In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21302 ) Change subject: Introduce Android UEs as new modems ...................................................................... Introduce Android UEs as new modems To expand the test capacities we would like to introduce Android UEs as new modems. Currently the following tests are supported: - Ping - iPerf3 DL/UL - RRC Mobile MT Ping In the following is a small description. Prerequisites: - Android UE - Rooted (Ping, iPerf, RRC Idle MT Ping) - Qualcomm baseband with working diag_mdlog (RRC Idle MT Ping) - iPerf3 - Dropbear - OGT Slave Unit - Android SDK Platform-Tools (https://developer.android.com/studio/releases/platform-tools#downloads) - Pycrate (https://github.com/P1sec/pycrate) - SCAT clone https://github.com/bedrankara/scat/ & install dependencies checkout branch ogt symlink scat (ln -s ~/scat/scat.py /usr/local/bin/scat) Infrastructure explaination: The Android UEs are connected to the OGT Units via USB. We activate tethering and set up a SSH server (with Dropbear). We chose tethering over WiFi to have a more stable route for the ssh connection. We forward incoming connections to the OGT unit hosting the Android UE(s) on specific ports to the UEs via iptables. This enables OGT to issue commands directly to the UEs. In case of local execution we use ADB to issue commands to the AndroidUE. The set up was tested with 5 Android UEs connected in parallel but it should be scalable to the number of available IPs in the respective subnet. Furthermore, we need to cross compile Dropbear and iPerf3 to use them on the UEs. These tools have to be added to the $PATH variable of the UEs. Examplary set up: In this example we have two separate OGT units (master and slave) and two Android UEs that are connected to the slave unit. An illustration may be found here: https://ibb.co/6BXSP2C On UE 1: ip address add 192.168.42.130/24 dev rndis0 ip route add 192.168.42.0/24 dev rndis0 table local_network dropbearmulti dropbear -F -E -p 130 -R -T /data/local/tmp/authorized_keys -U 0 -G 0 -N root -A On UE 2: ip address add 192.168.42.131/24 dev rndis0 ip route add 192.168.42.0/24 dev rndis0 table local_network dropbearmulti dropbear -F -E -p 131 -R -T /data/local/tmp/authorized_keys -U 0 -G 0 -N root -A On OGT slave unit: sudo ip link add name ogt type bridge sudo ip l set eth0 master ogt sudo ip l set enp0s20f0u1 master ogt sudo ip l set enp0s20f0u2 master ogt sudo ip a a 192.168.42.1/24 dev ogt sudo ip link set ogt up Now we have to manually connect to every UE from OGT Master to set up SSH keys and verify that the setup works. Therefore, use: ssh -p [UE-PORT] root@[OGT SLAVE UNIT's IP] Finally, to finish the setup procedure create the remote_run_dir for Android UEs on the slave unit like following: mkdir /osmo-gsm-tester-androidue chown jenkins /osmo-gsm-tester-androidue Example for modem in resource.conf: - label: mi5g type: androidue imsi: '901700000034757' ki: '85E9E9A947B9ACBB966ED7113C7E1B8A' opc: '3E1C73A29B9C293DC5A763E42C061F15' apn: apn: 'srsapn' mcc: '901' mnc: '70' select: 'True' auth_algo: 'milenage' features: ['4g', 'dl_qam256', 'qc_diag'] run_node: run_type: ssh run_addr: 100.113.1.170 ssh_user: jenkins ssh_addr: 100.113.1.170 ue_ssh_port: 130 adb_serial_id: '8d3c79a7' scat_parser: run_type: local run_addr: 127.0.0.1 adb_serial_id: '8d3c79a7' Example for default-suites.conf: - 4g:ms-label at mi5g+srsenb-rftype@uhd+mod-enb-nprb at 25+mod-enb-txmode@1 Change-Id: I79a5d803e869a868d4dac5e0d4c2feb38038dc5c --- M src/osmo_gsm_tester/core/process.py M src/osmo_gsm_tester/core/schema.py A src/osmo_gsm_tester/obj/android_apn.py A src/osmo_gsm_tester/obj/android_bitrate_monitor.py A src/osmo_gsm_tester/obj/android_host.py M src/osmo_gsm_tester/obj/iperf3.py M src/osmo_gsm_tester/obj/ms.py A src/osmo_gsm_tester/obj/ms_android.py A src/osmo_gsm_tester/obj/qc_diag.py M src/osmo_gsm_tester/obj/run_node.py A sysmocom/scenarios/ms-label.conf A utils/bin/osmo-gsm-tester_androidue_conn_chk.sh A utils/bin/osmo-gsm-tester_androidue_diag_parser.sh 13 files changed, 963 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py index 09dce55..bac258a 100644 --- a/src/osmo_gsm_tester/core/process.py +++ b/src/osmo_gsm_tester/core/process.py @@ -493,6 +493,14 @@ args = ['sudo', self.NETNS_EXEC_BIN, self.netns] + list(popen_args) super().__init__(name, run_dir, remote_user, remote_host, remote_cwd, args, **popen_kwargs) +class AdbProcess(Process): + def __init__(self, name, run_dir, adb_serial, popen_args, **popen_kwargs): + super().__init__(name, run_dir, popen_args, **popen_kwargs) + self.adb_serial = adb_serial + + self.popen_args = ['adb', '-s', self.adb_serial, 'exec-out', 'su', '-c'] + list(popen_args) + self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) + def run_local_sync(run_dir, name, popen_args): run_dir =run_dir.new_dir(name) proc = Process(name, run_dir, popen_args) diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py index 89c4494..d4a460d 100644 --- a/src/osmo_gsm_tester/core/schema.py +++ b/src/osmo_gsm_tester/core/schema.py @@ -111,7 +111,7 @@ raise ValueError('Unknown Cipher value: %r' % val) def modem_feature(val): - if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g', 'dl_qam256', 'ul_qam64'): + if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g', 'dl_qam256', 'ul_qam64', 'qc_diag'): return True raise ValueError('Unknown Modem Feature: %r' % val) diff --git a/src/osmo_gsm_tester/obj/android_apn.py b/src/osmo_gsm_tester/obj/android_apn.py new file mode 100644 index 0000000..3c8bfcf --- /dev/null +++ b/src/osmo_gsm_tester/obj/android_apn.py @@ -0,0 +1,210 @@ +# osmo_gsm_tester: specifics for setting an APN on an AndroidUE modem +# +# Copyright (C) 2020 by Software Radio Systems Limited +# +# Author: Nils F?rste +# Author: Bedran Karakoc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import re + +from ..core import log +from ..core import schema +from .android_host import AndroidHost + + +class AndroidApn(AndroidHost): +############## +# PROTECTED +############## + def __init__(self, apn, mcc, mnc, select=None): + self.logger_name = 'apn_worker_' + super().__init__(self.logger_name) + self._apn_name = apn + self._apn = apn + self._mcc = mcc + self._mnc = mnc + self._select = select + if not self._apn: + raise log.Error('APN name not set') + if not self._mcc: + raise log.Error('MCC not set') + if not self._mnc: + raise log.Error('MNC not set') + + # optional parameters, set with set_additional_params() + self.proxy = None + self.port = None + self.user = None + self.password = None + self.server = None + self.mmsc = None + self.mmsport = None + self.mmsproxy = None + self.auth = None + self.type = None + self.protocol = None + self.mvnoval = None + self.mvnotype = None + + def get_carrier_id(self, carrier_name): + qry_carrier_cmd = "content query --uri \"content://telephony/carriers\"" + proc = self.run_androidue_cmd('get-carrier-id', [qry_carrier_cmd]) + proc.launch_sync() + available_carriers = proc.get_stdout().split('\n') + carr_id = -1 + for carr in available_carriers: + if 'name=' + carrier_name in carr: # found carrier + carr_id = re.findall(r'_id=(\S+),', carr)[0] + break + return carr_id + + def set_new_carrier(self, apn_parameter, carr_id): + # check if carrier was found, delete it if exists + if carr_id != -1: + self.delete_apn(apn_parameter['carrier']) + + set_carrier_cmd = "content insert --uri content://telephony/carriers" \ + + " --bind name:s:\"" + apn_parameter["carrier"] + "\"" \ + + " --bind numeric:s:\"" + apn_parameter["mcc"] + apn_parameter["mnc"] + "\"" \ + + " --bind mcc:s:\"" + apn_parameter["mcc"] + "\"" \ + + " --bind mnc:s:\"" + apn_parameter["mnc"] + "\""\ + + " --bind apn:s:\"" + apn_parameter["apn"] + "\"" \ + + " --bind user:s:\"" + apn_parameter["user"] + "\"" \ + + " --bind password:s:\"" + apn_parameter["password"] + "\"" \ + + " --bind mmsc:s:\"" + apn_parameter["mmsc"] + "\"" \ + + " --bind mmsport:s:\"" + apn_parameter["mmsport"] + "\"" \ + + " --bind mmsproxy:s:\"" + apn_parameter["mmsproxy"] + "\"" \ + + " --bind authtype:s:\"" + apn_parameter["auth"] + "\"" \ + + " --bind type:s:\"" + apn_parameter["type"] + "\"" \ + + " --bind protocol:s:\"" + apn_parameter["protocol"] + "\"" \ + + " --bind mvno_type:s:\"" + apn_parameter["mvnotype"] + "\"" \ + + " --bind mvno_match_data:s:\"" + apn_parameter["mvnoval"] + "\"" + proc = self.run_androidue_cmd("set-new-carrier", [set_carrier_cmd]) + proc.launch_sync() + return self.get_carrier_id(apn_parameter['carrier']) + + def set_preferred_apn(self, carr_id): + if carr_id != -1: + set_apn_cmd = "content insert --uri content://telephony/carriers/preferapn --bind apn_id:s:\"" + str(carr_id) + "\"" + proc = self.run_androidue_cmd('set-preferred-apn', [set_apn_cmd]) + proc.launch_sync() + + def select_apn(self, carr_name): + carr_id = self.get_carrier_id(carr_name) + if carr_id == 0: + return False + + # select carrier by ID + sel_apn_cmd = "content update --uri content://telephony/carriers/preferapn --bind apn_id:s:\"" + str(carr_id) + "\"" + proc = self.run_androidue_cmd('select-apn', [sel_apn_cmd]) + proc.launch_sync() + return True + + def delete_apn(self, carr_name): + set_apn_cmd = "content delete --uri content://telephony/carriers --where \'name=\"" + str(carr_name) + "\" \'" + proc = self.run_androidue_cmd('delete-apn', [set_apn_cmd]) + proc.launch_sync() + +######################## +# PUBLIC - INTERNAL API +######################## + @classmethod + def from_conf(cls, conf): + return cls(conf.get('apn', None), conf.get('mcc', None), + conf.get('mnc', None), conf.get('select', None)) + + @classmethod + def schema(cls): + resource_schema = { + 'apn': schema.STR, + 'mcc': schema.STR, + 'mnc': schema.STR, + 'select': schema.BOOL_STR, + } + return resource_schema + + def configure(self, testenv, run_dir, run_node, rem_host): + self.testenv = testenv + self.rem_host = rem_host + self._run_node = run_node + self.run_dir = run_dir + self.logger_name += self._run_node.run_addr() + self.set_name(self.logger_name) + + def set_additional_params(self, proxy=None, port=None, user=None, password=None, server=None, auth=None, apn_type=None, + mmsc=None, mmsport=None, mmsproxy=None, protocol=None, mvnoval=None, mvnotype=None): + self.proxy = proxy + self.port = port + self.user = user + self.password = password + self.server = server + self.auth = auth + self.type = apn_type + self.mmsc = mmsc + self.mmsport = mmsport + self.mmsproxy = mmsproxy + self.protocol = protocol + self.mvnoval = mvnoval + self.mvnotype = mvnotype + + def set_apn(self): + apn_params = { + 'carrier': self._apn_name, + 'apn': self._apn, + 'proxy': self.proxy or '', + 'port': self.port or '', + 'user': self.user or '', + 'password': self.password or '', + 'server': self.server or '', + 'mmsc': self.mmsc or '', + 'mmsport': self.mmsport or '', + 'mmsproxy': self.mmsproxy or '', + 'mcc': self._mcc, + 'mnc': self._mnc, + 'auth': self.auth or '-1', + 'type': self.type or 'default', + 'protocol': self.protocol or '', + 'mvnotype': self.mvnotype or '', + 'mvnoval': self.mvnoval or '', + } + self.dbg('APN parameters: ' + str(apn_params)) + + # search for carrier in database + carrier_id = self.get_carrier_id(apn_params['carrier']) + + # add/update carrier + carrier_id = self.set_new_carrier(apn_params, carrier_id) + + # select as preferred APN + if self.select: + self.set_preferred_apn(carrier_id) + + def __str__(self): + return self.name() + + def apn(self): + return self._apn + + def mcc(self): + return self._mcc + + def mnc(self): + return self._mnc + + def select(self): + return self._select + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/obj/android_bitrate_monitor.py b/src/osmo_gsm_tester/obj/android_bitrate_monitor.py new file mode 100644 index 0000000..43d5524 --- /dev/null +++ b/src/osmo_gsm_tester/obj/android_bitrate_monitor.py @@ -0,0 +1,118 @@ +# osmo_gsm_tester: specifics for monitoring the bit rate of an AndroidUE modem +# +# Copyright (C) 2020 by Software Radio Systems Limited +# +# Author: Nils F?rste +# Author: Bedran Karakoc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ..core import log +from .android_host import AndroidHost + + +class BitRateMonitor(AndroidHost): + +############## +# PROTECTED +############## + def __init__(self, testenv, run_dir, run_node, rem_host, data_interface): + super().__init__('brate_monitor_%s' % run_node.run_addr()) + self.testenv = testenv + self.rem_host = rem_host + self._run_node = run_node + self.run_dir = run_dir + self.data_interface = data_interface + self.rx_monitor_proc = None + self.tx_monitor_proc = None + +######################## +# PUBLIC - INTERNAL API +######################## + def start(self): + # start bit rate monitoring on Android UE + popen_args_rx_mon = ['while true; do cat /sys/class/net/' + self.data_interface + '/statistics/rx_bytes;', + 'sleep 1;', 'done'] + popen_args_tx_mon = ['while true; do cat /sys/class/net/' + self.data_interface + '/statistics/tx_bytes;', + 'sleep 1;', 'done'] + self.rx_monitor_proc = self.run_androidue_cmd('start-rx-monitor', popen_args_rx_mon) + self.testenv.remember_to_stop(self.rx_monitor_proc) + self.rx_monitor_proc.launch() + self.tx_monitor_proc = self.run_androidue_cmd('start-tx-monitor', popen_args_tx_mon) + self.testenv.remember_to_stop(self.tx_monitor_proc) + self.tx_monitor_proc.launch() + + def stop(self): + self.testenv.stop_process(self.rx_monitor_proc) + self.testenv.stop_process(self.tx_monitor_proc) + + def save_metrics(self, metrics_file): + brate_rx_raw = self.rx_monitor_proc.get_stdout().split('\n') + brate_tx_raw = self.tx_monitor_proc.get_stdout().split('\n') + brate_rx_raw.remove('') + brate_tx_raw.remove('') + brate_rx_l = brate_rx_raw[1:] + brate_tx_l = brate_tx_raw[1:] + + if len(brate_rx_l) < 2 or len(brate_tx_l) < 2: + raise log.Error('Insufficient data available to write metrics file') + + # cut of elements if lists don't have the same length + if len(brate_rx_l) > len(brate_tx_l): + brate_rx_l = brate_rx_l[:len(brate_tx_l) - len(brate_rx_l)] + if len(brate_rx_l) < len(brate_tx_l): + brate_tx_l = brate_tx_l[:len(brate_rx_l) - len(brate_tx_l)] + + # get start value + brate_rx_last = int(brate_rx_l[0]) + brate_tx_last = int(brate_tx_l[0]) + + with open(metrics_file, 'w') as ue_metrics_fh: + ue_metrics_fh.write('time;cc;earfcn;pci;rsrp;pl;cfo;pci_neigh;rsrp_neigh;cfo_neigh;' + + 'dl_mcs;dl_snr;dl_turbo;dl_brate;dl_bler;' + + 'ul_ta;ul_mcs;ul_buff;ul_brate;ul_bler;rf_o;rf_u;rf_l;' + + 'is_attached\n') + for i in range(1, len(brate_rx_l)): + time = '0' + cc = '0' + earfcn = '0' + pci = '0' + rsrp = '0' + pl = '0' + cfo = '0' + pci_neigh = '0' + rsrp_neigh = '0' + cfo_neigh = '0' + dl_mcs = '0' + dl_snr = '0' + dl_turbo = '0' + dl_brate = str((int(brate_rx_l[i]) - brate_rx_last) * 8) + brate_rx_last = int(brate_rx_l[i]) + dl_bler = '0' + ul_ta = '0' + ul_mcs = '0' + ul_buff = '0' + ul_brate = str((int(brate_tx_l[i]) - brate_tx_last) * 8) + brate_tx_last = int(brate_tx_l[i]) + ul_bler = '0' + rf_o = '0' + rf_u = '0' + rf_l = '0' + is_attached = '0' + + line = time + ';' + cc + ';' + earfcn + ';' + pci + ';' + rsrp + ';' + pl + ';' + cfo + ';' \ + + pci_neigh + ';' + rsrp_neigh + ';' + cfo_neigh + ';' + dl_mcs + ';' + dl_snr + ';' \ + + dl_turbo + ';' + dl_brate + ';' + dl_bler + ';' + ul_ta + ';' + ul_mcs + ';' + ul_buff + ';' \ + + ul_brate + ';' + ul_bler + ';' + rf_o + ';' + rf_u + ';' + rf_l + ';' + is_attached + ue_metrics_fh.write(line + '\n') diff --git a/src/osmo_gsm_tester/obj/android_host.py b/src/osmo_gsm_tester/obj/android_host.py new file mode 100644 index 0000000..38e8fb9 --- /dev/null +++ b/src/osmo_gsm_tester/obj/android_host.py @@ -0,0 +1,47 @@ +# osmo_gsm_tester: Base class for AndroidUE modems +# +# Copyright (C) 2020 by Software Radio Systems Limited +# +# Author: Nils F?rste +# Author: Bedran Karakoc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from ..core import log, process +from abc import ABCMeta + + +class AndroidHost(log.Origin, metaclass=ABCMeta): + """Base for everything AndroidUE related.""" + +############## +# PROTECTED +############## + def __init__(self, name): + log.Origin.__init__(self, log.C_TST, name) + +######################## +# PUBLIC - INTERNAL API +######################## + def run_androidue_cmd(self, name, popen_args): + # This function executes the given command directly on the Android UE. Therefore, + # ADB is used to execute commands locally and ssh for remote execution. Make sure + # Android SDK Platform-Tools >= 23 is installed + if self._run_node.is_local(): + # use adb instead of ssh + run_dir = self.run_dir.new_dir(name) + proc = process.AdbProcess(name, run_dir, self._run_node.adb_serial_id(), popen_args, env={}) + else: + proc = self.rem_host.RemoteProcess(name, popen_args, remote_env={}) + return proc diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 2039a9b..4b88df0 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -227,6 +227,7 @@ self.remote_log_file = None self.log_copied = False self.logfile_supported = False # some older versions of iperf doesn't support --logfile arg + self.is_android_ue = False def runs_locally(self): locally = not self._run_node or self._run_node.is_local() @@ -281,7 +282,8 @@ return proc def prepare_test_proc_remotely(self, netns, popen_args): - self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr()) + self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr(), None, + self._run_node.ssh_port()) remote_prefix_dir = util.Dir(IPerf3Client.REMOTE_DIR) remote_run_dir = util.Dir(remote_prefix_dir.child('cli-' + str(self))) @@ -307,6 +309,8 @@ if netns: self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) + elif self._run_node.adb_serial_id(): + self.process = process.AdbProcess(self.name(), self.run_dir, self._run_node.adb_serial_id(), popen_args, env={}) else: self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) return self.process diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py index 7257769..552de71 100644 --- a/src/osmo_gsm_tester/obj/ms.py +++ b/src/osmo_gsm_tester/obj/ms.py @@ -48,7 +48,7 @@ # PROTECTED ############## def __init__(self, name, testenv, conf): - super().__init__(log.C_TST, name) + log.Origin.__init__(self, log.C_TST, name) self.testenv = testenv self._conf = conf self._msisdn = None @@ -77,6 +77,9 @@ elif ms_type == 'srsue': from .ms_srs import srsUE ms_class = srsUE + elif ms_type == 'androidue': + from .ms_android import AndroidUE + ms_class = AndroidUE elif ms_type == 'amarisoftue': from .ms_amarisoft import AmarisoftUE ms_class = AmarisoftUE diff --git a/src/osmo_gsm_tester/obj/ms_android.py b/src/osmo_gsm_tester/obj/ms_android.py new file mode 100644 index 0000000..9fddff3 --- /dev/null +++ b/src/osmo_gsm_tester/obj/ms_android.py @@ -0,0 +1,244 @@ +# osmo_gsm_tester: specifics for running an AndroidUE modem +# +# Copyright (C) 2020 by Software Radio Systems Limited +# +# Author: Nils F?rste +# Author: Bedran Karakoc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import pprint + +from ..core import log, util, config, remote, schema, process +from .run_node import RunNode +from .ms import MS +from .srslte_common import srslte_common +from ..core.event_loop import MainLoop +from .ms_srs import srsUEMetrics +from .android_bitrate_monitor import BitRateMonitor +from . import qc_diag +from .android_apn import AndroidApn +from .android_host import AndroidHost + + +def on_register_schemas(): + resource_schema = { + 'additional_args[]': schema.STR, + 'enable_pcap': schema.BOOL_STR, + } + for key, val in RunNode.schema().items(): + resource_schema['run_node.%s' % key] = val + for key, val in AndroidApn.schema().items(): + resource_schema['apn.%s' % key] = val + schema.register_resource_schema('modem', resource_schema) + + config_schema = { + 'enable_pcap': schema.BOOL_STR, + 'log_all_level': schema.STR, + } + schema.register_config_schema('modem', config_schema) + + +class AndroidUE(MS, AndroidHost, srslte_common): + + REMOTEDIR = '/osmo-gsm-tester-androidue' + METRICSFILE = 'android_ue_metrics.csv' + PCAPFILE = 'android_ue.pcap' + +############## +# PROTECTED +############## + def __init__(self, testenv, conf): + self._run_node = RunNode.from_conf(conf.get('run_node', {})) + self.apn_worker = AndroidApn.from_conf(conf.get('apn', {})) if conf.get('apn', {}) != {} else None + self.qc_diag_mon = qc_diag.QcDiag(testenv, conf) + super().__init__('androidue_%s' % self.addr(), testenv, conf) + srslte_common.__init__(self) + self.rem_host = None + self.run_dir = None + self.remote_run_dir = None + self.emm_connected = False + self.rrc_connected = False + self.conn_reset_intvl = 20 # sec + self.connect_timeout = 300 # sec + self.enable_pcap = None + self.remote_pcap_file = None + self.pcap_file = None + self.data_interface = None + self.remote_metrics_file = None + self.metrics_file = None + self.brate_mon = None + + def configure(self): + values = dict(ue=config.get_defaults('androidue')) + config.overlay(values, dict(ue=self.testenv.suite().config().get('modem', {}))) + config.overlay(values, dict(ue=self._conf)) + self.dbg('AndroidUE CONFIG:\n' + pprint.pformat(values)) + + if 'qc_diag' in self.features(): + self.enable_pcap = util.str2bool(values['ue'].get('enable_pcap', 'false')) + + self.metrics_file = self.run_dir.child(AndroidUE.METRICSFILE) + self.pcap_file = self.run_dir.child(AndroidUE.PCAPFILE) + if not self._run_node.is_local(): + self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr(), None, + self._run_node.ssh_port()) + self.remote_run_dir = util.Dir(AndroidUE.REMOTEDIR) + self.remote_metrics_file = self.remote_run_dir.child(AndroidUE.METRICSFILE) + self.remote_pcap_file = self.remote_run_dir.child(AndroidUE.PCAPFILE) + + if self.apn_worker: + self.apn_worker.configure(self.testenv, self.run_dir, self._run_node, self.rem_host) + # some Android UEs only accept new APNs when airplane mode is turned off + self.set_airplane_mode(False) + self.apn_worker.set_apn() + MainLoop.sleep(1) + self.set_airplane_mode(True) + + # clear old diag files + self._clear_diag_logs() + + def _clear_diag_logs(self): + popen_args_clear_diag_logs = \ + ['su', '-c', '\"rm -r /data/local/tmp/diag_logs/ || true\"'] + clear_diag_logs_proc = self.run_androidue_cmd('clear-diag-logs', popen_args_clear_diag_logs) + clear_diag_logs_proc.launch_sync() + + def verify_metric(self, value, operation='avg', metric='dl_brate', criterion='gt', window=1): + self.brate_mon.save_metrics(self.metrics_file) + metrics = srsUEMetrics(self.metrics_file) + return metrics.verify(value, operation, metric, criterion, window) + + def set_airplane_mode(self, apm_state): + self.log("Setting airplane mode: " + str(apm_state)) + popen_args = ['settings', 'put', 'global', 'airplane_mode_on', str(int(apm_state)), ';', + 'wait $!;', + 'su', '-c', '\"am broadcast -a android.intent.action.AIRPLANE_MODE\";'] + proc = self.run_androidue_cmd('set-airplane-mode', popen_args) + proc.launch_sync() + + def get_assigned_addr(self, ipv6=False): + ip_prefix = '172.16.0' + proc = self.run_androidue_cmd('get-assigned-addr', ['ip', 'addr', 'show']) + proc.launch_sync() + out_l = proc.get_stdout().split('\n') + ip = '' + for line in out_l: + if ip_prefix in line: + ip = line.split(' ')[5][:-3] + self.data_interface = line.split(' ')[-1] + return ip + +######################## +# PUBLIC - INTERNAL API +######################## + def cleanup(self): + self.set_airplane_mode(True) + + def addr(self): + return self._run_node.run_addr() + + def run_node(self): + return self._run_node + + def features(self): + return self._conf.get('features', []) + +################### +# PUBLIC (test API included) +################### + def run_netns_wait(self, name, popen_args): + # This function guarantees the compatibility with the current ping test. Please + # note that this function cannot execute commands on the machine the Android UE + # is attached to. + proc = self.run_androidue_cmd(name, popen_args) + proc.launch_sync() + return proc + + def connect(self, enb): + self.log('Starting AndroidUE') + self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) + self.configure() + CONN_CHK = 'osmo-gsm-tester_androidue_conn_chk.sh' + + if 'qc_diag' in self.features(): + self.qc_diag_mon.start() + + if self._run_node.is_local(): + popen_args_emm_conn_chk = [CONN_CHK, self._run_node.adb_serial_id(), '0', '0'] + else: + popen_args_emm_conn_chk = [CONN_CHK, '0', self.rem_host.host(), self.rem_host.get_remote_port()] + + # make sure osmo-gsm-tester_androidue_conn_chk.sh is available on the OGT master unit + name = 'emm-conn-chk' + run_dir = self.run_dir.new_dir(name) + emm_conn_chk_proc = process.Process(name, run_dir, popen_args_emm_conn_chk) + self.testenv.remember_to_stop(emm_conn_chk_proc) + emm_conn_chk_proc.launch() + + # check connection status + timer = self.connect_timeout + while timer > 0: + if timer % self.conn_reset_intvl == 0: + self.set_airplane_mode(True) + MainLoop.sleep(1) + timer -= 1 + self.set_airplane_mode(False) + + if 'LTE' in emm_conn_chk_proc.get_stdout(): + if not(self.get_assigned_addr() is ''): + self.emm_connected = True + self.rrc_connected = True + self.testenv.stop_process(emm_conn_chk_proc) + break + + MainLoop.sleep(2) + timer -= 2 + + if timer == 0: + raise log.Error('Connection timer of Android UE %s expired' % self._run_node.adb_serial_id()) + + self.brate_mon = BitRateMonitor(self.testenv, self.run_dir, self._run_node, self.rem_host, self.data_interface) + self.brate_mon.start() + + def is_rrc_connected(self): + if not ('qc_diag' in self.features()): + raise log.Error('Monitoring RRC states not supported (missing qc_diag feature?)') + + # if not self.qc_diag_mon.running(): + # raise log.Error('Diag monitoring crashed or was not started') + + rrc_state = self.qc_diag_mon.get_rrc_state() + if 'RRC_IDLE_CAMPED' in rrc_state: + self.rrc_connected = False + elif 'RRC_CONNECTED' in rrc_state: + self.rrc_connected = True + return self.rrc_connected + + def is_registered(self, mcc_mnc=None): + if mcc_mnc: + raise log.Error('An AndroidUE cannot register to any predefined MCC/MNC') + return self.emm_connected + + def get_counter(self, counter_name): + if counter_name == 'prach_sent': + # not implemented so far, return 2 to pass tests + return 2 + elif counter_name == 'paging_received': + return self.qc_diag_mon.get_paging_counter() + else: + raise log.Error('Counter %s not implemented' % counter_name) + + def netns(self): + return None diff --git a/src/osmo_gsm_tester/obj/qc_diag.py b/src/osmo_gsm_tester/obj/qc_diag.py new file mode 100644 index 0000000..a2029b4 --- /dev/null +++ b/src/osmo_gsm_tester/obj/qc_diag.py @@ -0,0 +1,274 @@ +# osmo_gsm_tester: specifics for running Qualcomm diagnostics on an AndroidUE modem +# +# Copyright (C) 2020 by Software Radio Systems Limited +# +# Author: Nils F?rste +# Author: Bedran Karakoc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import getpass +import os +from ..core import remote, util, process, schema, log +from ..core.event_loop import MainLoop +from . import ms_android +from .android_host import AndroidHost +from .run_node import RunNode + + +def on_register_schemas(): + resource_schema = {} + for key, val in ScatParser.schema().items(): + resource_schema['scat_parser.%s' % key] = val + schema.register_resource_schema('modem', resource_schema) + + +class QcDiag(AndroidHost): + + DIAG_PARSER = 'osmo-gsm-tester_androidue_diag_parser.sh' + +############## +# PROTECTED +############## + def __init__(self, testenv, conf): + self._run_node = RunNode.from_conf(conf.get('run_node', {})) + super().__init__('qcdiag_%s' % self._run_node.run_addr()) + self.testenv = testenv + self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) + if not self._run_node.is_local(): + self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr(), None, + self._run_node.ssh_port()) + self.remote_run_dir = util.Dir(ms_android.AndroidUE.REMOTEDIR) + self.scat_parser = ScatParser(testenv, conf) + testenv.register_for_cleanup(self.scat_parser) + self.diag_monitor_proc = None + self.enable_pcap = util.str2bool(conf.get('enable_pcap', 'false')) + +######################## +# PUBLIC - INTERNAL API +######################## + def get_rrc_state(self): + scat_parser_stdout_l = self.scat_parser.get_stdout().split('\n') + # Find the first "Pulling new .qmdl file..." and check the state afterwards. This has to be done to + # ensure that no process is reading the ScatParser's stdout while the parser is still writing to it. + is_full_block = False + for line in reversed(scat_parser_stdout_l): + if 'Pulling new .qmdl file...' in line: + is_full_block = True + if is_full_block and 'LTE_RRC_STATE_CHANGE' in line: + rrc_state = line.split(' ')[-1].replace('rrc_state=', '') + rrc_state.replace('\'', '') + return rrc_state + return '' + + def get_paging_counter(self): + diag_parser_stdout_l = self.scat_parser.get_stdout().split('\n') + return diag_parser_stdout_l.count('Paging received') + + def running(self): + return self.diag_monitor_proc.is_running() + + def write_pcap(self, restart=False): + self.scat_parser.write_pcap(restart) + + def start(self): + popen_args_diag = ['/vendor/bin/diag_mdlog', '-s', '90000', '-f', '/data/local/tmp/ogt_diag.cfg', + '-o', '/data/local/tmp/diag_logs'] + self.diag_monitor_proc = self.run_androidue_cmd('start-diag-monitor_%s' % self._run_node.adb_serial_id(), popen_args_diag) + self.testenv.remember_to_stop(self.diag_monitor_proc) + self.diag_monitor_proc.launch() + + self.scat_parser.configure(self._run_node, self.enable_pcap) + self.scat_parser.start() + + def scp_back_pcap(self): + self.scat_parser.scp_back_pcap() + + +class ScatParser(AndroidHost): +############## +# PROTECTED +############## + def __init__(self, testenv, conf): + self.testenv = testenv + self._run_node = RunNode.from_conf(conf.get('scat_parser', {})) + super().__init__('scat_parser_%s' % self._run_node.run_addr()) + self.run_dir = util.Dir(self.testenv.test().get_run_dir().new_dir(self.name())) + self.remote_run_dir = None + self.rem_host = None + self.pcap_file = None + self.remote_pcap_file = None + self.parser_proc = None + self._parser_proc = None + self.popen_args_diag_parser = None + self._run_node_ue = None + self.enable_pcap = False + + def _clear_diag_files(self): + name_chown = 'chown-diag-files' + diag_dir_local = str(self.run_dir) + '/diag_logs/' + diag_dir_remote = str(self.remote_run_dir) + '/diag_logs/' + popen_args_change_owner = ['sudo', 'chown', '-R', '', ''] + run_dir_chown = self.run_dir.new_dir(name_chown) + if self._run_node.is_local(): + if os.path.exists(diag_dir_local): + # Due to errors the diag_logs dir can be non-existing. To avoid errors the path + # is checked for existence first. + popen_args_change_owner[3] = getpass.getuser() + popen_args_change_owner[4] = diag_dir_local + change_owner_proc = process.Process(name_chown, run_dir_chown, popen_args_change_owner) + change_owner_proc.launch_sync() + else: + popen_args_change_owner = ['sudo', 'chown', '-R', self.rem_host.user(), diag_dir_remote] + change_owner_proc = self.rem_host.RemoteProcess(name_chown, popen_args_change_owner, remote_env={}) + change_owner_proc.launch_sync() + + name_clear = 'clear-diag-files' + run_dir_clear = self.run_dir.new_dir(name_clear) + popen_args_clear_diag_files = ['rm', '-r', ''] + if self._run_node.is_local(): + popen_args_clear_diag_files[2] = diag_dir_local + clear_run_dir_proc = process.Process(name_clear, run_dir_clear, popen_args_clear_diag_files) + else: + popen_args_clear_diag_files[2] = diag_dir_remote + clear_run_dir_proc = self.rem_host.RemoteProcess(name_clear, popen_args_clear_diag_files, remote_env={}) + clear_run_dir_proc.launch_sync() + +######################## +# PUBLIC - INTERNAL API +######################## + @classmethod + def schema(cls): + resource_schema = { + 'run_type': schema.STR, + 'run_addr': schema.IPV4, + 'ssh_user': schema.STR, + 'ssh_addr': schema.IPV4, + 'run_label': schema.STR, + 'ssh_port': schema.STR, + 'adb_serial_id': schema.STR, + } + return resource_schema + + def configure(self, run_node, enable_pcap): + self.enable_pcap = enable_pcap + self._run_node_ue = run_node + + if not self._run_node.is_local(): + self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr()) + self.remote_run_dir = util.Dir(ms_android.AndroidUE.REMOTEDIR) + self.remote_pcap_file = self.remote_run_dir.child(ms_android.AndroidUE.PCAPFILE) + self.pcap_file = self.run_dir.child(ms_android.AndroidUE.PCAPFILE) + + def start(self): + # format: osmo-gsm-tester_androidue_diag_parser.sh $serial $run_dir $pcap_path $remote_ip $remote_port + self.popen_args_diag_parser = [QcDiag.DIAG_PARSER, '', '', '', '', ''] + if self._run_node_ue.is_local(): + if not self._run_node.is_local(): + # AndroidUE is attached to Master but ScatParser is running remote + raise log.Error('Running the network locally and the ScatParser remotely is currently not supported') + else: + # Master, ScatParser, and AndroidUE are attached to/running on the same host + self.popen_args_diag_parser[1] = str(self._run_node.adb_serial_id()) # adb serial + self.popen_args_diag_parser[2] = str(self.run_dir) # run dir path + self.popen_args_diag_parser[3] = str(self.pcap_file) # pcap file path + self.popen_args_diag_parser[4] = '0' # remote ip + self.popen_args_diag_parser[5] = '0' # remote port + else: + if self._run_node.is_local(): + # Master and ScatParser running on the same machine, the AndroidUE runs remote + self.popen_args_diag_parser[1] = '0' # adb serial + self.popen_args_diag_parser[2] = str(self.run_dir) # run dir path + self.popen_args_diag_parser[3] = str(self.pcap_file) # pcap file path + self.popen_args_diag_parser[4] = str(self._run_node_ue.ssh_addr()) # remote ip AndroidUE + self.popen_args_diag_parser[5] = str(self._run_node_ue.ssh_port()) # remote port AndroidUE + elif self._run_node.ssh_addr() == self._run_node_ue.ssh_addr(): + # ScatParser and AndroidUE are remote but on the same machine + self.popen_args_diag_parser[1] = str(self._run_node.adb_serial_id()) # adb serial + self.popen_args_diag_parser[2] = str(self.remote_run_dir) # run dir path + self.popen_args_diag_parser[3] = str(self.remote_pcap_file) # pcap file path + self.popen_args_diag_parser[4] = '0' # remote ip + self.popen_args_diag_parser[5] = '0' # remote port + else: + # Master, ScatParser and AndroidUE are running on/attached to different machines + self.popen_args_diag_parser[1] = '0' # adb serial + self.popen_args_diag_parser[2] = str(self.remote_run_dir) # run dir path + self.popen_args_diag_parser[3] = str(self.remote_pcap_file) # pcap file path + self.popen_args_diag_parser[4] = str(self._run_node_ue.ssh_addr()) # remote ip AndroidUE + self.popen_args_diag_parser[5] = str(self._run_node_ue.ssh_port()) # remote port AndroidUE + + if not self._run_node.is_local(): + # The diag_logs directory only exists here if the ScatParser entity is running remote + self._clear_diag_files() + + name = 'scat_parser_%s' % self._run_node.run_addr() + if self._run_node.is_local(): + run_dir = self.run_dir.new_dir(name) + self.parser_proc = process.Process(name, run_dir, self.popen_args_diag_parser) + else: + self.parser_proc = self.rem_host.RemoteProcess(name, self.popen_args_diag_parser, remote_env={}) + self.testenv.remember_to_stop(self.parser_proc) + self.parser_proc.launch() + + def stop(self): + self.testenv.stop_process(self.parser_proc) + + def write_pcap(self, restart=False): + # We need to stop the diag_parser to avoid pulling a new .qmdl during + # the parsing process. The process can be restarted afterwards but keep in + # mind that this will overwrite the pcap after some time. The diag_monitor + # process can continue, as it does not hinder this process. + if self.parser_proc and self.parser_proc.is_running(): + self.testenv.stop_process(self.parser_proc) + self._clear_diag_files() + + name = 'write-pcap_%s' % self._run_node.run_addr() + if self._run_node.is_local(): + run_dir = self.run_dir.new_dir(name) + self._parser_proc = process.Process(name, run_dir, self.popen_args_diag_parser) + else: + self._parser_proc = self.rem_host.RemoteProcess(name, self.popen_args_diag_parser, remote_env={}) + self.testenv.remember_to_stop(self._parser_proc) + self._parser_proc.launch() + + MainLoop.wait(self.finished_parsing, timestep=0.1, timeout=300) + + if restart: + self.parser_proc = self._parser_proc + else: + self.testenv.stop_process(self._parser_proc) + + def finished_parsing(self): + scat_parser_stdout = self._parser_proc.get_stdout() + # If the parsers pulls the .qmdl file for the second time we know that + # the parsing of the first one is done + return scat_parser_stdout.count('Pulling new .qmdl file...') > 1 + + def get_stdout(self): + return self.parser_proc.get_stdout() + + def is_running(self): + return self.parser_proc.is_running() + + def scp_back_pcap(self): + try: + self.rem_host.scpfrom('scp-back-pcap', self.remote_pcap_file, self.pcap_file) + except Exception as e: + self.log(repr(e)) + + def cleanup(self): + if self.enable_pcap: + self.write_pcap(restart=False) + if not self._run_node.is_local(): + self.scp_back_pcap() diff --git a/src/osmo_gsm_tester/obj/run_node.py b/src/osmo_gsm_tester/obj/run_node.py index 7c41705..72879a7 100644 --- a/src/osmo_gsm_tester/obj/run_node.py +++ b/src/osmo_gsm_tester/obj/run_node.py @@ -30,7 +30,7 @@ T_LOCAL = 'local' T_REM_SSH = 'ssh' - def __init__(self, type=None, run_addr=None, ssh_user=None, ssh_addr=None, run_label=None, ssh_port=None): + def __init__(self, type=None, run_addr=None, ssh_user=None, ssh_addr=None, run_label=None, ssh_port=None, adb_serial_id=None): super().__init__(log.C_RUN, 'runnode') self._type = type self._run_addr = run_addr @@ -38,6 +38,7 @@ self._ssh_addr = ssh_addr self._run_label = run_label self._ssh_port = ssh_port + self._adb_serial_id = adb_serial_id if not self._type: raise log.Error('run_type not set') if not self._run_addr: @@ -56,7 +57,8 @@ def from_conf(cls, conf): return cls(conf.get('run_type', None), conf.get('run_addr', None), conf.get('ssh_user', None), conf.get('ssh_addr', None), - conf.get('run_label', None), conf.get('ssh_port', None)) + conf.get('run_label', None), conf.get('ssh_port', None), + conf.get('adb_serial_id', None)) @classmethod def schema(cls): @@ -67,6 +69,7 @@ 'ssh_addr': schema.IPV4, 'run_label': schema.STR, 'ssh_port': schema.STR, + 'adb_serial_id': schema.STR, } return resource_schema @@ -94,4 +97,7 @@ def ssh_port(self): return self._ssh_port + def adb_serial_id(self): + return self._adb_serial_id + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/sysmocom/scenarios/ms-label.conf b/sysmocom/scenarios/ms-label.conf new file mode 100644 index 0000000..a129c0e --- /dev/null +++ b/sysmocom/scenarios/ms-label.conf @@ -0,0 +1,3 @@ +resources: + modem: + - label: ${param1} diff --git a/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh b/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh new file mode 100644 index 0000000..d8ff049 --- /dev/null +++ b/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# This script reads the network type of an Android phone via ADB +# usage: osmo-gsm-tester_androidue_conn_chk.sh $serial $remote_ip $remote_port +serial=$1 +remote_ip=$2 +remote_port=$3 +while true; do + if [ "${serial}" == "0" ]; then + # run_type == ssh + ssh -p "${remote_port}" root@"${remote_ip}" getprop "gsm.network.type" + else + # run_type = local + adb -s "${serial}" shell getprop "gsm.network.type" + fi + sleep 1 +done diff --git a/utils/bin/osmo-gsm-tester_androidue_diag_parser.sh b/utils/bin/osmo-gsm-tester_androidue_diag_parser.sh new file mode 100644 index 0000000..db53261 --- /dev/null +++ b/utils/bin/osmo-gsm-tester_androidue_diag_parser.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# This script pulls the diag folder created by diag_mdlog and parses the +# .qmdl file. Further, it writes all packets to a pcap file. +# usage: osmo-gsm-tester_androidue_diag_parser.sh $serial $run_dir $pcap_path $remote_ip $remote_port +serial=$1 +run_dir=$2 +pcap_path=$3 +remote_ip=$4 +remote_port=$5 +while true; do + echo "Pulling new .qmdl file..." + if [ "${remote_ip}" == "0" ]; then + # ScatParser and AndroidUe are attached to/running on the same machine + sudo adb -s "${serial}" pull /data/local/tmp/diag_logs "${run_dir}" >/dev/null + wait $! + else + # ScatParser and AndroidUe are attached to/running on different machines + scp -r -P "${remote_port}" root@"${remote_ip}":/data/local/tmp/diag_logs/ "${run_dir}" + wait $! + fi + qmdl_fn=$(find "${run_dir}" -maxdepth 2 -type f -name "*.qmdl") + wait $! + sudo scat -t qc --event -d "${qmdl_fn}" -F "${pcap_path}" + wait $! +done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I79a5d803e869a868d4dac5e0d4c2feb38038dc5c Gerrit-Change-Number: 21302 Gerrit-PatchSet: 7 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:52:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 16:52:44 +0000 Subject: Change in osmo-gsm-tester[master]: enb, ue, process: move stdout counter helper to process objects In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 ) Change subject: enb,ue,process: move stdout counter helper to process objects ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 Gerrit-Change-Number: 22042 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:52:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:54:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 16:54:12 +0000 Subject: Change in osmo-gsm-tester[master]: enb: Set cipher and integrity via scenario file In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21582 ) Change subject: enb: Set cipher and integrity via scenario file ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I595206b7d49016fb6d0aec175c828d9537c53886 Gerrit-Change-Number: 21582 Gerrit-PatchSet: 9 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Mon, 08 Feb 2021 16:54:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:55:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 16:55:37 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME ...................................................................... Patch Set 3: Thanks. Can we move the field to something more descriptive? Like "subscriber_count" ? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:55:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 16:58:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 16:58:48 +0000 Subject: Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py File src/osmo_gsm_tester/obj/srslte_common.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py at 50 PS3, Line 50: def get_stdout_kpis(self): I'm in general not happy to see new public APIs like this popping up (is it public to be used by tests? it's not clear here. It makes it harder to later on support new implementations of object classes. In case of this being a public API, what's the benefit of having this public and not gathering all the KPIs from test through "get_kpis()"? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:58:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:02:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:02:00 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... Patch Set 3: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/enb.py at 360 PS3, Line 360: def get_stdout_kpis(self): As I said, I'm not really liking more and more APIS appearing. I don't see the benefit of having several APIs where one "get_kpis" containing all the kpis (dict) is enough. https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py File src/osmo_gsm_tester/obj/epc.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py at 124 PS3, Line 124: return {'total_errors': 0, 'total_warnings': 0} Still missing to remove trailing whitespace. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:02:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:02:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:02:38 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 to look at the new patch set (#4). Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... xua: Implement SNM availability/unavailability messaging M3UA and SUA have one sub-protocol called [S]SNM, through which the SG informs the ASP about certain destinations (point codes) becoming available (DAVA) or unavailable (DUNA) in the SS7 network. This patch adds support for * generating DAVA/DUAN on a SGP when the AS FSM changes to/from AS-ACTIVE * receiving DAVA/DUNA on an ASP and informing other "SG role" AS/ASP * processing DAUD from ASP received by SG, generating relate DAVA/DUNA responses Related: OS#2623 Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 --- M src/Makefile.am M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_internal.h A src/xua_snm.c 6 files changed, 554 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/77/22777/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:02:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:02:47 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/m3ua.c File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/m3ua.c at 825 PS3, Line 825: * \param[in] available are aff_pc now available (true) or unavailable (false */ > (false) Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/xua_snm.c at 91 PS3, Line 91: m3ua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); > so these new params don't exist in M3UA? no, as it is one level lower in the protocol stack. At M3UA level you can only inform about unavailability of a point code level. In SUA you are at SCCP level, and you can inform about unavailability of a SCCP sub-system level. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:02:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:02:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:02:57 +0000 Subject: Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 ) Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:02:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:03:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:03:01 +0000 Subject: Change in libosmo-sccp[master]: SUA: Verify routing context IE of incoming CL and CO messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 ) Change subject: SUA: Verify routing context IE of incoming CL and CO messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 Gerrit-Change-Number: 22776 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:03:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:03:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:03:03 +0000 Subject: Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 ) Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() ...................................................................... m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() This way the function can be re-used by SUA. Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 --- M src/Makefile.am M src/m3ua.c M src/xua_internal.h A src/xua_shared.c 4 files changed, 108 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 484886c..91084de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ - sccp_user.c sccp_types.c xua_rkm.c xua_default_lm_fsm.c \ + sccp_user.c sccp_types.c xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/m3ua.c b/src/m3ua.c index 542777e..bfb0c23 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -532,60 +532,6 @@ return data_hdr; } -/* if given ASP only has one AS, return that AS */ -static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as, *as_found = NULL; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - /* check if we already had found another AS within this ASP -> not unique */ - if (as_found) - return NULL; - as_found = as; - } - - return as_found; -} - -static int find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, - const struct xua_msg_part *rctx_ie) -{ - *as = NULL; - - if (rctx_ie) { - uint32_t rctx = xua_msg_part_get_u32(rctx_ie); - /* Use routing context IE to look up the AS for which the - * message was received. */ - *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); - if (!*as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n", - __func__, rctx); - return M3UA_ERR_INVAL_ROUT_CTX; - } - - /* Verify that this ASP is part of the AS. */ - if (!osmo_ss7_as_has_asp(*as, asp)) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): This Application Server Process is not part of the AS %s " - "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx); - return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; - } - } else { - /* no explicit routing context; this only works if there is only one AS in the ASP */ - *as = find_single_as_for_asp(asp); - if (!*as) { - LOGPASP(asp, DLM3UA, LOGL_ERROR, - "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " - "identify the AS for this message\n", __func__); - return M3UA_ERR_INVAL_ROUT_CTX; - } - } - - return 0; -} - static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua) { struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); @@ -603,7 +549,7 @@ return M3UA_ERR_UNSUPP_MSG_TYPE; } - rc = find_as_for_asp(&as, asp, rctx_ie); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); if (rc) return rc; diff --git a/src/xua_internal.h b/src/xua_internal.h index d836fae..65adfb6 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -69,6 +69,8 @@ int xua_as_transmit_msg(struct osmo_ss7_as *as, struct msgb *msg); +int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, + const struct xua_msg_part *rctx_ie); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); diff --git a/src/xua_shared.c b/src/xua_shared.c new file mode 100644 index 0000000..cdd6f7f --- /dev/null +++ b/src/xua_shared.c @@ -0,0 +1,104 @@ +/* Shared code between M3UA and SUA implementation */ + +/* (C) 2015-2021 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include +#include + +#include "xua_internal.h" + +/* if given ASP only has one AS, return that AS */ +static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) +{ + struct osmo_ss7_as *as, *as_found = NULL; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + /* check if we already had found another AS within this ASP -> not unique */ + if (as_found) + return NULL; + as_found = as; + } + + return as_found; +} + +/* this is why we can use the M3UA constants below in a function shared between M3UA + SUA */ +osmo_static_assert(M3UA_ERR_INVAL_ROUT_CTX == SUA_ERR_INVAL_ROUT_CTX, _err_rctx); +osmo_static_assert(M3UA_ERR_NO_CONFGD_AS_FOR_ASP == SUA_ERR_NO_CONFGD_AS_FOR_ASP, _err_as_for_asp); + +/*! Find the AS for given ASP + optional routing context IE. + * if rctx_ie == NULL, we assume that this ASP is only part of a single AS; + * if rctx_ie is given, then we look-up the ASP based on the routing context, + * and verify that this ASP is part of it. + * \param[out] as caller-provided address-of-pointer to store the found AS + * \param[in] asp ASP for which we want to look-up the AS + * \param[in] rctx_ie routing context IE (may be NULL) to use for look-up + * \returns 0 in case of success; {M3UA,SUA}_ERR_* code in case of error. */ +int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, + const struct xua_msg_part *rctx_ie) +{ + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + *as = NULL; + + if (rctx_ie) { + uint32_t rctx = xua_msg_part_get_u32(rctx_ie); + /* Use routing context IE to look up the AS for which the + * message was received. */ + *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx); + if (!*as) { + LOGPASP(asp, log_ss, LOGL_ERROR, "%s(): invalid routing context: %u\n", + __func__, rctx); + return M3UA_ERR_INVAL_ROUT_CTX; + } + + /* Verify that this ASP is part of the AS. */ + if (!osmo_ss7_as_has_asp(*as, asp)) { + LOGPASP(asp, log_ss, LOGL_ERROR, + "%s(): This Application Server Process is not part of the AS %s " + "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx); + return M3UA_ERR_NO_CONFGD_AS_FOR_ASP; + } + } else { + /* no explicit routing context; this only works if there is only one AS in the ASP */ + *as = find_single_as_for_asp(asp); + if (!*as) { + LOGPASP(asp, log_ss, LOGL_ERROR, + "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " + "identify the AS for this message\n", __func__); + return M3UA_ERR_INVAL_ROUT_CTX; + } + } + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:03:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:03:04 +0000 Subject: Change in libosmo-sccp[master]: SUA: Verify routing context IE of incoming CL and CO messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 ) Change subject: SUA: Verify routing context IE of incoming CL and CO messages ...................................................................... SUA: Verify routing context IE of incoming CL and CO messages When receiving user-data (connectionless / connection-oriented), we must make sure that there either a) no routing context IE in the message, and only one AS within the ASP, or b) a valid routing context IE for an AS within the ASP This important input validation has been done in M3UA for a long time, but somehow never been implemented on the SUA side so far. Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 --- M src/sua.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/sua.c b/src/sua.c index 4a98b9a..42d43e8 100644 --- a/src/sua.c +++ b/src/sua.c @@ -510,10 +510,17 @@ /* connectionless messages received from socket */ static int sua_rx_cl(struct osmo_ss7_asp *asp, struct xua_msg *xua) { + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); struct osmo_sccp_instance *inst = asp->inst->sccp; + struct osmo_ss7_as *as; + int rc; OSMO_ASSERT(xua->hdr.msg_class == SUA_MSGC_CL); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + switch (xua->hdr.msg_type) { case 0: /* Reserved, permitted by ETSI TS 101 592 5.2.3.2 */ case SUA_CL_CLDT: @@ -531,10 +538,17 @@ /* connection-oriented messages received from socket */ static int sua_rx_co(struct osmo_ss7_asp *asp, struct xua_msg *xua) { + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); struct osmo_sccp_instance *inst = asp->inst->sccp; + struct osmo_ss7_as *as; + int rc; OSMO_ASSERT(xua->hdr.msg_class == SUA_MSGC_CO); + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + switch (xua->hdr.msg_type) { case 0: /* Reserved, permitted by ETSI TS 101 592 5.2.3.2 */ case SUA_CO_CORE: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 Gerrit-Change-Number: 22776 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:03:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:03:47 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: return 0 if iperf results can't be read back In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22037 ) Change subject: iperf3: return 0 if iperf results can't be read back ...................................................................... Patch Set 9: I added +2 here, but thinking about it, does it really make sense to mask the exception by default and return 0? I'm not that sure. Id you really want to mute the exception, I'd do that in the caller of the method, not the method itself. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I5a8fe32f0a2bb676dbb80dad500bc6c63c176485 Gerrit-Change-Number: 22037 Gerrit-PatchSet: 9 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:03:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:08:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:08:56 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py at 368 PS1, Line 368: def get_num_phy_errors(self, kpi): > It's used in one of the TC to check for erros, like also KPI. [?] Why not add this as a KPI? This way we don't need yet another API for this kind of counters. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:08:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: srs_andre Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:11:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:11:21 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 to look at the new patch set (#3). Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... sccp: Add minimalistic SCMG implementation SCMG (SCCP Management) is a special sub-system that normally resides at SSN=1. In Osmocom we so far ignored its existence. However, in terms of interop with other implementation, we should implement at least some basic features. The only procedure implemented in this initial commit is the response to an incoming SST (Subsystem Test) message. If we don't respond to this message, a remote SCCP entity could assume the SSN is dead on our side, rendering communication impossible. Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 --- M include/osmocom/sigtran/Makefile.am A include/osmocom/sigtran/protocol/sccp_scmg.h M src/sccp_internal.h M src/sccp_scmg.c M src/sccp_user.c 5 files changed, 166 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/22789/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:11:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:11:33 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1//COMMIT_MSG at 10 PS1, Line 10: at SSN=1. In Osmcoom we so far ignored its existence. However, > Osmocom Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1/src/sccp_scmg.c File src/sccp_scmg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1/src/sccp_scmg.c at 192 PS1, Line 192: /* PC is encoded in little endian ?!? */ > does this mean you tested against some implementation not following our expectations? no, this means I'm extremely surprised to see that in the specs the byte order for the PC is little-endian, while normally everything is big-endian. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:11:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:12:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:12:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 ) Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:12:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:12:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:12:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 ) Change subject: GSM_Types: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:12:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:12:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:12:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 ) Change subject: pcu: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 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: I2c8b343fba5fabda9f78af8711e2a837536518e9 Gerrit-Change-Number: 22736 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:12:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 ) Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c Gerrit-Change-Number: 22738 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:13:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 ) Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function ...................................................................... BSSGP_Emulation: Fix warning: control reaches end of non-void function Change-Id: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 16 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 4af5f82..04220ed 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -25,6 +25,7 @@ import from BSSGP_Types all; import from Osmocom_Gb_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; #ifdef BSSGP_EM_L3 import from MobileL3_GMM_SM_Types all; @@ -591,8 +592,8 @@ } else if (ischosen(l3_mo.msgs.sms)) { return c_LLC_SAPI_LLSMS; } - setverdict(fail, "No LLC SAPI for ", l3_mo); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No LLC SAPI for ", l3_mo)); + return '0000'B; } private function f_llc_sapi_by_l3_mt(PDU_L3_SGSN_MS l3_mt) return BIT4 { @@ -603,8 +604,8 @@ } else if (ischosen(l3_mt.msgs.sms)) { return c_LLC_SAPI_LLSMS; } - setverdict(fail, "No LLC SAPI for ", l3_mt); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No LLC SAPI for ", l3_mt)); + return '0000'B; } #endif @@ -830,8 +831,7 @@ /* Default Create Callback function: Fail and terminate */ function DefaultCreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli, BssgpDecoded dec) runs on BSSGP_BVC_CT { - setverdict(fail, "Couldn't find Component for TLLI ", tlli); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't find Component for TLLI ", tlli)); } /* @@ -874,9 +874,10 @@ for (i := 0; i < sizeof(ClientTable); i := i+1) { if (isvalue(ClientTable[i].imsi) and ClientTable[i].imsi == imsi) { if (ClientTable[i].comp_ref != vc_conn) { - setverdict(fail, "Cannot unregister index=", i, " IMSI ", imsi, " registred to ", - ClientTable[i].comp_ref, " from ", vc_conn); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Cannot unregister index=", i, " IMSI ", + imsi, " registred to ", ClientTable[i].comp_ref, + " from ", vc_conn)); } log("Removing Client IMSI=", imsi, ", index=", i); ClientTable[i] := { @@ -919,8 +920,8 @@ return ClientTable[i].comp_ref; } } - setverdict(fail, "Couldn't find Component for IMSI ", imsi); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't find Component for IMSI ", imsi)); + return ClientTable[0].comp_ref; } private function f_tbl_comp_by_tlli(OCT4 tlli) runs on BSSGP_BVC_CT return BSSGP_Client_CT { @@ -942,8 +943,8 @@ return i; } } - setverdict(fail, "Couldn't find Client for Component ", comp_ref); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't find Client for Component ", comp_ref)); + return 1; } private function f_tbl_tlli_by_comp(BSSGP_Client_CT comp_ref) runs on BSSGP_BVC_CT return OCT4 { @@ -954,8 +955,8 @@ return ClientTable[i].tlli; } } - setverdict(fail, "Couldn't find TLLI for Component ", comp_ref); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't find TLLI for Component ", comp_ref)); + return '00000000'O; } /* PDU_BSSGP enhanced with LLC and possibly L3 decoded payloads */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix indentation whitespace In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 ) Change subject: BSSGP_Emulation: Fix indentation whitespace ...................................................................... BSSGP_Emulation: Fix indentation whitespace Change-Id: Iade336832e7045cd29bae52c7907c6a1c57813cd --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 04220ed..4b93a26 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -365,7 +365,7 @@ } else { setverdict(fail, "Rx SIG BSSGP for unknown PTP BVCI ", ptp_bvci, ": ", udi.bssgp); BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0)); - } + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 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: Iade336832e7045cd29bae52c7907c6a1c57813cd Gerrit-Change-Number: 22723 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: CTRL: Avoid using keyword 'now' as var In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 ) Change subject: CTRL: Avoid using keyword 'now' as var ...................................................................... CTRL: Avoid using keyword 'now' as var Fixes warning: Keyword 'now' is treated as an identifier. Activate compiler option '-I' to use real-time testing features Change-Id: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f --- M library/Osmocom_CTRL_Functions.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index 294fe33..15cb26f 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -268,14 +268,14 @@ * Set the test verdict accordingly. */ function f_counter_name_vals_expect(IPA_CTRL_PT pt, charstring instance_name, integer instance_nr, CounterNameVals vals) { - var CounterNameVals now := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); + var CounterNameVals last := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); for (var integer i := 0; i < lengthof(vals); i := i + 1) { - if (now[i].name != vals[i].name) { + if (last[i].name != vals[i].name) { setverdict(fail, "Internal error"); } - if (now[i].val != vals[i].val) { + if (last[i].val != vals[i].val) { setverdict(fail, "Rate counter mismatch: ", instance_name, " ", instance_nr, - " ", vals[i].name, " is at ", now[i].val, " but expected ", vals[i].val); + " ", vals[i].name, " is at ", last[i].val, " but expected ", vals[i].val); } } setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 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: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f Gerrit-Change-Number: 22725 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... pcu: Fix inadequate restriction on the referenced template parameter Fixes: warning: Inadequate restriction on the referenced template parameter `chreq_desc', this may cause a dynamic test case error at runtime Change-Id: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b --- M pcu/GPRS_Components.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index bf2e868..3658fc8 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -423,7 +423,7 @@ } function f_dltbf_ts_RLCMAC_DL_ACK_NACK(DlTbf dl_tbf, boolean use_egprs := false, - template ChannelReqDescription chreq_desc := omit) + template (omit) ChannelReqDescription chreq_desc := omit) runs on MS_BTS_IFACE_CT return template RlcmacUlBlock { if (use_egprs) { return ts_RLCMAC_DL_ACK_NACK_EGPRS(dl_tbf.tfi, dl_tbf.egprs_acknack_desc, false, chreq_desc); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 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: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b Gerrit-Change-Number: 22727 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... pcu: Fix inadequate restriction on the referenced template parameter Fixes: warning: Inadequate restriction on the referenced template parameter `tfi', this may cause a dynamic test case error at runtime Same for other parameters. Change-Id: If2cadbc7087ac0f99537b9916ef0c23363c9242c --- M library/RLCMAC_Templates.ttcn 1 file changed, 19 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 981061c..6b5fb9f 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -422,9 +422,12 @@ } /* Template for uplink Data block */ - template RlcmacUlBlock t_RLCMAC_UL_DATA(template CodingScheme cs, template uint5_t tfi, - template uint4_t cv, template uint7_t bsn, - template LlcBlocks blocks := {}, template boolean stall := false) := { + template (value) RlcmacUlBlock t_RLCMAC_UL_DATA(template (value) CodingScheme cs, + template (value) uint5_t tfi, + template (value) uint4_t cv, + template (value) uint7_t bsn, + template (value) LlcBlocks blocks := {}, + template (value) boolean stall := false) := { data := { cs := cs, mac_hdr := { @@ -444,10 +447,13 @@ blocks := blocks } } - template RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template CodingScheme cs, template uint5_t tfi, - template uint4_t cv, template uint7_t bsn, - template LlcBlocks blocks := {}, template boolean stall := false, - template GprsTlli tlli) := { + template (value) RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template (value) CodingScheme cs, + template (value) uint5_t tfi, + template (value) uint4_t cv, + template (value) uint7_t bsn, + template (value) LlcBlocks blocks := {}, + template (value) boolean stall := false, + template (value) GprsTlli tlli) := { data := { cs := cs, mac_hdr := { @@ -469,9 +475,12 @@ } /* Template for uplink Data block */ - template RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs, - template uint5_t tfi, template uint4_t cv, - template uint11_t bsn1, template uint8_t bsn2_offset := 0, template EgprsLlcBlocks blocks := {}) := { + template (value) RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs, + template (value) uint5_t tfi, + template (value) uint4_t cv, + template (value) uint11_t bsn1, + template (value) uint8_t bsn2_offset := 0, + template (value) EgprsLlcBlocks blocks := {}) := { data_egprs := { mcs := mcs, mac_hdr := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 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: If2cadbc7087ac0f99537b9916ef0c23363c9242c Gerrit-Change-Number: 22728 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 ) Change subject: pcu: Fix inadequate restriction on the referenced template parameter ...................................................................... pcu: Fix inadequate restriction on the referenced template parameter warning: Inadequate restriction on the referenced template parameter `imsi' Change-Id: Iecd19d8d397e427068e495577889e1247faa11e7 --- M pcu/GPRS_Components.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 3658fc8..830f8d3 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -1153,7 +1153,7 @@ } /* Return true if a given Packet Paging Request contains the given IMSI, false otherwise */ -function f_pkt_paging_match_imsi(in PacketPagingReq req, template hexstring imsi, +function f_pkt_paging_match_imsi(in PacketPagingReq req, template (present) hexstring imsi, boolean cs_domain := true, boolean ps_domain := true) runs on MS_BTS_IFACE_CT return boolean { if (not ispresent(req.repeated_pageinfo)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 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: Iecd19d8d397e427068e495577889e1247faa11e7 Gerrit-Change-Number: 22729 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 ) Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function ...................................................................... Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function Fixes warning: Osmocom_Gb_Types.ttcn:1377.13-32: warning: Inadequate restriction on the referenced function `f_oct_or_wc(bmax, 2)', this may cause a dynamic test case error at runtime Change-Id: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index cbaeb72..4e1fb8c 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -1374,7 +1374,7 @@ lengthIndicator := { length1 := 2 }, - bmax := f_oct_or_wc(bmax, 2) + bmax := int2oct(bmax, 2) }, bucket_Leak_Rate := { iEI := '03'O, @@ -1382,7 +1382,7 @@ lengthIndicator := { length1 := 2 }, - r_Value := f_oct_or_wc(bucket_leak_rate, 2) + r_Value := int2oct(bucket_leak_rate, 2) }, bucket_Full_Ratio := omit, flow_Control_Granularity := omit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c Gerrit-Change-Number: 22730 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 ) Change subject: GSM_Types: Fix warning: control reaches end of non-void function ...................................................................... GSM_Types: Fix warning: control reaches end of non-void function Change-Id: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 --- M library/GSM_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 9710c26..bcd0afb 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -14,6 +14,7 @@ import from General_Types all; import from Osmocom_Types all; +import from Misc_Helpers all; type integer GsmArfcn (0..1023); type integer UmtsArfcn (0..16383); @@ -86,11 +87,10 @@ case (CS2) { return 32 } case (CS3) { return 38 } case (CS3) { return 52 } - case else { - setverdict(fail, "Invalid GPRS CS ", cs); - mtc.stop; - } } + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Invalid GPRS CS ", cs)); + return 0; } const GprsTlli TLLI_UNUSED := 'FFFFFFFF'O; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 ) Change subject: pcu: Fix warning: control reaches end of non-void function ...................................................................... pcu: Fix warning: control reaches end of non-void function Change-Id: I2c8b343fba5fabda9f78af8711e2a837536518e9 --- M pcu/GPRS_TBF.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/GPRS_TBF.ttcn b/pcu/GPRS_TBF.ttcn index f946f29..3794410 100644 --- a/pcu/GPRS_TBF.ttcn +++ b/pcu/GPRS_TBF.ttcn @@ -14,6 +14,7 @@ import from GSM_Types all; import from Osmocom_Types all; import from General_Types all; +import from Misc_Helpers all; import from RLCMAC_CSN1_Types all; import from RLCMAC_Types all; import from RLCMAC_Templates all; @@ -409,8 +410,9 @@ } function f_dl_tbf_is_in_window(integer bsn) return boolean { - setverdict(fail, "pleaes implement me"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "please implement me"); + return false; } function f_dl_tbf_is_received(inout DlTbfState ds, integer bsn) return boolean { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 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: I2c8b343fba5fabda9f78af8711e2a837536518e9 Gerrit-Change-Number: 22736 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 ) Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function ...................................................................... Osmocom_Gb_Types: Fix warning: control reaches end of non-void function Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 4e1fb8c..82f2aca 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -5,6 +5,7 @@ import from General_Types all; import from Osmocom_Types all; + import from Misc_Helpers all; import from GSM_Types all; import from BSSGP_Types all import from NS_Types all @@ -3690,10 +3691,8 @@ case (PDU_BSSGP:{pDU_BSSGP_PAGING_CS:={?,?,?,{bVCI:=?},*,*,*,*,*}}) { return pdu.pDU_BSSGP_PAGING_CS.paging_Field4.bVCI; } - case else { - return omit; - } } + return omit; } /* extract the BVCI IE of given PDU + convert it to integer value */ @@ -3734,8 +3733,9 @@ } else if (substr(tllib, 0, 4) == '0001'B) { return TLLI_RAND_G_RNTI; } else { - setverdict(fail, "Unknonw TLLI Type ", tllib); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknonw TLLI Type ", tllib)); + return TLLI_LOCAL; } } @@ -3751,8 +3751,9 @@ case (TLLI_G_RNTI) { prefix := '0000'B } case (TLLI_RAND_G_RNTI) { prefix := '0001'B } case else { - setverdict(fail, "Unknonw TLLI Type ", tlli_type); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unknonw TLLI Type ", tlli_type)); + return '00000000'O; } } return bit2oct(prefix & substr(tmsi_bits, lengthof(prefix), 32-lengthof(prefix))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c Gerrit-Change-Number: 22738 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 ) Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings ...................................................................... Osmocom_Gb_Types: Fix tons of template restriction warnings Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849 --- M gbproxy/GBProxy_Tests.ttcn M library/BSSGP_Emulation.ttcnpp M library/Osmocom_Gb_Types.ttcn M library/RAW_NS.ttcnpp 4 files changed, 275 insertions(+), 143 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index ad8874c..0f3b4cb 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -1105,7 +1105,7 @@ ts_BSSGP_DL_UD(g_pars.tlli, payload, omit, ts_BSSGP_IMSI(g_pars.imsi)); /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */ var template (present) PDU_BSSGP pdu_rx := - tr_BSSGP_DL_UD(g_pars.tlli, payload, tr_BSSGP_IMSI(g_pars.imsi)); + tr_BSSGP_DL_UD(g_pars.tlli, payload, ts_BSSGP_IMSI(g_pars.imsi)); log("DL-UNITDATA(payload_size=", i); f_sgsn2pcu(pdu_tx, pdu_rx); @@ -2691,11 +2691,11 @@ f_init(); f_global_init_ptp(); - var template (value) PDU_BSSGP pdu_tx := t_BVC_FC_BVC(10240, 2000, 1024, 1000, '01'O); + var template (value) PDU_BSSGP pdu_tx := ts_BVC_FC_BVC(10240, 2000, 1024, 1000, '01'O); /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */ var template (present) PDU_BSSGP pdu_rx := tr_BVC_FC_BVC(10240, 2000, 1024, 1000, '01'O); - var template (omit) PDU_BSSGP ack_tx := - t_BVC_FC_BVC_ACK(pdu_tx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value); + var template (value) PDU_BSSGP ack_tx := + ts_BVC_FC_BVC_ACK(pdu_tx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value); /* Send a FC-BVC from BSS to gbproxy, expect an ACK in response */ G_PCU[0].send(pdu_tx); @@ -3030,11 +3030,11 @@ cont_tx := ts_RAN_Information_Error_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_BSSGP_CAUSE(BSSGP_CAUSE_EQUIMENT_FAILURE), - omit, valueof(t_BVC_UNBLOCK(23))); + omit, valueof(ts_BVC_UNBLOCK(23))); cont_rx := tr_RAN_Information_Error_RIM_Container(tr_RIM_Application_Identity(RIM_APP_ID_NACC), - t_BSSGP_CAUSE(BSSGP_CAUSE_EQUIMENT_FAILURE), - omit, enc_PDU_BSSGP(valueof(t_BVC_UNBLOCK(23)))); + ts_BSSGP_CAUSE(BSSGP_CAUSE_EQUIMENT_FAILURE), + omit, enc_PDU_BSSGP(valueof(tr_BVC_UNBLOCK(23)))); f_rim_pcu2sgsn(ts_PDU_BSSGP_RAN_INFORMATION_ERROR(dst := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, ra_sgsn), src := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, ra_pcu), diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 4b93a26..1f32cc2 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -439,16 +439,16 @@ } /* any BLOCK or UNBLOCK for the SIGNALING BVCI are illegal */ - [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK(0, ?), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK(0, ?), 0)) -> value udi { setverdict(fail, "Rx BVC-BLOCK illegal for BVCI=0: ", udi); } - [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK(0), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_UNBLOCK(0), 0)) -> value udi { setverdict(fail, "Rx BVC-UNBLOCK illegal for BVCI=0: ", udi); } - [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(0), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK_ACK(0), 0)) -> value udi { setverdict(fail, "Rx BVC-BLOCK-ACK illegal for BVCI=0: ", udi); } - [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(0), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_UNBLOCK_ACK(0), 0)) -> value udi { setverdict(fail, "Rx BVC-UNBLOCK-ACK illegal for BVCI=0: ", udi); } @@ -495,21 +495,21 @@ } /* any BLOCK or UNBLOCK for the SIGNALING BVCI are illegal */ - [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK(0, ?), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK(0, ?), 0)) -> value udi { setverdict(fail, "Rx BVC-BLOCK illegal for BVCI=0: ", udi); } - [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK(0), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_UNBLOCK(0), 0)) -> value udi { setverdict(fail, "Rx BVC-UNBLOCK illegal for BVCI=0: ", udi); } - [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(0), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK_ACK(0), 0)) -> value udi { setverdict(fail, "Rx BVC-BLOCK-ACK illegal for BVCI=0: ", udi); } - [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(0), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_UNBLOCK_ACK(0), 0)) -> value udi { setverdict(fail, "Rx BVC-UNBLOCK-ACK illegal for BVCI=0: ", udi); } /* Respond to BLOCK for wrong BVCI */ - [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK(?, ?), 0)) -> value udi { + [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK(?, ?), 0)) -> value udi { setverdict(fail, "Rx BVC-BLOCK for unknown BVCI"); BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(0, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0)); } @@ -1015,13 +1015,13 @@ } private function f_ptp_sendUnblock() runs on BSSGP_BVC_CT { - BVC.send(ts_ptp_BnsUdReq(t_BVC_UNBLOCK(g_cfg.bvci), 0, g_bvc_lsp)); + BVC.send(ts_ptp_BnsUdReq(ts_BVC_UNBLOCK(g_cfg.bvci), 0, g_bvc_lsp)); g_t1_waits_for_block_ack := false; g_T1.start; } private function f_ptp_sendBlock(BssgpCause cause) runs on BSSGP_BVC_CT { - BVC.send(ts_ptp_BnsUdReq(t_BVC_BLOCK(g_cfg.bvci, cause), 0, g_bvc_lsp)); + BVC.send(ts_ptp_BnsUdReq(ts_BVC_BLOCK(g_cfg.bvci, cause), 0, g_bvc_lsp)); g_t1_waits_for_block_ack := true; g_T1.start; g_last_block_cause := cause; @@ -1055,14 +1055,14 @@ private altstep as_ptp_blocked() runs on BSSGP_BVC_CT { var NsUnitdataIndication udi; - [g_T1.running and not g_t1_waits_for_block_ack] BVC.receive(tr_ptp_BnsUdInd(t_BVC_UNBLOCK_ACK(g_cfg.bvci), 0)) { + [g_T1.running and not g_t1_waits_for_block_ack] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_UNBLOCK_ACK(g_cfg.bvci), 0)) { g_T1.stop; f_ptp_change_state(BVC_S_UNBLOCKED); } /* Inbound BVC-UNBLOCK from peer */ - [g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(t_BVC_UNBLOCK(g_cfg.bvci), 0)) { - BVC.send(ts_ptp_BnsUdReq(t_BVC_UNBLOCK_ACK(g_cfg.bvci), 0, g_bvc_lsp)); + [g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_UNBLOCK(g_cfg.bvci), 0)) { + BVC.send(ts_ptp_BnsUdReq(ts_BVC_UNBLOCK_ACK(g_cfg.bvci), 0, g_bvc_lsp)); f_ptp_change_state(BVC_S_UNBLOCKED); } @@ -1104,17 +1104,17 @@ #endif /* bogus unblock, just respond with ACK */ - [] BVC.receive(tr_ptp_BnsUdInd(t_BVC_UNBLOCK(g_cfg.bvci), 0)) -> value udi { - BVC.send(ts_ptp_BnsUdReq(t_BVC_UNBLOCK_ACK(g_cfg.bvci), 0, g_bvc_lsp)); + [] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_UNBLOCK(g_cfg.bvci), 0)) -> value udi { + BVC.send(ts_ptp_BnsUdReq(ts_BVC_UNBLOCK_ACK(g_cfg.bvci), 0, g_bvc_lsp)); } /* Respond to BLOCK with BLOCK-ACK + change state */ - [] BVC.receive(tr_ptp_BnsUdInd(t_BVC_BLOCK(g_cfg.bvci, ?), 0)) -> value udi { - BVC.send(ts_ptp_BnsUdReq(t_BVC_BLOCK_ACK(g_cfg.bvci), 0, g_bvc_lsp)); + [] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_BLOCK(g_cfg.bvci, ?), 0)) -> value udi { + BVC.send(ts_ptp_BnsUdReq(ts_BVC_BLOCK_ACK(g_cfg.bvci), 0, g_bvc_lsp)); g_T1.stop; f_ptp_change_state(BVC_S_BLOCKED); } /* BLOCK-ACK before T1 timeout: mark as blocked */ - [g_T1.running and g_t1_waits_for_block_ack] BVC.receive(tr_ptp_BnsUdInd(t_BVC_BLOCK_ACK(g_cfg.bvci), 0)) -> value udi { + [g_T1.running and g_t1_waits_for_block_ack] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_BLOCK_ACK(g_cfg.bvci), 0)) -> value udi { g_T1.stop; f_ptp_change_state(BVC_S_BLOCKED); } @@ -1134,11 +1134,11 @@ } else { /* simply acknowledge all per-BVC Flow Control Messages */ var OCT1 tag := udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; - BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_BVC_ACK(tag), g_cfg.bvci, g_bvc_lsp)); + BVC.send(ts_ptp_BnsUdReq(ts_BVC_FC_BVC_ACK(tag), g_cfg.bvci, g_bvc_lsp)); } } - [not g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(t_BVC_FC_BVC_ACK(?), g_cfg.bvci)) -> value udi { + [not g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_FC_BVC_ACK(?), g_cfg.bvci)) -> value udi { if (GLOBAL.checkstate("Connected")) { GLOBAL.send(udi.bssgp); } else { diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 82f2aca..687a073 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -816,7 +816,7 @@ BSSGP_CAUSE_NOT_ALL_REQUESTED_PFC_CREATED ('3c'H) } with { variant "FIELDLENGTH(8)" }; - private function t_FLUSH_ACTION(template OCT1 act) + private function tr_FLUSH_ACTION(template OCT1 act) return template Flush_Action { var template Flush_Action r; if (istemplatekind(act, "omit")) { @@ -835,7 +835,16 @@ return r; } } - private function t_NO_OCT_AFF(template integer oct_aff) + template (value) Flush_Action ts_FLUSH_ACTION(template (value) OCT1 act) := { + iEI := '0C'O, + ext := '1'B, + lengthIndicator := { + length1 := 1 + }, + actionValue := act + } + + private function tr_NO_OCT_AFF(template integer oct_aff) return template Number_of_octets_affected { var template Number_of_octets_affected r; if (istemplatekind(oct_aff, "omit")) { @@ -854,8 +863,16 @@ return r; } } + template (value) Number_of_octets_affected ts_NO_OCT_AFF(template (value) integer oct_aff) := { + iEI := '25'O, + ext := '1'B, + lengthIndicator := { + length1 := 3 + }, + number_of_octets_transfered_or_deleted := int2oct(valueof(oct_aff), 3) + } - private function t_LLC_FRAMES_DISCARDED(template integer frames_discarded) + private function tr_LLC_FRAMES_DISCARDED(template integer frames_discarded) return template LLC_Frames_Discarded { var template LLC_Frames_Discarded r; if (istemplatekind(frames_discarded, "omit")) { @@ -874,8 +891,17 @@ return r; } } + template (value) LLC_Frames_Discarded ts_LLC_FRAMES_DISCARDED(template (value) integer frames_discarded) := { + iEI := '0F'O, + ext := '1'B, + lengthIndicator := { + length1 := 1 + }, + number_of_frames_discarded := int2hex(valueof(frames_discarded), 2) + } - private function t_BSSGP_BVCI(template BssgpBvci bvci) + + private function tr_BSSGP_BVCI(template BssgpBvci bvci) return template BVCI { var template BVCI r; if (istemplatekind(bvci, "omit")) { @@ -894,7 +920,24 @@ return r; } } - private function t_BSSGP_NSEI(template Nsei nsei) + template (value) BVCI ts_BSSGP_BVCI(template (value) BssgpBvci bvci) := { + iEI := '04'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + unstructured_value := int2oct(valueof(bvci), 2) + } + private function f_ts_BSSGP_BVCI(template (omit) BssgpBvci bvci) + return template (omit) BVCI { + if (istemplatekind(bvci, "omit")) { + return omit; + } else { + return ts_BSSGP_BVCI(valueof(bvci)); + } + } + + private function t_BSSGP_NSEI(template Nsei nsei) return template NSEI_BSSGP { var template NSEI_BSSGP r; if (istemplatekind(nsei, "omit")) { @@ -913,6 +956,22 @@ return r; } } + template (value) NSEI_BSSGP ts_BSSGP_NSEI(template (value) Nsei nsei) := { + iEI:= '3E'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + nSEI := int2oct(valueof(nsei), 2) + } + private function f_ts_BSSGP_NSEI(template (omit) Nsei nsei) + return template (omit) NSEI_BSSGP { + if (istemplatekind(nsei, "omit")) { + return omit; + } else { + return ts_BSSGP_NSEI(valueof(nsei)); + } + } template (value) TLLI_BSSGP ts_BSSGP_TLLI(template (value) GprsTlli tlli) := { iEI := '1F'O, @@ -922,7 +981,7 @@ }, tLLI_Value := tlli } - template TLLI_BSSGP tr_BSSGP_TLLI(template GprsTlli tlli) := { + template (present) TLLI_BSSGP tr_BSSGP_TLLI(template (present) GprsTlli tlli) := { iEI := '1F'O, ext := '1'B, lengthIndicator := { @@ -964,7 +1023,7 @@ suspend_Reference_Number_value := susp_ref } - template IMSI_BSSGP tr_BSSGP_IMSI(template hexstring imsi) := { + template (present) IMSI_BSSGP tr_BSSGP_IMSI(template (present) hexstring imsi) := { iEI := '0D'O, ext := '1'B, lengthIndicator := ?, @@ -973,7 +1032,7 @@ digits := imsi } - template IMSI_BSSGP ts_BSSGP_IMSI(hexstring imsi) := { + template (value) IMSI_BSSGP ts_BSSGP_IMSI(hexstring imsi) := { iEI := '0D'O, ext := '1'B, lengthIndicator := { length1 := 0 /* overwritten */ }, @@ -1066,7 +1125,7 @@ } return ret; } - function t_BSSGP_CAUSE(template BssgpCause cause) return template Cause_BSSGP { + function tr_BSSGP_CAUSE(template BssgpCause cause) return template Cause_BSSGP { var template Cause_BSSGP ret; ret.iEI := '07'O; ret.ext := '1'B; @@ -1079,7 +1138,7 @@ return ret; } - function t_BSSGP_IE_CellId(template BssgpCellId cid) return template Cell_Identifier { + function tr_BSSGP_IE_CellId(template BssgpCellId cid) return template Cell_Identifier { var template Cell_Identifier ret := { iEI := '08'O, ext := '1'B, @@ -1122,6 +1181,27 @@ } return ret; } + template (value) Cell_Identifier ts_BSSGP_IE_CellId(template (value) BssgpCellId cid) := { + iEI := '08'O, + ext := '1'B, + lengthIndicator := { length1 := 8 }, + mccDigit1 := cid.ra_id.lai.mcc_mnc[0], + mccDigit2 := cid.ra_id.lai.mcc_mnc[1], + mccDigit3 := cid.ra_id.lai.mcc_mnc[2], + mncDigit3 := cid.ra_id.lai.mcc_mnc[3], + mncDigit1 := cid.ra_id.lai.mcc_mnc[4], + mncDigit2 := cid.ra_id.lai.mcc_mnc[5], + lac := int2oct(valueof(cid.ra_id.lai.lac), 2), + rac := int2oct(valueof(cid.ra_id.rac), 1), + cI_value := int2oct(valueof(cid.cell_id), 2) + } + function f_ts_BSSGP_IE_CellId(template (omit) BssgpCellId cid) return template (omit) Cell_Identifier { + if (istemplatekind(cid, "omit")) { + return omit; + } else { + return ts_BSSGP_IE_CellId(valueof(cid)); + } + } template (value) Tag ts_BSSGP_IE_Tag(OCT1 tag) := { iEI := '1E'O, @@ -1161,12 +1241,12 @@ /* 10.4.12 */ template PDU_BSSGP ts_BVC_RESET(BssgpCause cause, BssgpBvci bvci, - template BssgpCellId cell_id) := { + template (omit) BssgpCellId cell_id) := { pDU_BSSGP_BVC_RESET := { bssgpPduType := '22'O, - bVCI := t_BSSGP_BVCI(bvci), + bVCI := ts_BSSGP_BVCI(bvci), cause := ts_BSSGP_CAUSE(cause), - cell_Identifier := t_BSSGP_IE_CellId(cell_id), + cell_Identifier := f_ts_BSSGP_IE_CellId(cell_id), feature_bitmap := omit, extended_Feature_Bitmap := omit } @@ -1175,20 +1255,20 @@ template BssgpCellId cell_id) := { pDU_BSSGP_BVC_RESET := { bssgpPduType := '22'O, - bVCI := t_BSSGP_BVCI(bvci), - cause := t_BSSGP_CAUSE(cause), - cell_Identifier := t_BSSGP_IE_CellId(cell_id), + bVCI := tr_BSSGP_BVCI(bvci), + cause := tr_BSSGP_CAUSE(cause), + cell_Identifier := tr_BSSGP_IE_CellId(cell_id), feature_bitmap := *, extended_Feature_Bitmap := * } } /* 10.4.13 */ - template PDU_BSSGP ts_BVC_RESET_ACK(BssgpBvci bvci, template BssgpCellId cell_id) := { + template PDU_BSSGP ts_BVC_RESET_ACK(BssgpBvci bvci, template (omit) BssgpCellId cell_id) := { pDU_BSSGP_BVC_RESET_ACK := { bssgpPduType := '23'O, - bVCI := t_BSSGP_BVCI(bvci), - cell_Identifier := t_BSSGP_IE_CellId(cell_id), + bVCI := ts_BSSGP_BVCI(bvci), + cell_Identifier := f_ts_BSSGP_IE_CellId(cell_id), feature_bitmap := omit, extended_Feature_Bitmap := omit } @@ -1196,8 +1276,8 @@ template PDU_BSSGP tr_BVC_RESET_ACK(template BssgpBvci bvci, template BssgpCellId cell_id) := { pDU_BSSGP_BVC_RESET_ACK := { bssgpPduType := '23'O, - bVCI := t_BSSGP_BVCI(bvci), - cell_Identifier := t_BSSGP_IE_CellId(cell_id), + bVCI := tr_BSSGP_BVCI(bvci), + cell_Identifier := tr_BSSGP_IE_CellId(cell_id), feature_bitmap := *, extended_Feature_Bitmap := * } @@ -1205,40 +1285,67 @@ /* 10.4.10 */ - template PDU_BSSGP t_BVC_UNBLOCK(template BssgpBvci bvci) := { + template (present) PDU_BSSGP tr_BVC_UNBLOCK(template (present) BssgpBvci bvci) := { pDU_BSSGP_BVC_UNBLOCK := { bssgpPduType := '24'O, - bVCI := t_BSSGP_BVCI(bvci) + bVCI := tr_BSSGP_BVCI(bvci) + } + } + template (value) PDU_BSSGP ts_BVC_UNBLOCK(template (value) BssgpBvci bvci) := { + pDU_BSSGP_BVC_UNBLOCK := { + bssgpPduType := '24'O, + bVCI := ts_BSSGP_BVCI(bvci) } } /* 10.4.11 */ - template PDU_BSSGP t_BVC_UNBLOCK_ACK(template BssgpBvci bvci) := { + template (present) PDU_BSSGP tr_BVC_UNBLOCK_ACK(template (present) BssgpBvci bvci) := { pDU_BSSGP_BVC_UNBLOCK_ACK := { bssgpPduType := '25'O, - bVCI := t_BSSGP_BVCI(bvci) + bVCI := tr_BSSGP_BVCI(bvci) + } + } + template (value) PDU_BSSGP ts_BVC_UNBLOCK_ACK(template (value) BssgpBvci bvci) := { + pDU_BSSGP_BVC_UNBLOCK_ACK := { + bssgpPduType := '25'O, + bVCI := ts_BSSGP_BVCI(bvci) } } /* 10.4.8 */ - template PDU_BSSGP t_BVC_BLOCK(template BssgpBvci bvci, template BssgpCause cause) := { + template (present) PDU_BSSGP tr_BVC_BLOCK(template (present) BssgpBvci bvci, + template (present) BssgpCause cause) := { pDU_BSSGP_BVC_BLOCK := { bssgpPduType := '20'O, - bVCI := t_BSSGP_BVCI(bvci), - cause := t_BSSGP_CAUSE(cause) + bVCI := tr_BSSGP_BVCI(bvci), + cause := tr_BSSGP_CAUSE(cause) + } + } + template (value) PDU_BSSGP ts_BVC_BLOCK(template (value) BssgpBvci bvci, + template (value) BssgpCause cause) := { + pDU_BSSGP_BVC_BLOCK := { + bssgpPduType := '20'O, + bVCI := ts_BSSGP_BVCI(bvci), + cause := ts_BSSGP_CAUSE(cause) } } /* 10.4.9 */ - template PDU_BSSGP t_BVC_BLOCK_ACK(template BssgpBvci bvci) := { + template (present) PDU_BSSGP tr_BVC_BLOCK_ACK(template (present) BssgpBvci bvci) := { pDU_BSSGP_BVC_BLOCK_ACK := { bssgpPduType := '21'O, - bVCI := t_BSSGP_BVCI(bvci) + bVCI := tr_BSSGP_BVCI(bvci) + } + } + template (value) PDU_BSSGP ts_BVC_BLOCK_ACK(template (value) BssgpBvci bvci) := { + pDU_BSSGP_BVC_BLOCK_ACK := { + bssgpPduType := '21'O, + bVCI := ts_BSSGP_BVCI(bvci) } } /* 10.4.4 */ - template PDU_BSSGP t_BVC_FC_BVC(uint16_t bmax, uint16_t bucket_leak_rate, + template (value) PDU_BSSGP ts_BVC_FC_BVC(uint16_t bmax, uint16_t bucket_leak_rate, uint16_t bmax_default_ms, uint16_t r_default_ms, OCT1 tag) := { pDU_BSSGP_FLOW_CONTROL_BVC := { bssgpPduType := '26'O, @@ -1256,7 +1363,7 @@ lengthIndicator := { length1 := 2 }, - bmax := f_oct_or_wc(bmax, 2) + bmax := int2oct(bmax, 2) }, bucket_Leak_Rate := { iEI := '03'O, @@ -1264,7 +1371,7 @@ lengthIndicator := { length1 := 2 }, - r_Value := f_oct_or_wc(bucket_leak_rate, 2) + r_Value := int2oct(bucket_leak_rate, 2) }, bmax_default_MS := { iEI := '01'O, @@ -1272,7 +1379,7 @@ lengthIndicator := { length1 := 2 }, - bmax := f_oct_or_wc(bmax_default_ms, 2) + bmax := int2oct(bmax_default_ms, 2) }, r_default_MS := { iEI := '1C'O, @@ -1280,7 +1387,7 @@ lengthIndicator := { length1 := 2 }, - r_default_MS_value := f_oct_or_wc(r_default_ms, 2) + r_default_MS_value := int2oct(r_default_ms, 2) }, bucket_Full_Ratio := omit, bVC_Measurement := omit, @@ -1341,7 +1448,20 @@ } /* 10.4.5 */ - template PDU_BSSGP t_BVC_FC_BVC_ACK(template OCT1 tag) := { + template (present) PDU_BSSGP tr_BVC_FC_BVC_ACK(template (present) OCT1 tag) := { + pDU_BSSGP_FLOW_CONTROL_BVC_ACK := { + bssgpPduType := '27'O, + tag := { + iEI := '1E'O, + ext := '1'B, + lengthIndicator := { + length1 := 1 + }, + unstructured_Value := tag + } + } + } + template (value) PDU_BSSGP ts_BVC_FC_BVC_ACK(template (value) OCT1 tag) := { pDU_BSSGP_FLOW_CONTROL_BVC_ACK := { bssgpPduType := '27'O, tag := { @@ -1395,7 +1515,7 @@ template (present) OCT1 tag := ?) := { pDU_BSSGP_FLOW_CONTROL_MS := { bssgpPduType := '28'O, - tLLI := ts_BSSGP_TLLI(tlli), + tLLI := tr_BSSGP_TLLI(tlli), tag := { iEI := '1E'O, ext := '1'B, @@ -1460,12 +1580,13 @@ } /* 10.4.14 */ - template PDU_BSSGP ts_BSSGP_STATUS(template (omit) BssgpBvci bvci, template BssgpCause cause, - PDU_BSSGP pdu) := { + template (value) PDU_BSSGP ts_BSSGP_STATUS(template (omit) BssgpBvci bvci, + template (value) BssgpCause cause, + PDU_BSSGP pdu) := { pDU_BSSGP_STATUS := { bssgpPduType := '41'O, - cause := t_BSSGP_CAUSE(cause), - bVCI := t_BSSGP_BVCI(bvci), + cause := ts_BSSGP_CAUSE(cause), + bVCI := f_ts_BSSGP_BVCI(bvci), pDU_in_Error := { iEI := '15'O, ext := '1'B, @@ -1480,8 +1601,8 @@ template octetstring pdu := ?) := { pDU_BSSGP_STATUS := { bssgpPduType := '41'O, - cause := t_BSSGP_CAUSE(cause), - bVCI := t_BSSGP_BVCI(bvci), + cause := tr_BSSGP_CAUSE(cause), + bVCI := tr_BSSGP_BVCI(bvci), pDU_in_Error := { iEI := '15'O, ext := '1'B, @@ -1596,7 +1717,7 @@ peakBitRateGranularity := '00'B } - template QoS_Profile ts_QoS_TLV(template QoS_Profile_V qos) := { + template (value) QoS_Profile ts_QoS_TLV(template (value) QoS_Profile_V qos) := { iEI := '18'O, ext := '1'B, lengthIndicator := { length1 := 3 }, @@ -1608,13 +1729,13 @@ peakBitRateGranularity := qos.peakBitRateGranularity } - template PDU_Lifetime t_DefaultLifetime(uint16_t delay := 65535) := { + template (value) PDU_Lifetime t_DefaultLifetime(uint16_t delay := 65535) := { iEI := '16'O, ext := '1'B, lengthIndicator := { length1 := 2 }, - delay_Value := f_oct_or_wc(delay, 2) + delay_Value := int2oct(delay, 2) } template DRX_Parameters t_defaultDRXparam := { @@ -1662,7 +1783,7 @@ } /* 10.2.1 */ - template PDU_BSSGP ts_BSSGP_DL_UD(GprsTlli tlli, octetstring pdu, + template (value) PDU_BSSGP ts_BSSGP_DL_UD(GprsTlli tlli, octetstring pdu, template (omit) MSRadioAccessCapabilityV_BSSGP racap := omit, template (omit) IMSI_BSSGP imsi := omit) := { pDU_BSSGP_DL_UNITDATA := { @@ -1693,8 +1814,8 @@ initialLLC_PDU := omit } } - template PDU_BSSGP tr_BSSGP_DL_UD(template (present) GprsTlli tlli, template (present) octetstring pdu, - template IMSI_BSSGP imsi := omit) := { + template (present) PDU_BSSGP tr_BSSGP_DL_UD(template (present) GprsTlli tlli, template (present) octetstring pdu, + template (omit) IMSI_BSSGP imsi := omit) := { pDU_BSSGP_DL_UNITDATA := { bssgpPduType := '00'O, tLLI_current := tlli, @@ -1725,12 +1846,12 @@ } /* 10.2.2 */ - template PDU_BSSGP ts_BSSGP_UL_UD(GprsTlli tlli, BssgpCellId cell_id, octetstring payload) := { + template (value) PDU_BSSGP ts_BSSGP_UL_UD(GprsTlli tlli, BssgpCellId cell_id, octetstring payload) := { pDU_BSSGP_UL_UNITDATA := { bssgpPduType := '01'O, tLLI := tlli, qoS_Profile := t_defaultQos, - cell_Identifier := t_BSSGP_IE_CellId(cell_id), + cell_Identifier := ts_BSSGP_IE_CellId(cell_id), pFI := omit, lSA_Identifier_List := omit, redirect_Attempt_Flag := omit, @@ -1749,7 +1870,7 @@ bssgpPduType := '01'O, tLLI := tlli, qoS_Profile := ?, - cell_Identifier := t_BSSGP_IE_CellId(cell_id), + cell_Identifier := tr_BSSGP_IE_CellId(cell_id), pFI := *, lSA_Identifier_List := *, redirect_Attempt_Flag := *, @@ -1770,7 +1891,7 @@ iMSI := ?, dRX_Parameters := ?, paging_Field4 := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := ts_BSSGP_BVCI(bvci) }, tLLI := *, channel_needed := *, @@ -1779,13 +1900,13 @@ global_CN_Id := * } } - template PDU_BSSGP ts_BSSGP_CS_PAGING_IMSI(BssgpBvci bvci, hexstring imsi) := { + template (value) PDU_BSSGP ts_BSSGP_CS_PAGING_IMSI(BssgpBvci bvci, hexstring imsi) := { pDU_BSSGP_PAGING_CS := { bssgpPduType := '07'O, iMSI := ts_BSSGP_IMSI(imsi), dRX_Parameters := t_defaultDRXparam, paging_Field4 := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := ts_BSSGP_BVCI(bvci) }, tLLI := omit, channel_needed := omit, @@ -1794,13 +1915,13 @@ global_CN_Id := omit } } - template PDU_BSSGP ts_BSSGP_CS_PAGING_PTMSI(BssgpBvci bvci, hexstring imsi, GsmTmsi tmsi) := { + template (value) PDU_BSSGP ts_BSSGP_CS_PAGING_PTMSI(BssgpBvci bvci, hexstring imsi, GsmTmsi tmsi) := { pDU_BSSGP_PAGING_CS := { bssgpPduType := '07'O, iMSI := ts_BSSGP_IMSI(imsi), dRX_Parameters := t_defaultDRXparam, paging_Field4 := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := ts_BSSGP_BVCI(bvci) }, tLLI := omit, channel_needed := omit, @@ -1817,7 +1938,7 @@ iMSI := ?, dRX_Parameters := *, paging_Field4 := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := tr_BSSGP_BVCI(bvci) }, pFI := *, aBQP := *, @@ -1826,13 +1947,13 @@ eDRX_Paremeters := * } } - template PDU_BSSGP ts_BSSGP_PS_PAGING_IMSI(BssgpBvci bvci, hexstring imsi) := { + template (value) PDU_BSSGP ts_BSSGP_PS_PAGING_IMSI(BssgpBvci bvci, hexstring imsi) := { pDU_BSSGP_PAGING_PS := { bssgpPduType := '06'O, iMSI := ts_BSSGP_IMSI(imsi), dRX_Parameters := omit, paging_Field4 := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := ts_BSSGP_BVCI(bvci) }, pFI := omit, aBQP := omit, @@ -1841,13 +1962,13 @@ eDRX_Paremeters := omit } } - template PDU_BSSGP ts_BSSGP_PS_PAGING_PTMSI(BssgpBvci bvci, hexstring imsi, GsmTmsi tmsi) := { + template (value) PDU_BSSGP ts_BSSGP_PS_PAGING_PTMSI(BssgpBvci bvci, hexstring imsi, GsmTmsi tmsi) := { pDU_BSSGP_PAGING_PS := { bssgpPduType := '06'O, iMSI := ts_BSSGP_IMSI(imsi), dRX_Parameters := omit, paging_Field4 := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := ts_BSSGP_BVCI(bvci) }, pFI := omit, aBQP := omit, @@ -1877,7 +1998,7 @@ } template (value) Paging_Field4 ts_BssgpP4Bvci(BssgpBvci bvci) := { - bVCI := t_BSSGP_BVCI(bvci) + bVCI := ts_BSSGP_BVCI(bvci) } template (value) Location_Area ts_BSSGP_LA_ID(GSM_Types.LocationAreaIdentification input) := { @@ -1941,7 +2062,7 @@ routeing_Area := ts_BSSGP_RA_ID(ra_id) } } - template PDU_BSSGP tr_BSSGP_SUSPEND(template GprsTlli tlli, RoutingAreaIdentification ra_id) := { + template PDU_BSSGP tr_BSSGP_SUSPEND(template (present) GprsTlli tlli, RoutingAreaIdentification ra_id) := { pDU_BSSGP_SUSPEND := { bssgpPduType := '0B'O, tLLI := tr_BSSGP_TLLI(tlli), @@ -1985,7 +2106,7 @@ bssgpPduType := '0D'O, tLLI := tr_BSSGP_TLLI(tlli), routeing_Area := ts_BSSGP_RA_ID(ra_id), - cause := t_BSSGP_CAUSE(cause) + cause := tr_BSSGP_CAUSE(cause) } } @@ -2000,7 +2121,7 @@ suspend_Reference_Number := ts_BSSGP_SUSP_REF(susp_ref) } } - template PDU_BSSGP tr_BSSGP_RESUME(template GprsTlli tlli, RoutingAreaIdentification ra_id, + template PDU_BSSGP tr_BSSGP_RESUME(template (present) GprsTlli tlli, RoutingAreaIdentification ra_id, template OCT1 susp_ref) := { pDU_BSSGP_RESUME := { bssgpPduType := '0E'O, @@ -2019,7 +2140,7 @@ routeing_Area := ts_BSSGP_RA_ID(ra_id) } } - template PDU_BSSGP tr_BSSGP_RESUME_ACK(template GprsTlli tlli, + template PDU_BSSGP tr_BSSGP_RESUME_ACK(template (present) GprsTlli tlli, RoutingAreaIdentification ra_id) := { pDU_BSSGP_RESUME_ACK := { bssgpPduType := '0F'O, @@ -2038,14 +2159,14 @@ cause := ts_BSSGP_CAUSE(cause) } } - template PDU_BSSGP tr_BSSGP_RESUME_NACK(template GprsTlli tlli, + template PDU_BSSGP tr_BSSGP_RESUME_NACK(template (present) GprsTlli tlli, RoutingAreaIdentification ra_id, template BssgpCause cause) := { pDU_BSSGP_RESUME_NACK := { bssgpPduType := '10'O, tLLI := tr_BSSGP_TLLI(tlli), routeing_Area := ts_BSSGP_RA_ID(ra_id), - cause := t_BSSGP_CAUSE(cause) + cause := tr_BSSGP_CAUSE(cause) } } @@ -2181,7 +2302,7 @@ if (istemplatekind(mccmnc, "omit")) { return omit; } else { - return ts_BSSGP_PlmnId(mccmnc); + return ts_BSSGP_PlmnId(valueof(mccmnc)); } } private function f_tr_BSSGP_PlmnId(template BcdMccMnc mccmnc) @@ -2193,7 +2314,7 @@ } else if (istemplatekind(mccmnc, "?")) { return ?; } else { - return ts_BSSGP_PlmnId(mccmnc); + return ts_BSSGP_PlmnId(valueof(mccmnc)); } } @@ -2220,20 +2341,20 @@ pDU_BSSGP_FLUSH_LL := { bssgpPduType := '2A'O, tLLI := ts_BSSGP_TLLI(tlli), - bVCI_old := t_BSSGP_BVCI(bvci_old), - bVCI_new := t_BSSGP_BVCI(bvci_new), - nSEI := t_BSSGP_NSEI(nsei) + bVCI_old := ts_BSSGP_BVCI(bvci_old), + bVCI_new := f_ts_BSSGP_BVCI(bvci_new), + nSEI := f_ts_BSSGP_NSEI(nsei) } } - template PDU_BSSGP tr_BSSGP_FLUSH_LL(template GprsTlli tlli, template BssgpBvci bvci_old, + template PDU_BSSGP tr_BSSGP_FLUSH_LL(template (present) GprsTlli tlli, template BssgpBvci bvci_old, template (omit) BssgpBvci bvci_new := omit, template (omit) Nsei nsei := omit) := { pDU_BSSGP_FLUSH_LL := { bssgpPduType := '2A'O, tLLI := tr_BSSGP_TLLI(tlli), - bVCI_old := t_BSSGP_BVCI(bvci_old), - bVCI_new := t_BSSGP_BVCI(bvci_new), - nSEI := t_BSSGP_NSEI(nsei) + bVCI_old := tr_BSSGP_BVCI(bvci_old), + bVCI_new := f_ts_BSSGP_BVCI(bvci_new), + nSEI := f_ts_BSSGP_NSEI(nsei) } } @@ -2245,23 +2366,23 @@ pDU_BSSGP_FLUSH_LL_ACK := { bssgpPduType := '2B'O, tLLI := ts_BSSGP_TLLI(tlli), - flush_Action := t_FLUSH_ACTION(act), - bVCI_new := t_BSSGP_BVCI(bvci_new), - number_of_octets_affected := t_NO_OCT_AFF(oct_affected), - nSEI := t_BSSGP_NSEI(nsei) + flush_Action := ts_FLUSH_ACTION(act), + bVCI_new := f_ts_BSSGP_BVCI(bvci_new), + number_of_octets_affected := ts_NO_OCT_AFF(oct_affected), + nSEI := f_ts_BSSGP_NSEI(nsei) } } - template PDU_BSSGP tr_BSSGP_FLUSH_LL_ACK(template GprsTlli tlli, template OCT1 act, + template PDU_BSSGP tr_BSSGP_FLUSH_LL_ACK(template (present) GprsTlli tlli, template OCT1 act, template integer oct_affected, template (omit) BssgpBvci bvci_new := omit, template (omit) Nsei nsei := omit) := { pDU_BSSGP_FLUSH_LL_ACK := { bssgpPduType := '2B'O, - tLLI := ts_BSSGP_TLLI(tlli), - flush_Action := t_FLUSH_ACTION(act), - bVCI_new := t_BSSGP_BVCI(bvci_new), - number_of_octets_affected := t_NO_OCT_AFF(oct_affected), - nSEI := t_BSSGP_NSEI(nsei) + tLLI := tr_BSSGP_TLLI(tlli), + flush_Action := tr_FLUSH_ACTION(act), + bVCI_new := f_ts_BSSGP_BVCI(bvci_new), + number_of_octets_affected := tr_NO_OCT_AFF(oct_affected), + nSEI := f_ts_BSSGP_NSEI(nsei) } } @@ -2272,21 +2393,21 @@ pDU_BSSGP_LLC_DISCARDED := { bssgpPduType := '2C'O, tLLI := ts_BSSGP_TLLI(tlli), - lLC_Frames_Discarded := t_LLC_FRAMES_DISCARDED(frames_discarded), - bVCI := t_BSSGP_BVCI(bvci), - number_of_octets_deleted := t_NO_OCT_AFF(oct_deleted), + lLC_Frames_Discarded := ts_LLC_FRAMES_DISCARDED(frames_discarded), + bVCI := ts_BSSGP_BVCI(bvci), + number_of_octets_deleted := ts_NO_OCT_AFF(oct_deleted), pFI := omit } } - template PDU_BSSGP tr_BSSGP_LLC_DISCARDED(template GprsTlli tlli, template integer frames_discarded, + template PDU_BSSGP tr_BSSGP_LLC_DISCARDED(template (present) GprsTlli tlli, template integer frames_discarded, template BssgpBvci bvci, template integer oct_deleted) := { pDU_BSSGP_LLC_DISCARDED := { bssgpPduType := '2C'O, - tLLI := ts_BSSGP_TLLI(tlli), - lLC_Frames_Discarded := t_LLC_FRAMES_DISCARDED(frames_discarded), - bVCI := t_BSSGP_BVCI(bvci), - number_of_octets_deleted := t_NO_OCT_AFF(oct_deleted), + tLLI := tr_BSSGP_TLLI(tlli), + lLC_Frames_Discarded := tr_LLC_FRAMES_DISCARDED(frames_discarded), + bVCI := tr_BSSGP_BVCI(bvci), + number_of_octets_deleted := tr_NO_OCT_AFF(oct_deleted), pFI := * } } @@ -2304,7 +2425,7 @@ template MSRadioAccessCapabilityV_BSSGP racap) := { pDU_BSSGP_RA_CAPABILITY := { bssgpPduType := '02'O, - tLLI := ts_BSSGP_TLLI(tlli), + tLLI := tr_BSSGP_TLLI(tlli), mS_Radio_Access_Capability := tr_BSSGP_IE_MSRAcap(racap) } } @@ -2319,10 +2440,10 @@ } } template (present) PDU_BSSGP tr_BSSGP_RA_CAP_UPD(template (present) GprsTlli tlli, - template OCT1 tag) := { + template (present) OCT1 tag) := { pDU_BSSGP_RA_CAPABILITY_UPDATE := { bssgpPduType := '08'O, - tLLI := ts_BSSGP_TLLI(tlli), + tLLI := tr_BSSGP_TLLI(tlli), tag := tr_BSSGP_IE_Tag(tag) } } @@ -2342,11 +2463,11 @@ } } template (present) PDU_BSSGP - tr_BSSGP_RA_CAP_UPD_ACK(template (present) GprsTlli tlli, template OCT1 tag, template (present) OCT1 cause, + tr_BSSGP_RA_CAP_UPD_ACK(template (present) GprsTlli tlli, template (present) OCT1 tag, template (present) OCT1 cause, template MSRadioAccessCapabilityV_BSSGP racap := omit) := { pDU_BSSGP_RA_CAPABILITY_UPDATE_ACK := { bssgpPduType := '09'O, - tLLI := ts_BSSGP_TLLI(tlli), + tLLI := tr_BSSGP_TLLI(tlli), tag := tr_BSSGP_IE_Tag(tag), iMSI := omit, rA_Cap_UPDATE_CAUSE := tr_BSSGP_IE_RACU_Cause(cause), @@ -2375,7 +2496,7 @@ return ret; } function tr_BSSGP_RADIO_CAUSE(template BssgpRadioCause cause) return template (present) Radio_Cause { - var template Radio_Cause ret; + var template (present) Radio_Cause ret; ret.iEI := '19'O; ret.ext := '1'B; ret.lengthIndicator := { length1 := 1 }; @@ -2832,7 +2953,7 @@ lengthIndicator := { length1 := 0 /* overwritten */ }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid) + reporting_Cell_Identifier := ts_Cell_Identifier_V(cid) } template RAN_Information_Request_Application_Container_NACC tr_RAN_Information_Request_Application_Container_NACC(template BssgpCellId cid := ?) := { @@ -2841,7 +2962,7 @@ lengthIndicator := { length1 := ? }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid) + reporting_Cell_Identifier := tr_Cell_Identifier_V(cid) } /* 3GPP TS 48.018 11.3.63.1.2 */ @@ -2852,7 +2973,7 @@ lengthIndicator := { length1 := 0 /* overwritten */ }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid) + reporting_Cell_Identifier := ts_Cell_Identifier_V(cid) } /* 3GPP TS 48.018 11.3.63.1.3 */ @@ -2863,7 +2984,7 @@ lengthIndicator := { length1 := 0 /* overwritten */ }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid) + reporting_Cell_Identifier := ts_Cell_Identifier_V(cid) } /* 3GPP TS 48.018 11.3.63.2.1 */ @@ -2874,7 +2995,7 @@ lengthIndicator := { length1 := 0 /* overwritten */ }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid), + reporting_Cell_Identifier := ts_Cell_Identifier_V(cid), typeBit := bool2bit(psi_type), number_of_SI_PSI := int2bit(si_psi_num, 7), sI_PSI := si_psi @@ -2886,7 +3007,7 @@ ret.iEI := '4E'O; ret.ext := '1'B; ret.lengthIndicator := { length1 := ? }; - ret.reporting_Cell_Identifier := t_Cell_Identifier_V(cid); + ret.reporting_Cell_Identifier := tr_Cell_Identifier_V(cid); if (istemplatekind(psi_type, "*")) { ret.typeBit := *; } else if (istemplatekind(psi_type, "?")) { @@ -2913,7 +3034,7 @@ lengthIndicator := { length1 := 0 /* overwritten */ }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid), + reporting_Cell_Identifier := ts_Cell_Identifier_V(cid), sI3 := si3 } @@ -2925,7 +3046,7 @@ lengthIndicator := { length1 := 0 /* overwritten */ }, - reporting_Cell_Identifier := t_Cell_Identifier_V(cid), + reporting_Cell_Identifier := ts_Cell_Identifier_V(cid), mBMS_data_channel_report := data_ch_report } @@ -3244,7 +3365,7 @@ } template RIM_Routing_Address t_RIM_Routing_Address_cid(template BssgpCellId cid := ?) := { - cell_Identifier := t_Cell_Identifier_V(cid) + cell_Identifier := tr_Cell_Identifier_V(cid) } template RIM_Routing_Address t_RIM_Routing_Address_rncid(template BssgpCellId cid := ?, template integer rnc_id := ?) := { globalRNCID := t_GlobalRNC_ID_BSSGP(cid, rnc_id) @@ -3256,7 +3377,7 @@ eHRPD_SectorID := sector } - function t_Cell_Identifier_V(template BssgpCellId cid) return template Cell_Identifier_V { + function tr_Cell_Identifier_V(template BssgpCellId cid) return template Cell_Identifier_V { var template Cell_Identifier_V ret := { mccDigit1 := ?, mccDigit2 := ?, @@ -3296,6 +3417,17 @@ } return ret; } + template (value) Cell_Identifier_V ts_Cell_Identifier_V(template (value) BssgpCellId cid) := { + mccDigit1 := cid.ra_id.lai.mcc_mnc[0], + mccDigit2 := cid.ra_id.lai.mcc_mnc[1], + mccDigit3 := cid.ra_id.lai.mcc_mnc[2], + mncDigit3 := cid.ra_id.lai.mcc_mnc[3], + mncDigit1 := cid.ra_id.lai.mcc_mnc[4], + mncDigit2 := cid.ra_id.lai.mcc_mnc[5], + lac := int2oct(valueof(cid.ra_id.lai.lac), 2), + rac := int2oct(valueof(cid.ra_id.rac), 1), + cI_value := int2oct(valueof(cid.cell_id), 2) + } function t_GlobalRNC_ID_BSSGP(template BssgpCellId cid, template integer rnc_id) return template GlobalRNC_ID_BSSGP { var template GlobalRNC_ID_BSSGP ret := { diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp index 81836c7..2aaa770 100644 --- a/library/RAW_NS.ttcnpp +++ b/library/RAW_NS.ttcnpp @@ -213,9 +213,9 @@ /* Receive a BSSGP UNBLOCK for given BVCI and ACK it */ altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { var PDU_NS ns_rf; - [] NSCP[idx].receive(tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch t_BVC_UNBLOCK(bvci))) -> value ns_rf { + [] NSCP[idx].receive(tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_UNBLOCK(bvci))) -> value ns_rf { var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci)); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_UNBLOCK_ACK(bvci)); NSCP[idx].send(ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))); if (not oneshot) { repeat; } } @@ -229,7 +229,7 @@ -> value ns_rf { var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.pDU_NS_Unitdata.nS_SDU); var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; - var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag)); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_FC_BVC_ACK(tag)); NSCP[idx].send(ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx))); if (not oneshot) { repeat; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 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: I3da153ce5e83b231501e74b958fcac9f10c00849 Gerrit-Change-Number: 22731 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 ) Change subject: StatsD_Checker: Check f_IPL4_listen result ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 Gerrit-Change-Number: 22741 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:13:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:13:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:13:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 ) Change subject: StatsD_Checker: Check f_IPL4_listen result ...................................................................... StatsD_Checker: Check f_IPL4_listen result Change-Id: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 --- M library/StatsD_Checker.ttcn 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn index d287b74..540e479 100644 --- a/library/StatsD_Checker.ttcn +++ b/library/StatsD_Checker.ttcn @@ -25,6 +25,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +import from Misc_Helpers all; +import from Socket_API_Definitions all; + import from StatsD_Types all; import from StatsD_CodecPort all; import from StatsD_CodecPort_CtrlFunct all; @@ -90,6 +93,7 @@ function main(charstring statsd_host, integer statsd_port) runs on StatsD_Checker_CT { var StatsD_ConnHdlr vc_conn; var StatsDExpects expects; + var Result res; while (not mp_enable_stats) { log("StatsD checker disabled by modulepar"); @@ -97,7 +101,11 @@ } map(self:STATS, system:STATS); - StatsD_CodecPort_CtrlFunct.f_IPL4_listen(STATS, statsd_host, statsd_port, { udp := {} }, {}); + res := StatsD_CodecPort_CtrlFunct.f_IPL4_listen(STATS, statsd_host, statsd_port, { udp := {} }, {}); + if (not ispresent(res.connId)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Could not bind StatsD socket, check your configuration"); + } /* Connect to VTY and reset stats */ map(self:STATSVTY, system:STATSVTY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 Gerrit-Change-Number: 22741 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:14:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:14:46 +0000 Subject: Change in osmo-ci[master]: repo-install-test: run on all build slaves again In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:14:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:14:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:14:48 +0000 Subject: Change in osmo-ci[master]: repo-install-test: run on all build slaves again In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:14:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:14:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:14:51 +0000 Subject: Change in osmo-ci[master]: repo-install-test: run on all build slaves again In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again ...................................................................... repo-install-test: run on all build slaves again It was not possible to reproduce the weird rpm errors on admin2-deb9build, which had lead to limiting the build slaves to build2-deb9build-ansible. Enable building on all again. Closes: OS#4567 Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba --- M jobs/repo-install-test.yml 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 425357d..64b66cb 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -40,11 +40,6 @@ default: 'master' axes: - axis: - type: slave - name: label - # Force using "build2-deb9build-ansible": https://osmocom.org/issues/4563#note-10 - values: !!python/tuple [build2-deb9build-ansible] - - axis: type: user-defined name: feed values: '{obj:feeds}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:15:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:15:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 ) Change subject: stp: Ignore M3UA SSNM messages in tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 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: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Gerrit-Change-Number: 22783 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:15:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:15:04 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:15:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:15:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Time out after 5s if expected M3UA doesn't arrive In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 ) Change subject: stp: Time out after 5s if expected M3UA doesn't arrive ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 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: I279aacf2215ccd63a6e52c6a71cda3b500a3795c Gerrit-Change-Number: 22786 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:15:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:15:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 ) Change subject: stp: Ignore M3UA SSNM messages in tests ...................................................................... stp: Ignore M3UA SSNM messages in tests The tests were written without considering the arrival of such messages; however, it is well within the M3UA spec that such messages appear at any time indicating remote point code availability etc. In libosmo-sccp.git Id92be4691b0fd77598a6edb642c028bbd8c5b623 we start generating those messages in osmo-stp. Let's ignore them in the tests to avoid unexpected failures. Later on, we likely will introduce / adapt tests to actually expect those messages whenever appropriate. Change-Id: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Related: OS#2623 --- M library/M3UA_Templates.ttcn M stp/STP_Tests_M3UA.ttcn 2 files changed, 221 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/M3UA_Templates.ttcn b/library/M3UA_Templates.ttcn index 1063b50..5881b40 100644 --- a/library/M3UA_Templates.ttcn +++ b/library/M3UA_Templates.ttcn @@ -379,6 +379,218 @@ } } +/*********************************************************************** + * SSNM Class + ***********************************************************************/ + +template (value) M3UA_Point_Code ts_M3UA_PC(uint24_t pc, uint8_t mask := 0) := { + mask := int2oct(mask, 1), + affected_Point_Code := int2oct(pc, 3) +} + +template (value) M3UA_Affected_Point_Codes ts_M3UA_AffPc(template (value) M3UA_Point_Codes pcs) := { + tag := '0012'O, + lengthInd := 0, + pointCodes := pcs +} +template (present) M3UA_Affected_Point_Codes tr_M3UA_AffPc(template (present) M3UA_Point_Codes pcs) := { + tag := '0012'O, + lengthInd := ?, + pointCodes := pcs +} + +template (value) M3UA_User_Cause ts_M3UA_UserCause(template (value) OCT2 cause, + template (value) OCT2 user) := { + tag := '0204'O, + lengthInd := 0, + cause := cause, + user := user +} +template (present) M3UA_User_Cause tr_M3UA_UserCause(template (present) OCT2 cause, + template (present) OCT2 user) := { + tag := '0204'O, + lengthInd := ?, + cause := cause, + user := user +} + +template (value) PDU_M3UA ts_M3UA_DUNA(template (value) M3UA_Point_Codes affected_pcs, + template (omit) OCT4 rctx := omit) := { + m3UA_DUNA := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0201'O, + messageLength := 0, + messageParameters := { + network_Appearance := omit, + routing_Context := ts_M3UA_routing_ctx(rctx), + affected_Point_Codes := ts_M3UA_AffPc(affected_pcs), + info_String := omit + } + } +} +template (present) PDU_M3UA tr_M3UA_DUNA(template (present) M3UA_Point_Codes affected_pcs := ?, + template OCT4 rctx := *):= { + m3UA_DUNA := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0201'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := tr_M3UA_routing_ctx(rctx), + affected_Point_Codes := tr_M3UA_AffPc(affected_pcs), + info_String := * + } + } +} + +template (value) PDU_M3UA ts_M3UA_DAVA(template (value) M3UA_Point_Codes affected_pcs, + template (omit) OCT4 rctx := omit) := { + m3UA_DAVA := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0202'O, + messageLength := 0, + messageParameters := { + network_Appearance := omit, + routing_Context := ts_M3UA_routing_ctx(rctx), + affected_Point_Codes := ts_M3UA_AffPc(affected_pcs), + info_String := omit + } + } +} +template (present) PDU_M3UA tr_M3UA_DAVA(template (present) M3UA_Point_Codes affected_pcs := ?, + template OCT4 rctx := *):= { + m3UA_DAVA := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0202'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := tr_M3UA_routing_ctx(rctx), + affected_Point_Codes := tr_M3UA_AffPc(affected_pcs), + info_String := * + } + } +} + +template (value) PDU_M3UA ts_M3UA_DAUD(template (value) M3UA_Point_Codes affected_pcs, + template (omit) OCT4 rctx := omit) := { + m3UA_DAUD := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0203'O, + messageLength := 0, + messageParameters := { + network_Appearance := omit, + routing_Context := ts_M3UA_routing_ctx(rctx), + affected_Point_Codes := ts_M3UA_AffPc(affected_pcs), + info_String := omit + } + } +} +template (present) PDU_M3UA tr_M3UA_DAUD(template (present) M3UA_Point_Codes affected_pcs := ?, + template OCT4 rctx := *):= { + m3UA_DAUD := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0203'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := tr_M3UA_routing_ctx(rctx), + affected_Point_Codes := tr_M3UA_AffPc(affected_pcs), + info_String := * + } + } +} + +template (value) PDU_M3UA ts_M3UA_SCON(template (value) M3UA_Point_Codes affected_pcs, + template (omit) OCT4 rctx := omit) := { + m3UA_SCON := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0204'O, + messageLength := 0, + messageParameters := { + network_Appearance := omit, + routing_Context := ts_M3UA_routing_ctx(rctx), + affected_Point_Codes := ts_M3UA_AffPc(affected_pcs), + concerned_Destination := omit, + congestion_Indicators := omit, + info_String := omit + } + } +} +template (present) PDU_M3UA tr_M3UA_SCON(template (present) M3UA_Point_Codes affected_pcs := ?, + template OCT4 rctx := *):= { + m3UA_SCON := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0204'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := tr_M3UA_routing_ctx(rctx), + affected_Point_Codes := tr_M3UA_AffPc(affected_pcs), + concerned_Destination := *, + congestion_Indicators := *, + info_String := * + } + } +} + +template (value) PDU_M3UA ts_M3UA_DUPU(template (value) M3UA_Point_Codes affected_pcs, + template (value) OCT2 cause, + template (value) OCT2 user, + template (omit) OCT4 rctx := omit) := { + m3UA_DUPU := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0205'O, + messageLength := 0, + messageParameters := { + network_Appearance := omit, + routing_Context := ts_M3UA_routing_ctx(rctx), + affected_Point_Codes := ts_M3UA_AffPc(affected_pcs), + user_Cause := ts_M3UA_UserCause(cause, user), + info_String := omit + } + } +} +template (present) PDU_M3UA tr_M3UA_DUPU(template (present) M3UA_Point_Codes affected_pcs := ?, + template (present) OCT2 cause := ?, + template (present) OCT2 user := ?, + template OCT4 rctx := *):= { + m3UA_DUPU := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0205'O, + messageLength := ?, + messageParameters := { + network_Appearance := *, + routing_Context := tr_M3UA_routing_ctx(rctx), + affected_Point_Codes := tr_M3UA_AffPc(affected_pcs), + user_Cause := tr_M3UA_UserCause(cause, user), + info_String := * + } + } +} + +template (present) PDU_M3UA tr_M3UA_DRST := { + m3UA_DRST := { + version := c_M3UA_VERSION, + reserved := '00'O, + messageClassAndType := '0206'O, + messageLength := ?, + messageParameters := ? + } +} + +template (present) PDU_M3UA tr_M3UA_SSNM := (tr_M3UA_DUNA, tr_M3UA_DAVA, tr_M3UA_DAUD, + tr_M3UA_SCON, tr_M3UA_DUPU, tr_M3UA_DRST); /*********************************************************************** * MGMT Class diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 22272f3..b76d9be 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -75,6 +75,14 @@ [] any from M3UA.receive(tr_SctpPeerAddrChange) { repeat; } } +private altstep as_m3ua_ssnm_ignore() runs on RAW_M3UA_CT { + var M3UA_RecvFrom rx; + [] any from M3UA.receive(t_M3UA_RecvFrom(tr_M3UA_SSNM)) -> value rx { + log("Ignoring M3UA SSNM", rx); + repeat; + } +} + friend function f_M3UA_send(integer idx, template (present) PDU_M3UA msg, template integer stream := 0) runs on RAW_M3UA_CT { M3UA[idx].send(t_M3UA_Send(g_m3ua_conn_id[idx], msg, stream)); @@ -183,6 +191,7 @@ f_init_common(); activate(as_m3ua_sctp()); + activate(as_m3ua_ssnm_ignore()); for (i := 0; i < NR_M3UA; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 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: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Gerrit-Change-Number: 22783 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:15:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:15:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 to look at the new patch set (#4). Change subject: stp: Less magic numbers; centralize M3UA configuration ...................................................................... stp: Less magic numbers; centralize M3UA configuration We shouldn't be having magic numbers for point codes etc. in each test case. Change-Id: Id8a6241657e1f02f15d6722934eb040fc98beab1 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 89 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/22784/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:15:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:15:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 ) Change subject: stp: Less magic numbers; centralize M3UA configuration ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:16:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:16:11 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:16:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:19:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:19:38 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c at 209 PS1, Line 209: return 0; > IMHO it would make a lot more sense to have a global counter for this instead, but this chnage as a [?] the problem with a global counter is that it has very limited use. You normally constantly have lchans set-up and torn-down, every time that counter would legitimately increase. So if at all, it would be a per-lchan counter, and you would only want to look at its increments after the initial setup and before the final teardown. Even in that case - would we want to put that burden an whatever is processin that counter data externally? I'd say if at all, we'd probably best * start some kind of timer * only count (globally or per-lchan) when that timer has expired * make sure to stop counting early during channel teardown - i.e. "not that simple" -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:19:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:19:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:19:41 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:19:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:20:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:20:47 +0000 Subject: Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054 to look at the new patch set (#4). Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() ...................................................................... migrate to osmo_fd_{read,write}_{enable,disable}() Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d --- M src/input/dahdi.c M src/input/e1d.c M src/input/ipa.c M src/input/ipaccess.c M src/input/misdn.c M src/input/rs232.c M src/input/unixsocket.c M src/trau/osmo_ortp.c 8 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/54/21054/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Gerrit-Change-Number: 21054 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:21:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:21:00 +0000 Subject: Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/21054 ) Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/21054/1/src/input/e1d.c File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/21054/1/src/input/e1d.c at 318 PS1, Line 318: osmo_fd_write_enable(& e1i_ts->driver.e1d.fd); > space between & and var. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Gerrit-Change-Number: 21054 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:21:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:21:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:21:06 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame ...................................................................... osmo_ortp: Don't print ERROR message for every missing RTP frame * it's inconsistent to print ERROR in a LOGL_INFO message * loosing RTP packets is not that unusual, especially when the channel is just starting up Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Closes: OS#4464 --- M src/trau/osmo_ortp.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 0cd4e9d..6e91f8d 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -202,8 +202,10 @@ if (recv_with_cb(rs)) return 1; - LOGP(DLMIB, LOGL_INFO, "osmo_rtp_socket_poll(%u): ERROR!\n", - rs->rx_user_ts); + /* this happens every time we miss an incoming RTP frame, which is quite common + * when a voice channel is first activated, or also in case of packet loss. + * See also https://osmocom.org/issues/4464 */ + LOGP(DLMIB, LOGL_DEBUG, "osmo_rtp_socket_poll(%u): No message received\n", rs->rx_user_ts); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:21:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:21:17 +0000 Subject: Change in osmo-bsc[master]: hide the "smscb-command" vty command; people should use osmo-cbc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22754 ) Change subject: hide the "smscb-command" vty command; people should use osmo-cbc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Gerrit-Change-Number: 22754 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:21:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:21:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:21:20 +0000 Subject: Change in osmo-bsc[master]: hide the "smscb-command" vty command; people should use osmo-cbc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22754 ) Change subject: hide the "smscb-command" vty command; people should use osmo-cbc ...................................................................... hide the "smscb-command" vty command; people should use osmo-cbc Many years prior to the implementation of osmo-cbc, we introduced a way how raw RSL SMSCB COMMANMD can be injected from the VTY. These days, people should use the CBSP interface with osmo-cbc or any other CBC. We should not advertise the VTY command hack as a standard feature anymore. Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Related: OS#4753 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 26941e2..9005aab 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5796,8 +5796,9 @@ return CMD_SUCCESS; } - -DEFUN(smscb_cmd, smscb_cmd_cmd, +/* this command is now hidden, as it's a low-level debug hack, and people should + * instead use osmo-cbc these days */ +DEFUN_HIDDEN(smscb_cmd, smscb_cmd_cmd, "bts <0-255> smscb-command (normal|schedule|default) <1-4> HEXSTRING", "BTS related commands\n" BTS_NR_STR "SMS Cell Broadcast\n" @@ -5861,6 +5862,7 @@ return CMD_WARNING; } + /* SDCCH4 might not be correct here if the CBCH is on a SDCCH8? */ rsl_sms_cb_command(bts, RSL_CHAN_SDCCH4_ACCH, cb_cmd, false, buf, rc); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Gerrit-Change-Number: 22754 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:21:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:21:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Time out after 5s if expected M3UA doesn't arrive In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 ) Change subject: stp: Time out after 5s if expected M3UA doesn't arrive ...................................................................... stp: Time out after 5s if expected M3UA doesn't arrive No need to wait for the global timeout here. Change-Id: I279aacf2215ccd63a6e52c6a71cda3b500a3795c --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index b76d9be..1c25bae 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -90,6 +90,8 @@ friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg) runs on RAW_M3UA_CT { var M3UA_RecvFrom rx; + timer T := 5.0; + T.start; alt { [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) { setverdict(pass); @@ -99,6 +101,10 @@ "while waiting for ", msg); mtc.stop; } + [] T.timeout { + setverdict(fail, "Timeout waiting for M3UA[", idx, "] ", msg); + mtc.stop; + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 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: I279aacf2215ccd63a6e52c6a71cda3b500a3795c Gerrit-Change-Number: 22786 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:22:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:22:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 ) Change subject: stp: Less magic numbers; centralize M3UA configuration ...................................................................... stp: Less magic numbers; centralize M3UA configuration We shouldn't be having magic numbers for point codes etc. in each test case. Change-Id: Id8a6241657e1f02f15d6722934eb040fc98beab1 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 89 insertions(+), 47 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 1c25bae..1bc5ad5 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -34,18 +34,58 @@ import from STP_Tests_Common all; -modulepar { - HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" }; - HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" }; - integer mp_stp_m3ua_port := 2905; - integer mp_stp_m3ua_clnt_port := 2906; - integer mp_local_m3ua_port := 9999; - integer mp_recovery_timeout_msec := 2000; -} - private const integer NR_M3UA := 3; /* number of M3UA clients in ATS */ private const integer NR_M3UA_SRV := 1; /* number of M3UA servres in ATS */ +modulepar { + /* STP-side IP addresses */ + HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" }; + /* local IP addresses */ + HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" }; + M3uaConfigs mp_m3ua_configs := { + /* as-sender: One ASP within AS */ + { + remote_sctp_port := 2905, + local_sctp_port := 9999, + point_code := 23, + routing_ctx := 1023 + }, + /* as-receiver: Two ASP within AS */ + { + remote_sctp_port := 2905, + local_sctp_port := 10000, + point_code := 42, + routing_ctx := 1042 + }, { + remote_sctp_port := 2905, + local_sctp_port := 10001, + point_code := 42, + routing_ctx := 1042 + }, + /* as-client: One ASP within AS */ + { + remote_sctp_port := 2906, + local_sctp_port := 10002, + point_code := 55, + routing_ctx := 1055 + } + }; + integer mp_recovery_timeout_msec := 2000; + charstring mp_sccp_service_type := "mtp3_itu"; +} + +type record M3uaConfig { + /* STP-side SCTP port for M3UA */ + integer remote_sctp_port, + /* local M3UA base port on TTCN3 side */ + integer local_sctp_port, + /* point code routed via this M3U */ + integer point_code, + /* associated routing context */ + integer routing_ctx +}; +type record length (NR_M3UA+NR_M3UA_SRV) of M3uaConfig M3uaConfigs; + private function M3UA_SRV(integer idx) return integer { return NR_M3UA+idx; } @@ -127,6 +167,7 @@ var Option opt_add_local_addrs; var OptionList opt_list := {}; var template SocketList opt_add_remote_addrs; + var M3uaConfig m3cfg := mp_m3ua_configs[i]; if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) { setverdict(fail, "Empty local or remote address trying to connect SCTP socket: ", @@ -142,15 +183,15 @@ if (lengthof(mp_stp_m3ua_ip) > 1) { for (var integer j := 1; j < lengthof(mp_stp_m3ua_ip); j := j + 1) { - var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], mp_stp_m3ua_port)); + var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j], m3cfg.remote_sctp_port)); opt_add_remote_addrs[j - 1] := sk; } } else { opt_add_remote_addrs := omit; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], mp_stp_m3ua_port, - mp_local_m3ua_ip[0], mp_local_m3ua_port+i, 0, + res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i], mp_stp_m3ua_ip[0], m3cfg.remote_sctp_port, + mp_local_m3ua_ip[0], m3cfg.local_sctp_port, 0, {sctp:=valueof(ts_SCTP(3, 0, opt_add_remote_addrs))}, opt_list); if (not ispresent(res.connId)) { @@ -170,6 +211,7 @@ var Result res; var Option opt_add_local_addrs; var OptionList opt_list := {}; + var M3uaConfig m3cfg := mp_m3ua_configs[i]; if (lengthof(mp_local_m3ua_ip) == 0 ) { setverdict(fail, "Empty local address trying to bind SCTP socket: ", @@ -183,7 +225,7 @@ opt_list := {opt_add_local_addrs}; } - res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], mp_local_m3ua_port+i, + res := M3UA_CodecPort_CtrlFunct.f_IPL4_listen(M3UA[i], mp_local_m3ua_ip[0], m3cfg.local_sctp_port, {sctp:=valueof(ts_SCTP)}, opt_list); if (not ispresent(res.connId)) { setverdict(fail, "Could not bind M3UA socket, check your configuration"); @@ -335,10 +377,10 @@ /* test whether the STP accepts M3UA DATA without Routing Context IE */ testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); f_init_m3ua(); /* bring up the sender specifying a routing context */ @@ -367,10 +409,10 @@ /* test "traffic-mode override" behavior */ testcase TC_tmt_override() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); f_init_m3ua(); @@ -404,10 +446,10 @@ /* test "traffic-mode load-share" behavior */ testcase TC_tmt_loadshare() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); var integer i; f_init_m3ua(); @@ -457,10 +499,10 @@ /* test "traffic-mode broadcast" behavior */ testcase TC_tmt_broadcast() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1042, 4); - var OCT4 pc_receiver := int2oct(42, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].point_code, 4); var integer i; f_init_m3ua(); @@ -519,8 +561,8 @@ /* Send RKM registration; expect OK as RCTX does match config */ testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT { - var OCT3 dpc := int2oct(23, 3); // must match config - var OCT4 rctx := int2oct(1023, 4); // must match config + var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must match config + var OCT4 rctx := int2oct(mp_m3ua_configs[0].routing_ctx, 4); // must match config f_init_m3ua(); @@ -549,7 +591,7 @@ /* try to de-register a routing key that was never registered -> error */ testcase TC_rkm_unreg_never_registered() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(1023,4)))); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(mp_m3ua_configs[0].routing_ctx,4)))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_NOT_REG)})); f_clear_m3ua(); } @@ -565,15 +607,15 @@ /* try to de-register a routing key that was registered -> OK*/ testcase TC_rkm_unreg_registered() runs on RAW_M3UA_CT { f_init_m3ua(); - f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(1023,4)))); + f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(mp_m3ua_configs[0].routing_ctx,4)))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_SUCCESS)})); f_clear_m3ua(); } /* try to de-register a routing key for an active ASP -> ERROR */ testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT { - var OCT3 dpc := int2oct(23, 3); // must match config - var OCT4 rctx := int2oct(1023, 4); // must match config + var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must match config + var OCT4 rctx := int2oct(mp_m3ua_configs[0].routing_ctx, 4); // must match config f_init_m3ua(); @@ -640,7 +682,7 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_clear_m3ua(); } @@ -652,7 +694,7 @@ f_init_m3ua(); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_clear_m3ua(); } @@ -660,16 +702,16 @@ /* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client" * side STP (M3UA ASP) */ testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1023, 4); - var OCT4 pc_sender := int2oct(23, 4); - var OCT4 rctx_receiver := int2oct(1055, 4); - var OCT4 pc_receiver := int2oct(55, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[M3UA_SRV(0)].point_code, 4); f_init_m3ua(); f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_sleep(1.0); @@ -682,16 +724,16 @@ /* Test traffic being routed through "client" side STP (M3UA ASP), coming back in "server" * side STP (M3UA SG) */ testcase TC_clnt_asp_to_sg() runs on RAW_M3UA_CT { - var OCT4 rctx_sender := int2oct(1055, 4); - var OCT4 pc_sender := int2oct(55, 4); - var OCT4 rctx_receiver := int2oct(1023, 4); - var OCT4 pc_receiver := int2oct(23, 4); + var OCT4 rctx_sender := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + var OCT4 pc_sender := int2oct(mp_m3ua_configs[M3UA_SRV(0)].point_code, 4); + var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(mp_m3ua_configs[0].point_code, 4); f_init_m3ua(); f_M3UA_asp_up_act(0); f_init_m3ua_srv(); - f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(1055, 4)); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:22:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:22:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Introduce M3UA SSNM tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 ) Change subject: stp: Introduce M3UA SSNM tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 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: I5074dccde9940956439235e8d02e6a722b8da5f5 Gerrit-Change-Number: 22787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:22:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:23:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:23:07 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc, mnc, lac, rac In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 ) Change subject: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Gerrit-Change-Number: 22704 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:23:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:23:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:23:18 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc, mnc, lac, rac In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 ) Change subject: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac ...................................................................... gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac The notation for the RAI used in the log is not compliant to the spec. Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Related: OS#4894 --- M src/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c index 794afd7..10d3727 100644 --- a/src/gb_proxy_ctrl.c +++ b/src/gb_proxy_ctrl.c @@ -94,7 +94,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(&raid, bvc->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u-%u-%u-%u,%s\n", nse_peer->nsei, bvc->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Gerrit-Change-Number: 22704 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:23:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:23:23 +0000 Subject: Change in libosmocore[master]: Fix struct bitfields on big endian systems In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22679 ) Change subject: Fix struct bitfields on big endian systems ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 Gerrit-Change-Number: 22679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Mon, 08 Feb 2021 17:23:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:23:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:23:25 +0000 Subject: Change in libosmocore[master]: Fix struct bitfields on big endian systems In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22679 ) Change subject: Fix struct bitfields on big endian systems ...................................................................... Fix struct bitfields on big endian systems Changes done by contrib/struct_endianess.py. Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 --- M include/osmocom/gprs/protocol/gsm_08_18.h M include/osmocom/gsm/protocol/gsm_23_032.h M src/gb/frame_relay.c 3 files changed, 88 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/protocol/gsm_08_18.h b/include/osmocom/gprs/protocol/gsm_08_18.h index c10c244..0d002b5 100644 --- a/include/osmocom/gprs/protocol/gsm_08_18.h +++ b/include/osmocom/gprs/protocol/gsm_08_18.h @@ -4,6 +4,7 @@ #pragma once #include +#include /*! Fixed BVCI definitions (Section 5.4.1) */ #define BVCI_SIGNALLING 0x0000 diff --git a/include/osmocom/gsm/protocol/gsm_23_032.h b/include/osmocom/gsm/protocol/gsm_23_032.h index 5be98a2..a4c0506 100644 --- a/include/osmocom/gsm/protocol/gsm_23_032.h +++ b/include/osmocom/gsm/protocol/gsm_23_032.h @@ -50,8 +50,13 @@ }; struct gad_raw_head { +#if OSMO_IS_LITTLE_ENDIAN uint8_t spare:4, type:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t type:4, spare:4; +#endif } __attribute__ ((packed)); struct gad_raw_ell_point { @@ -61,14 +66,23 @@ } __attribute__ ((packed)); struct gad_raw_ell_point_unc_circle { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_CIRCLE */ uint8_t lat[3]; uint8_t lon[3]; uint8_t unc:7, spare2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t spare2:1, unc:7; +#endif } __attribute__ ((packed)); struct gad_raw_ell_point_unc_ellipse { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_ELLIPSE */ uint8_t lat[3]; uint8_t lon[3]; @@ -79,12 +93,27 @@ uint8_t major_ori; uint8_t confidence:7, spare3:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t spare1:1, unc_semi_major:7; + uint8_t spare2:1, unc_semi_minor:7; + uint8_t major_ori; + uint8_t spare3:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_polygon { struct { +#if OSMO_IS_LITTLE_ENDIAN uint8_t num_points:4; uint8_t type:4; /*!< type = GAD_TYPE_POLYGON */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t type:4, num_points:4; +#endif } h; struct { uint8_t lat[3]; @@ -100,6 +129,7 @@ } __attribute__ ((packed)); struct gad_raw_ell_point_alt_unc_ell { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_ALT_UNC_ELL */ uint8_t lat[3]; uint8_t lon[3]; @@ -113,9 +143,22 @@ spare3:1; uint8_t confidence:7, spare4:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t alt[2]; + uint8_t spare1:1, unc_semi_major:7; + uint8_t spare2:1, unc_semi_minor:7; + uint8_t major_ori; + uint8_t spare3:1, unc_alt:7; + uint8_t spare4:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_ell_arc { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_ARC */ uint8_t lat[3]; uint8_t lon[3]; @@ -126,9 +169,21 @@ uint8_t incl_angle; uint8_t confidence:7, spare2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[3]; + uint8_t lon[3]; + uint8_t inner_r[2]; + uint8_t spare1:1, unc_r:7; + uint8_t ofs_angle; + uint8_t incl_angle; + uint8_t spare2:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_ha_ell_point_unc_ell { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE */ uint8_t lat[4]; uint8_t lon[4]; @@ -138,9 +193,21 @@ uint8_t major_ori; uint8_t confidence:7, spare1:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[4]; + uint8_t lon[4]; + uint8_t alt[3]; + uint8_t unc_semi_major; + uint8_t unc_semi_minor; + uint8_t major_ori; + uint8_t spare1:1, confidence:7; +#endif } __attribute__ ((packed)); struct gad_raw_ha_ell_point_alt_unc_ell { +#if OSMO_IS_LITTLE_ENDIAN struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_ALT_UNC_ELL */ uint8_t lat[4]; uint8_t lon[4]; @@ -153,6 +220,19 @@ uint8_t unc_alt; uint8_t v_confidence:7, spare2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + struct gad_raw_head h; + uint8_t lat[4]; + uint8_t lon[4]; + uint8_t alt[3]; + uint8_t unc_semi_major; + uint8_t unc_semi_minor; + uint8_t major_ori; + uint8_t spare1:1, h_confidence:7; + uint8_t unc_alt; + uint8_t spare2:1, v_confidence:7; +#endif } __attribute__ ((packed)); /*! GAD PDU in network-byte-order according to 3GPP TS 23.032 GAD: Universal Geographical Area Description. */ diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c index c54384e..84cd17f 100644 --- a/src/gb/frame_relay.c +++ b/src/gb/frame_relay.c @@ -123,6 +123,7 @@ /* Value part of the Q.933 Annex A.3.3 IE */ struct q933_a_pvc_sts { +#if OSMO_IS_LITTLE_ENDIAN uint8_t dlci_msb:6, spare:1, ext0:1; @@ -136,6 +137,12 @@ spare2:3, ext2:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ext0:1, spare:1, dlci_msb:6; + uint8_t ext1:1, dlci_lsb:4, space1:3; + uint8_t ext2:1, spare2:3, new:1, delete:1, active:1, reserved:1; +#endif } __attribute__((packed)); /* RX Message: 14 [ 00 01 03 08 00 75 95 01 01 00 03 02 01 00 ] */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 Gerrit-Change-Number: 22679 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:24:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:24:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: stp: Introduce M3UA SSNM tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 ) Change subject: stp: Introduce M3UA SSNM tests ...................................................................... stp: Introduce M3UA SSNM tests Tests for M3UA SSNM behavior. This is just being introduced in osmo-stp, so all tests will fail on 'latest', and some will still fail until SSNM processing inside osmo-stp is becoming more complete. Change-Id: I5074dccde9940956439235e8d02e6a722b8da5f5 Related: OS#2623 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 137 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 1bc5ad5..66a3f6f 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -233,13 +233,15 @@ } } -friend function f_init_m3ua() runs on RAW_M3UA_CT { +friend function f_init_m3ua(boolean ignore_ssnm := true) runs on RAW_M3UA_CT { var integer i; f_init_common(); activate(as_m3ua_sctp()); - activate(as_m3ua_ssnm_ignore()); + if (ignore_ssnm) { + activate(as_m3ua_ssnm_ignore()); + } for (i := 0; i < NR_M3UA; i:=i+1) { map(self:M3UA[i], system:M3UA_CODEC_PT); @@ -304,6 +306,12 @@ f_M3UA_exp(idx, tr_M3UA_ASPAC_ACK(tmt, rctx)); } +/* perform an outbound ASP-INACTIVATE procedure */ +friend function f_M3UA_asp_inact(integer idx, template (omit) OCT4 rctx := omit) runs on RAW_M3UA_CT { + f_M3UA_send(idx, ts_M3UA_ASPIA(rctx)); + f_M3UA_exp(idx, tr_M3UA_ASPIA_ACK(rctx)); +} + /* perform outbound ASP-UP and ASP-ACT, optionally expect interemittent NOTIFY */ friend function f_M3UA_asp_up_act(integer idx, template (omit) M3UA_Traffic_Mode_Type tmt := omit, template (omit) OCT4 rctx := omit, @@ -742,6 +750,126 @@ f_clear_m3ua(); } +/* Test if ASPAC / ASPIA of one ASP generates DAVA / DUNA on other ASP */ +testcase TC_ssnm_aspac_dava_aspia_duna() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + + f_init_m3ua(ignore_ssnm := false); + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate the second ASP */ + f_M3UA_asp_up_act(1, c_M3UA_TMT_override, omit); + /* expect DAVA for PC of second ASP on first ASP */ + f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(mp_m3ua_configs[1].point_code, 0)}, rctx0)); + /* TODO: expect no DAVA on second ASP */ + + /* deactivate the second ASP */ + f_M3UA_asp_inact(1); + /* expect DUNA for PC of second ASP on first ASP */ + f_M3UA_exp(0, tr_M3UA_DUNA({ts_M3UA_PC(mp_m3ua_configs[1].point_code, 0)}, rctx0)); + /* TODO: expect no DUNA on second ASP */ + + f_clear_m3ua(); +} + +/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_dava_duna() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a DAVA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA({adv_pc}, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DAVA({adv_pc}, rctx0)); + + /* transmit a DUNA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA({adv_pc}, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DUNA({adv_pc}, rctx0)); +} + +/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_dava_duna_multipc() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Codes adv_pcs := { ts_M3UA_PC(1234, 0), ts_M3UA_PC(5678, 0) }; + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a DAVA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA(adv_pcs, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DAVA(adv_pcs, rctx0)); + + /* transmit a DUNA to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA(adv_pcs, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DUNA(adv_pcs, rctx0)); +} + +/* Test if DUPU sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_dupu() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a DUPU to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctx0)); +} + +/* Test if SCON sent from SG to ASP-role STP gets forwarded to other ASP */ +testcase TC_ssnm_distribution_scon() runs on RAW_M3UA_CT { + var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4); + var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4); + /* some random point code whose availability we advertise */ + var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0); + + f_init_m3ua(ignore_ssnm := false); + + /* activate the first ASP */ + f_M3UA_asp_up_act(0); + + /* activate SG-role ASP (ASP on STP) */ + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4)); + + /* transmit a SCON to the remote ASP */ + f_M3UA_send(M3UA_SRV(0), ts_M3UA_SCON({adv_pc}, rctxS0)); + /* expect that to show up on other ASP */ + f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); +} control { @@ -776,6 +904,13 @@ execute( TC_clnt_sg_to_asp() ); execute( TC_clnt_asp_to_sg() ); + /* M3UA SSNM tests */ + execute( TC_ssnm_aspac_dava_aspia_duna() ); + execute( TC_ssnm_distribution_dava_duna() ); + execute( TC_ssnm_distribution_dava_duna_multipc() ); + execute( TC_ssnm_distribution_dupu() ); + execute( TC_ssnm_distribution_scon() ); + /* put this one last as it changes the stp side config */ execute( TC_clnt_asp_act_tmt_loadshare() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 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: I5074dccde9940956439235e8d02e6a722b8da5f5 Gerrit-Change-Number: 22787 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:25:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:25:49 +0000 Subject: Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/21054 ) Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Gerrit-Change-Number: 21054 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:25:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:25:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:25:52 +0000 Subject: Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/21054 ) Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() ...................................................................... migrate to osmo_fd_{read,write}_{enable,disable}() Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d --- M src/input/dahdi.c M src/input/e1d.c M src/input/ipa.c M src/input/ipaccess.c M src/input/misdn.c M src/input/rs232.c M src/input/unixsocket.c M src/trau/osmo_ortp.c 8 files changed, 21 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/input/dahdi.c b/src/input/dahdi.c index e59518a..cdaa8eb 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -205,7 +205,7 @@ return 0; } - e1i_ts->driver.dahdi.fd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&e1i_ts->driver.dahdi.fd); return 0; } @@ -251,7 +251,7 @@ struct e1inp_sign_link *sign_link; struct msgb *msg; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* get the next msg for this timeslot */ msg = e1inp_tx_ts(e1i_ts, &sign_link); diff --git a/src/input/e1d.c b/src/input/e1d.c index 3ae1d89..cab219d 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -100,7 +100,7 @@ struct e1inp_sign_link *sign_link; struct msgb *msg; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* get the next msg for this timeslot */ msg = e1inp_tx_ts(e1i_ts, &sign_link); @@ -316,7 +316,7 @@ return 0; } - e1i_ts->driver.e1d.fd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&e1i_ts->driver.e1d.fd); return 0; } diff --git a/src/input/ipa.c b/src/input/ipa.c index 8281b4f..f01ecd9 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -89,7 +89,7 @@ LOGIPA(link, LOGL_DEBUG, "sending data\n"); if (llist_empty(&link->tx_queue)) { - ofd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(ofd); return 0; } lh = link->tx_queue.next; @@ -124,7 +124,7 @@ link->updown_cb(link, 0); return 0; } - ofd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(ofd); LOGIPA(link, LOGL_NOTICE, "connection done\n"); link->state = IPA_CLIENT_LINK_STATE_CONNECTED; if (link->updown_cb) @@ -228,7 +228,7 @@ if (ret < 0) return ret; link->ofd->fd = ret; - link->ofd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(link->ofd); if (osmo_fd_register(link->ofd) < 0) { close(ret); link->ofd->fd = -1; @@ -241,7 +241,7 @@ void ipa_client_conn_send(struct ipa_client_conn *link, struct msgb *msg) { msgb_enqueue(&link->tx_queue, msg); - link->ofd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(link->ofd); } size_t ipa_client_conn_clear_queue(struct ipa_client_conn *link) @@ -254,7 +254,7 @@ deleted += 1; } - link->ofd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(link->ofd); return deleted; } @@ -387,7 +387,7 @@ msg = msgb_dequeue(&conn->tx_queue); if (!msg) { - conn->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&conn->ofd); return; } @@ -532,5 +532,5 @@ void ipa_server_conn_send(struct ipa_server_conn *conn, struct msgb *msg) { msgb_enqueue(&conn->tx_queue, msg); - conn->ofd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&conn->ofd); } diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8843191..be882a9 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -434,7 +434,7 @@ static int ts_want_write(struct e1inp_ts *e1i_ts) { - e1i_ts->driver.ipaccess.fd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&e1i_ts->driver.ipaccess.fd); return 0; } @@ -486,7 +486,7 @@ int ret; e1i_ts = ipaccess_line_ts(bfd, line); - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* get the next msg for this timeslot */ msg = e1inp_tx_ts(e1i_ts, &sign_link); @@ -501,7 +501,7 @@ case E1INP_SIGN_OSMO: break; default: - bfd->when |= OSMO_FD_WRITE; /* come back for more msg */ + osmo_fd_write_enable(bfd); /* come back for more msg */ ret = -EINVAL; goto out; } diff --git a/src/input/misdn.c b/src/input/misdn.c index 0237cb9..874b627 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -217,7 +217,7 @@ e1i_ts->type == E1INP_TS_TYPE_I460) return 0; - e1i_ts->driver.misdn.fd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&e1i_ts->driver.misdn.fd); return 0; } @@ -243,7 +243,7 @@ uint8_t *l2_data; int ret; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* get the next msg for this timeslot */ msg = e1inp_tx_ts(e1i_ts, &sign_link); diff --git a/src/input/rs232.c b/src/input/rs232.c index 522cf0e..b594db2 100644 --- a/src/input/rs232.c +++ b/src/input/rs232.c @@ -86,7 +86,7 @@ struct msgb *msg; int written; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* get the next msg for this timeslot */ msg = e1inp_tx_ts(e1i_ts, &sign_link); @@ -207,7 +207,7 @@ static int rs232_want_write(struct e1inp_ts *e1i_ts) { - e1i_ts->driver.rs232.fd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&e1i_ts->driver.rs232.fd); return 0; } diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c index 9a6ff9b..595dc7d 100644 --- a/src/input/unixsocket.c +++ b/src/input/unixsocket.c @@ -147,7 +147,7 @@ struct msgb *msg; struct e1inp_sign_link *sign_link; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* get the next msg for this timeslot */ msg = e1inp_tx_ts(e1i_ts, &sign_link); @@ -185,7 +185,7 @@ { struct unixsocket_line *line = e1i_ts->line->driver_data; - line->fd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&line->fd); return 0; } diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 6e91f8d..d105ca8 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -218,7 +218,7 @@ if (what & OSMO_FD_READ) { /* in polling mode, we don't want to be called here */ if (rs->flags & OSMO_RTP_F_POLL) { - fd->when &= ~OSMO_FD_READ; + osmo_fd_read_disable(fd); return 0; } if (!recv_with_cb(rs)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d Gerrit-Change-Number: 21054 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:26:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:26:29 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:26:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:26:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:26:33 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:26:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:26:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:26:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:34:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:34:09 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 to look at the new patch set (#2). Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Closes: OS#4143 --- M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c 2 files changed, 51 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/22756/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:34:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:34:21 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/22756/1/src/ranap_msg_factory.c File src/ranap_msg_factory.c: https://gerrit.osmocom.org/c/osmo-iuh/+/22756/1/src/ranap_msg_factory.c at 205 PS1, Line 205: /*! \brief generate RANAP SECURITY MODE COMMAND message */ > Now that masks are passed it would be great having more verbose description. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:34:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:35:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:35:19 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22790 ) Change subject: cosmetic: fix typo in comment ...................................................................... cosmetic: fix typo in comment Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d --- M src/gsm_rlcmac.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/22790/1 diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 9b8782d..c56526e 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -5832,7 +5832,7 @@ LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); return CSN_ERROR_GENERAL; } - /* We can decode the message */ + /* We can encode the message */ else { /* First print the message type and create a tree item */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d Gerrit-Change-Number: 22790 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:36:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:36:36 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22638 to look at the new patch set (#3). Change subject: ns2: improve backlog handling on interface up/down ...................................................................... ns2: improve backlog handling on interface up/down This patch improves the behavior of the newly-added backlog in situations where the interface goes up/down. * don't add new packets to the backlog while if_running == false * flush the backlog on both ifup and ifdown events Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 --- M src/gb/gprs_ns2_fr.c 1 file changed, 35 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/22638/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:36:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:36:51 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22638/1/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22638/1/src/gb/gprs_ns2_fr.c at 589 PS1, Line 589: bpriv->if_running = if_running; > Since you are moving use of this field here, it probably makes sense to move the "if (bpriv->if_runn [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:36:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:37:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:37:20 +0000 Subject: Change in libosmocore[master]: ns2: Name NSVC FSM events consistently In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22734 ) Change subject: ns2: Name NSVC FSM events consistently ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e Gerrit-Change-Number: 22734 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:37:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:37:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:37:44 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:37:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:37:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:37:59 +0000 Subject: Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22709 ) Change subject: ns2: Don't try to add packets to the backlog on real errors ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 Gerrit-Change-Number: 22709 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:37:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:38:47 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:38:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:39:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 17:39:33 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22790 ) Change subject: cosmetic: fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d Gerrit-Change-Number: 22790 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 08 Feb 2021 17:39:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:43:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:43:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 to look at the new patch set (#2). Change subject: VTY: Fix warning: control reaches end of non-void function ...................................................................... VTY: Fix warning: control reaches end of non-void function Change-Id: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/22737/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 Gerrit-Change-Number: 22737 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:45:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:45:01 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c at 209 PS1, Line 209: return 0; > the problem with a global counter is that it has very limited use. [?] Or simply start counting after first RTP packet has arrived? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:45:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:47:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:47:47 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:47:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:48:26 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 17:48:26 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME ...................................................................... Patch Set 3: > Patch Set 3: > > Thanks. Can we move the field to something more descriptive? Like "subscriber_count" ? That's possible, yes. In the Amarisoft config it's called count only. But we can call it subscriber_count if you prefer in the dict -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:48:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:48:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:48:45 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:48:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:49:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 17:49:49 +0000 Subject: Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME ...................................................................... Patch Set 3: Code-Review-1 Yes please, let's name it "subscriber_count". -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:49:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:50:14 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 17:50:14 +0000 Subject: Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py File src/osmo_gsm_tester/obj/srslte_common.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py at 50 PS3, Line 50: def get_stdout_kpis(self): > I'm in general not happy to see new public APIs like this popping up (is it public to be used by tes [?] Yes, its really more of a helper. The testcase can use `get_kpi` but then each TC has to do "self.kpis["stdout_" + self.name()]", which is is better placed here, no? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:50:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 17:52:23 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 17:52:23 +0000 Subject: Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class In-Reply-To: References: Message-ID: srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py File src/osmo_gsm_tester/obj/epc.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py at 124 PS3, Line 124: return {'total_errors': 0, 'total_warnings': 0} > Still missing to remove trailing whitespace. ahh, check it in the wrong file. fixed now -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:52:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 18:37:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 18:37:43 +0000 Subject: Change in libosmocore[master]: ns2: Name NSVC FSM events consistently In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22734 ) Change subject: ns2: Name NSVC FSM events consistently ...................................................................... ns2: Name NSVC FSM events consistently Reading a log line like this: <0026> gprs_ns2_vc_fsm.c:808 GPRS-NS2-VC(FR-hdlcnet1-DLCI16-NSE02001-NSVC00001)[0x6120000024a0]{UNBLOCKED}: Received Event RESET is very ambiguous. Does it mean we received a NS-RESET message? Does it mean the FSM was instructed to send a NS-RESET? ... Let's make sure the human-readable names give a very clear indication of what exactly is happening. Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index f6424de..66ee450 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -122,18 +122,18 @@ }; static const struct value_string ns2_vc_event_names[] = { - { GPRS_NS2_EV_REQ_START, "START" }, - { GPRS_NS2_EV_RX_RESET, "RESET" }, - { GPRS_NS2_EV_RX_RESET_ACK, "RESET_ACK" }, - { GPRS_NS2_EV_RX_UNBLOCK, "UNBLOCK" }, - { GPRS_NS2_EV_RX_UNBLOCK_ACK, "UNBLOCK_ACK" }, - { GPRS_NS2_EV_RX_BLOCK, "BLOCK" }, - { GPRS_NS2_EV_RX_BLOCK_ACK, "BLOCK_ACK" }, - { GPRS_NS2_EV_RX_ALIVE, "ALIVE" }, - { GPRS_NS2_EV_RX_ALIVE_ACK, "ALIVE_ACK" }, - { GPRS_NS2_EV_RX_STATUS, "STATUS" }, - { GPRS_NS2_EV_RX_UNITDATA, "UNITDATA" }, - { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "FORCE_UNCONFIGURED" }, + { GPRS_NS2_EV_REQ_START, "REQ-START" }, + { GPRS_NS2_EV_RX_RESET, "RX-RESET" }, + { GPRS_NS2_EV_RX_RESET_ACK, "RX-RESET_ACK" }, + { GPRS_NS2_EV_RX_UNBLOCK, "RX-UNBLOCK" }, + { GPRS_NS2_EV_RX_UNBLOCK_ACK, "RX-UNBLOCK_ACK" }, + { GPRS_NS2_EV_RX_BLOCK, "RX-BLOCK" }, + { GPRS_NS2_EV_RX_BLOCK_ACK, "RX-BLOCK_ACK" }, + { GPRS_NS2_EV_RX_ALIVE, "RX-ALIVE" }, + { GPRS_NS2_EV_RX_ALIVE_ACK, "RX-ALIVE_ACK" }, + { GPRS_NS2_EV_RX_STATUS, "RX-STATUS" }, + { GPRS_NS2_EV_RX_UNITDATA, "RX-UNITDATA" }, + { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "REQ-FORCE_UNCONFIGURED" }, { GPRS_NS2_EV_REQ_OM_BLOCK, "REQ-O&M-BLOCK"}, { GPRS_NS2_EV_REQ_OM_UNBLOCK, "REQ-O&M-UNBLOCK"}, { 0, NULL } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e Gerrit-Change-Number: 22734 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 18:37:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 18:37:43 +0000 Subject: Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones ...................................................................... ns2: Don't queue Q.933 LMI messages; only store most recent ones There's not really any point in storing multiple LMI messages, and then transmitting them in inverse order, as the existing code does. Instead, we shall store only the last (failed) LMI message and try to transmit that at highest priority, before any NS messages in the actual queue. Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 --- M src/gb/gprs_ns2_fr.c 1 file changed, 18 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 78abddc..cae03ee 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -105,7 +105,9 @@ struct { /* file-descriptor for AF_PACKET socket */ struct osmo_fd ofd; - /* list of msgb (backlog) */ + /* LMI bucket (we only store the last LMI message, no need to queue */ + struct msgb *lmi_msg; + /* list of NS msgb (backlog) */ struct llist_head list; /* timer to trigger next attempt of AF_PACKET write */ struct osmo_timer_list timer; @@ -173,6 +175,7 @@ llist_for_each_entry_safe(msg, msg2, &priv->backlog.list, list) { msgb_free(msg); } + msgb_free(priv->backlog.lmi_msg); osmo_fr_link_free(priv->link); osmo_fd_close(&priv->backlog.ofd); @@ -357,6 +360,7 @@ /* enqueue to backlog (LMI, signaling) or drop (userdata msg) */ static int backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb *msg) { + struct priv_bind *priv = bind->priv; uint8_t dlci = msg->data[0]; uint8_t ns_pdu_type; uint16_t bvci; @@ -367,8 +371,9 @@ /* we want to enqueue only Q.933 LMI traffic or NS signaling; NOT user traffic */ switch (dlci) { case LMI_Q933A_DLCI: - /* enqueue Q.933 LMI at head of queue */ - enqueue_at_head(bind, msg); + /* always store only the last LMI message in the lmi_msg bucket */ + msgb_free(priv->backlog.lmi_msg); + priv->backlog.lmi_msg = msg; return 0; default: if (msgb_length(msg) < 3) @@ -405,6 +410,15 @@ struct priv_bind *priv = bind->priv; int i, rc; + /* first try to get rid of the LMI message, if any */ + if (priv->backlog.lmi_msg) { + rc = fr_netif_write_one(bind, priv->backlog.lmi_msg); + if (rc < 0) + goto restart_timer; + /* fr_netif_write_one() has just free'd it */ + priv->backlog.lmi_msg = NULL; + } + /* attempt to send up to 10 messages in every timer */ for (i = 0; i < 10; i++) { struct msgb *msg = msgb_dequeue(&priv->backlog.list); @@ -420,6 +434,7 @@ osmo_stat_item_dec(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1); } +restart_timer: /* re-start timer if we still have data in the queue */ if (!llist_empty(&priv->backlog.list)) osmo_timer_schedule(&priv->backlog.timer, 0, priv->backlog.retry_us); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 18:37:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 18:37:44 +0000 Subject: Change in libosmocore[master]: ns2: improve backlog handling on interface up/down In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down ...................................................................... ns2: improve backlog handling on interface up/down This patch improves the behavior of the newly-added backlog in situations where the interface goes up/down. * don't add new packets to the backlog while if_running == false * flush the backlog on both ifup and ifdown events Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 --- M src/gb/gprs_ns2_fr.c 1 file changed, 35 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index cae03ee..2662df6 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -376,6 +376,10 @@ priv->backlog.lmi_msg = msg; return 0; default: + /* there's no point in trying to enqueue messages if the interface is down */ + if (!priv->if_running) + break; + if (msgb_length(msg) < 3) break; ns_pdu_type = msg->data[2]; @@ -559,6 +563,35 @@ return NULL; } +static void link_state_change(struct gprs_ns2_vc_bind *bind, bool if_running) +{ + struct priv_bind *bpriv = bind->priv; + struct msgb *msg, *msg2; + + if (bpriv->if_running == if_running) + return; + + LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n", + bpriv->netif, if_running ? "UP" : "DOWN"); + + /* free any backlog, both on IFUP and IFDOWN. Keep the LMI, as it makes + * sense to get one out of the door ASAP. */ + llist_for_each_entry_safe(msg, msg2, &bpriv->backlog.list, list) { + msgb_free(msg); + } + + if (if_running) { + /* interface just came up */ + if (bpriv->backlog.lmi_msg) + osmo_timer_schedule(&bpriv->backlog.timer, 0, bpriv->backlog.retry_us); + } else { + /* interface just went down; no need to retransmit */ + osmo_timer_del(&bpriv->backlog.timer); + } + + bpriv->if_running = if_running; +} + /* handle a single netlink message received via libmnl */ static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data) { @@ -586,15 +619,8 @@ if_running = !!(ifm->ifi_flags & IFF_RUNNING); bind = bind4netdev(nsi, ifname); - if (bind) { - struct priv_bind *bpriv = bind->priv; - if (bpriv->if_running != if_running) { - /* update running state */ - LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n", - ifname, if_running ? "UP" : "DOWN"); - bpriv->if_running = if_running; - } - } + if (bind) + link_state_change(bind, if_running); return MNL_CB_OK; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 18:37:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 18:37:45 +0000 Subject: Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22709 ) Change subject: ns2: Don't try to add packets to the backlog on real errors ...................................................................... ns2: Don't try to add packets to the backlog on real errors When writing to the AF_PACKET socket, we have to distinguish the pseudo-errors like -ENOBUFS (where we do want to add to the backlog) from real errors like -ENETDOWN, -EMSGSIZE, ... where we don't want to add the failed packet to the backlog. Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 --- M src/gb/gprs_ns2_fr.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 2662df6..93b7759 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -311,10 +311,14 @@ switch (errno) { case EAGAIN: case ENOBUFS: + /* not a real error, but more a normal event on AF_PACKET */ + /* don't free the message and let the caller re-enqueue */ return -errno; default: + /* an actual error, like -ENETDOWN, -EMSGSIZE */ LOGBIND(bind, LOGL_ERROR, "error during write to AF_PACKET: %s\n", strerror(errno)); - return -errno; + msgb_free(msg); + return 0; } } else { /* short write */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 Gerrit-Change-Number: 22709 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:15:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:15:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 ) Change subject: VTY: Fix warning: control reaches end of non-void function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 Gerrit-Change-Number: 22737 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 20:15:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:16:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:16:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix tons of warnings in RLCMAC and pcu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 ) Change subject: Fix tons of warnings in RLCMAC and pcu ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 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: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 Gerrit-Change-Number: 22745 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 20:16:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:16:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:16:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix tons of warnings in RLCMAC and pcu In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 ) Change subject: Fix tons of warnings in RLCMAC and pcu ...................................................................... Fix tons of warnings in RLCMAC and pcu Change-Id: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 --- M library/RLCMAC_CSN1_Templates.ttcn M library/RLCMAC_Templates.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 4 files changed, 44 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 1becddd..39f240b 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -284,7 +284,7 @@ pwr_ctrl := * }; - template EgprsAckNackDescriptionIE ts_EgprsAckNackDescriptionIE(template EgprsAckNackDescription andesc) := { + template (value) EgprsAckNackDescriptionIE ts_EgprsAckNackDescriptionIE(template (value) EgprsAckNackDescription andesc) := { len_present := '1'B, len := 0, /* Overwritten by RAW encoder */ acknack_desc := andesc diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index 6b5fb9f..e398491 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -369,7 +369,7 @@ } /* Send Template for Downlink ACK/NACK */ - template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi, AckNackDescription andesc, boolean retry := false, + template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template (value) uint5_t tfi, AckNackDescription andesc, boolean retry := false, template (omit) ChannelReqDescription chreq_desc := omit) := { ctrl := { mac_hdr := { @@ -393,8 +393,10 @@ } /* Send Template for Egprs Downlink ACK/NACK */ - template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template uint5_t tfi, EgprsAckNackDescription andesc, boolean retry := false, - template (omit) ChannelReqDescription chreq_desc := omit) := { + template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template (value) uint5_t tfi, + EgprsAckNackDescription andesc, + boolean retry := false, + template (omit) ChannelReqDescription chreq_desc := omit) := { ctrl := { mac_hdr := { payload_type := MAC_PT_RLCMAC_NO_OPT, @@ -762,7 +764,8 @@ } /* Template for Uplink MAC Control Header */ - template UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template MacPayloadType pt, template boolean retry := false) := { + template (value) UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template (value) MacPayloadType pt, + template (value) boolean retry := false) := { payload_type := pt, spare := '00000'B, retry := retry diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 830f8d3..34b7e79 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -424,7 +424,7 @@ function f_dltbf_ts_RLCMAC_DL_ACK_NACK(DlTbf dl_tbf, boolean use_egprs := false, template (omit) ChannelReqDescription chreq_desc := omit) -runs on MS_BTS_IFACE_CT return template RlcmacUlBlock { +runs on MS_BTS_IFACE_CT return template (value) RlcmacUlBlock { if (use_egprs) { return ts_RLCMAC_DL_ACK_NACK_EGPRS(dl_tbf.tfi, dl_tbf.egprs_acknack_desc, false, chreq_desc); } else { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 8c9b469..5f75992 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -310,7 +310,7 @@ /* Send a random block, so this TBF becomes "active" */ if (do_activate) { /* FIXME: use the new APU by Pau to get correct TRX/TS here */ - var template TsTrxBtsNum nr := ts_TsTrxBtsNum(7, i mod 8); + var template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum(7, i mod 8); var octetstring dummy := f_rnd_octstring(12); var RlcmacDlBlock dl_block; var uint32_t poll_fn; @@ -353,8 +353,8 @@ pkt_res_req := ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit); } - f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(pkt_res_req), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); - /* Store 1st UlTBF context before receiving next one, will will + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(valueof(pkt_res_req)), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + /* Store 1st UlTBF context before receiving next one, will * overwrite the TS allocation on MS with info from new UL TBF: */ pollctx.tstrxbts := f_ms_tx_TsTrxBtsNum(ms); @@ -986,7 +986,7 @@ } /* Verify scheduling of multiple Downlink data blocks, enough to reach CS4 */ -function f_dl_data_exp_cs(template CodingScheme exp_final_cs := ?, template MSRadioAccessCapabilityV_BSSGP ms_racap := omit) runs on RAW_PCU_Test_CT { +function f_dl_data_exp_cs(template (present) CodingScheme exp_final_cs := ?, template (omit) MSRadioAccessCapabilityV_BSSGP ms_racap := omit) runs on RAW_PCU_Test_CT { var octetstring data := f_rnd_octstring(1400); var RlcmacDlBlock prev_dl_block, dl_block; var uint32_t ack_fn; @@ -996,7 +996,7 @@ var integer bsn := 0; var boolean using_egprs := f_rlcmac_cs_mcs_is_mcs(valueof(exp_final_cs)); var integer bsn_mod; - var template CodingScheme exp_tmp_csmcs; + var template (present) CodingScheme exp_tmp_csmcs; if (using_egprs) { exp_tmp_csmcs := mcs_egprs_any; @@ -1640,7 +1640,7 @@ * answered, so TBFs for uplink and later for downlink are created. */ testcase TC_mo_ping_pong() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_cs_mcs := cs_gprs_any; f_TC_mo_ping_pong_1phase_access(exp_cs_mcs); } @@ -1712,15 +1712,15 @@ } testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_ul_cs_mcs := cs_gprs_any; - var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_ul_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_dl_cs_mcs := cs_gprs_any; f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any; - var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any; + var template (present) CodingScheme exp_ul_cs_mcs := mcs_egprs_any; + var template (present) CodingScheme exp_dl_cs_mcs := mcs_egprs_any; f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } @@ -1730,7 +1730,7 @@ g_force_two_phase_access := true; var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false); - var template CodingScheme exp_dl_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_dl_cs_mcs := cs_gprs_any; f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs); } @@ -1790,14 +1790,14 @@ } testcase TC_mt_ping_pong() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_cs_mcs := cs_gprs_any; f_TC_mt_ping_pong(omit, exp_cs_mcs); } /* TC_mt_ping_pong, but DL-UNITDATA contains RA Access capability with (M)CS /* information about the MS */ testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT { - var template CodingScheme exp_cs_mcs := cs_gprs_any; + var template (present) CodingScheme exp_cs_mcs := cs_gprs_any; f_TC_mt_ping_pong(bssgp_ms_racap_gprs_def, exp_cs_mcs); } @@ -2963,7 +2963,7 @@ /* Make sure that Immediate (UL EGPRS TBF) Assignment contains hopping parameters */ testcase TC_pcuif_fh_imm_ass_ul_egprs() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var GprsMS ms := valueof(t_GprsMS_def); /* Enable frequency hopping on TRX0/TS7 */ @@ -2984,7 +2984,7 @@ /* Make sure that Immediate (UL TBF) Assignment contains hopping parameters */ testcase TC_pcuif_fh_imm_ass_ul() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var GprsMS ms := valueof(t_GprsMS_def); /* Enable frequency hopping on TRX0/TS7 */ @@ -3002,7 +3002,7 @@ /* Make sure that Immediate (DL TBF) Assignment contains hopping parameters */ testcase TC_pcuif_fh_imm_ass_dl() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS) + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var GprsMS ms := valueof(t_GprsMS_def); /* Enable frequency hopping on TRX0/TS7 */ @@ -3063,7 +3063,7 @@ /* Make sure that Packet Uplink Assignment contains hopping parameters */ testcase TC_pcuif_fh_pkt_ass_ul() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var GprsMS ms := valueof(t_GprsMS_def); var uint32_t poll_fn; @@ -3103,7 +3103,7 @@ /* Make sure that Packet Downlink Assignment contains hopping parameters */ testcase TC_pcuif_fh_pkt_ass_dl() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS); var octetstring data := f_rnd_octstring(10); var GprsMS ms := valueof(t_GprsMS_def); var RlcmacDlBlock dl_block; @@ -3151,7 +3151,7 @@ /* Check if the IUT handles subsequent INFO.ind messages */ testcase TC_pcuif_info_ind_subsequent() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var BTS_PDTCH_Block data_msg; /* Initialize the PCU interface abstraction */ @@ -3647,9 +3647,9 @@ 423), 2), 5)); - var template RIM_Routing_Address src_addr := t_RIM_Routing_Address_cid(src); - var template RIM_Routing_Address dst_addr := t_RIM_Routing_Address_cid(dst); - var template RAN_Information_RIM_Container res_cont; + var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); + var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); + var template (value) RAN_Information_RIM_Container res_cont; res_cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(2), ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), @@ -4147,16 +4147,16 @@ BTS.send(si16_data_ind); f_sleep(1.0); - var template RIM_Routing_Address dst_addr; - var template RIM_Routing_Address src_addr; - var template RAN_Information_Request_RIM_Container req_cont; - var template PDU_BSSGP bssgp_rim_pdu; + var RIM_Routing_Address dst_addr; + var RIM_Routing_Address src_addr; + var template (value) RAN_Information_Request_RIM_Container req_cont; + var template (value) PDU_BSSGP bssgp_rim_pdu; var template PDU_BSSGP bssgp_rim_pdu_expect; var template RAN_Information_RIM_Container rim_cont_expect; var BssgpCellId src_cid := {ra_id := { lai := { mcc_mnc := '262F42'H, lac := 12345}, rac := 0 }, cell_id := 20962 }; - src_addr := t_RIM_Routing_Address_cid(src_cid); - dst_addr := t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id); + src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); + dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); var octetstring si_expect := si1_expect & si3_expect & si13_expect; @@ -4201,7 +4201,7 @@ * has no system information available. We expect getting a response back but * with no system information inside. */ testcase TC_rim_ran_info_req_single_rep_no_si() runs on RAW_PCU_Test_CT { - var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; + var template (value) PCUIF_info_ind info_ind := ts_PCUIF_INFO_default; var PCUIF_Message pcu_msg; timer T := 2.0; @@ -4223,16 +4223,16 @@ BTS.send(si16_data_ind); f_sleep(1.0); - var template RIM_Routing_Address dst_addr; - var template RIM_Routing_Address src_addr; - var template RAN_Information_Request_RIM_Container req_cont; - var template PDU_BSSGP bssgp_rim_pdu; + var RIM_Routing_Address dst_addr; + var RIM_Routing_Address src_addr; + var template (value) RAN_Information_Request_RIM_Container req_cont; + var template (value) PDU_BSSGP bssgp_rim_pdu; var template PDU_BSSGP bssgp_rim_pdu_expect; var template RAN_Information_RIM_Container rim_cont_expect; var BssgpCellId src_cid := {ra_id := { lai := { mcc_mnc := '262F42'H, lac := 12345}, rac := 0 }, cell_id := 20962 }; - src_addr := t_RIM_Routing_Address_cid(src_cid); - dst_addr := t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id); + src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); + dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(1), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 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: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 Gerrit-Change-Number: 22745 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:16:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:16:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 ) Change subject: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally ...................................................................... pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally The same values are available for several tests as gloval consts. Change-Id: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3 --- M pcu/PCU_Tests.ttcn 1 file changed, 4 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 5f75992..0b887db 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4124,9 +4124,6 @@ * PCUIF on startup. */ testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { const BssgpBvci bvci := mp_gb_cfg.bvc[0].bvci; - var octetstring si1_expect := '198fb100000000000000000000000000007900002b'O; - var octetstring si3_expect := '1b753000f110236ec9033c2747407900003c0b2b2b'O; - var octetstring si13_expect := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; timer T := 2.0; /* Initialize NS/BSSGP side */ @@ -4139,11 +4136,11 @@ f_bssgp_establish(); /* Send sysinfo to the PCU */ - var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_default, 0, 0, 0, 0, 32767); BTS.send(si1_data_ind); - var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_default, 0, 0, 0, 0, 32767); BTS.send(si3_data_ind); - var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_default, 0, 0, 0, 0, 32767); BTS.send(si16_data_ind); f_sleep(1.0); @@ -4158,9 +4155,6 @@ src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); - - var octetstring si_expect := si1_expect & si3_expect & si13_expect; - req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(1), ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), @@ -4175,7 +4169,7 @@ tr_RIM_Sequence_Number(1), tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), tr_RIM_Protocol_Version_Number(1), - tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_expect)), + tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_default)), omit); bssgp_rim_pdu_expect := tr_PDU_BSSGP_RAN_INFORMATION(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 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: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3 Gerrit-Change-Number: 22746 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:16:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:16:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 ) Change subject: VTY: Fix warning: control reaches end of non-void function ...................................................................... VTY: Fix warning: control reaches end of non-void function Change-Id: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 9410c9e..49f587d 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -10,6 +10,8 @@ */ module Osmocom_VTY_Functions { + + import from Misc_Helpers all; import from TELNETasp_PortType all; import from Osmocom_Types all; @@ -218,9 +220,10 @@ num_attempts := num_attempts - 1; } - setverdict(fail, "No matching VTY response for regular expression '", regex, - "' after ", num_attempts, " attempts." ); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No matching VTY response for regular expression '", + regex, "' after ", num_attempts, " attempts." )); + return ""; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 Gerrit-Change-Number: 22737 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:18:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:18:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 ) Change subject: msc: finish and enable test case for MT Call T310 timer ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 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: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Gerrit-Change-Number: 22716 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 20:18:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:18:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:18:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 ) Change subject: msc: test reaction on Clear Request during a MO/MT Call ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 20:18:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:18:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:18:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 ) Change subject: msc: finish and enable test case for MT Call T310 timer ...................................................................... msc: finish and enable test case for MT Call T310 timer The test suite needs to handle MGCP messages, otherwise the related FSMs in the IUT would tear everything down before T310 is expired. Change-Id: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Related: SYS#5340 --- M msc/MSC_Tests.ttcn 1 file changed, 41 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e6681bb..206effa 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1679,43 +1679,69 @@ /* Test MT Call T310 timer */ friend function f_tc_mt_t310(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars, 200.0); var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); - var MNCC_PDU mncc; var MgcpCommand mgcp_cmd; + var PDU_BSSAP bssap; + timer T310; + f_init_handler(pars); + + /* Initiate a MT call, establish connection */ f_mt_call_start(cpars); /* MS->MSC: CALL CONFIRMED */ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CALL_CONF(cpars.transaction_id))); MNCC.receive(tr_MNCC_CALL_CONF_ind(cpars.mncc_callref)); - MGCP.receive(tr_CRCX) -> value mgcp_cmd; - cpars.mgcp_call_id := f_MgcpCmd_extract_call_id(mgcp_cmd); - cpars.mgcp_ep := mgcp_cmd.line.ep; - /* FIXME: Respond to CRCX */ + /* NOTE: MSC is expected to start T310 here */ - /* old libosmocore T310 default timeout is 180s. so let's wait 190 */ - timer T := 190.0; - T.start; + /* MSC->MGW: CRCX (first) */ + MGCP.receive(tr_CRCX) -> value mgcp_cmd; + f_handle_crcx(cpars, mgcp_cmd); /* MSC<-MGW: OK */ + + /* BSC->BSC: BSSMAP ASSIGNMENT REQ */ + BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, ?)) -> value bssap; + BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, + aoip := f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip, cpars.bss_rtp_port), + speechCodec := ts_BSSMAP_IE_SpeechCodec({ ts_CodecFR }))); + + /* MSC->MGW: MDCX */ + MGCP.receive(tr_MDCX) -> value mgcp_cmd; + MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, + sdp := omit)); + + /* MSC->MGW: CRCX (second) */ + MGCP.receive(tr_CRCX) -> value mgcp_cmd; + f_handle_crcx(cpars, mgcp_cmd); /* MSC<-MGW: OK */ + MNCC.receive(tr_MNCC_RTP_CREATE(cpars.mncc_callref)); + + /* Reschedule the guard timeout */ + g_Tguard.start(30.0 + 10.0); + + /* NOTE: the BSC is expected to respond with CC ALERTING at this state, so + * the MSC would stop T310. However, the idea is to verify T310 expiration + * here, so grab some popcorn and wait for MNCC DISC.ind. */ + T310.start(30.0 + 2.0); alt { - [] T.timeout { - setverdict(fail, "Timeout waiting for T310"); + [] T310.timeout { + setverdict(fail, "Timeout waiting for MNCC DISC.ind due to T310"); mtc.stop; } [] MNCC.receive(tr_MNCC_DISC_ind(cpars.mncc_callref)) { MNCC.send(ts_MNCC_REL_req(cpars.mncc_callref, valueof(ts_MNCC_cause(23)))); + log("Rx MNCC DISC.ind, T310.read yelds ", T310.read); + setverdict(pass); } } + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_DISC(cpars.transaction_id))); BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))); - /* FIXME: We're sending this with TIflag 0: allocated by sender, which is wrong */ - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id))); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id, '1'B))); alt { [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd { MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id)); - f_create_mgcp_delete_ep(cpars.mgcp_ep); + // FIXME: f_create_mgcp_delete_ep(cpars.mgcp_ep); repeat; } [] as_clear_cmd_compl_disc(); @@ -6342,7 +6368,7 @@ execute( TC_mo_crcx_ran_reject() ); execute( TC_mt_crcx_ran_reject() ); execute( TC_mo_setup_and_dtmf_dup() ); - //execute( TC_mt_t310() ); + execute( TC_mt_t310() ); execute( TC_gsup_cancel() ); execute( TC_lu_imsi_auth_tmsi_encr_1_13() ); execute( TC_lu_imsi_auth_tmsi_encr_3_13() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 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: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Gerrit-Change-Number: 22716 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:18:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:18:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 ) Change subject: msc: test reaction on Clear Request during a MO/MT Call ...................................................................... msc: test reaction on Clear Request during a MO/MT Call Change-Id: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Related: SYS#5340 --- M msc/MSC_Tests.ttcn 1 file changed, 62 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 206effa..6bad9c3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -935,6 +935,66 @@ vc_conn.done; } +/* Test reaction on Clear Request during a MO Call */ +friend function f_TC_mo_mt_call_clear_request(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var CallParameters cpars := valueof(t_CallParams); + var MNCC_PDU mncc_pdu; + timer T := 2.0; + + f_init_handler(pars); + + f_perform_lu(); + + /* HACK: reducing code duplication ('66'H - MO, '68'H - MT) */ + if (pars.imsi == '262420002532766'H) + { f_mo_call_establish(cpars); } + else + { f_mt_call_establish(cpars); } + + /* Hold the line for a while... */ + f_sleep(2.0); + + /* BSC sends BSSMAP Clear Request (e.g. due to RR failure) */ + BSSAP.send(ts_BSSMAP_ClearRequest(1)); + + /* Expect (optional) CC RELEASE and Clear Command */ + var default ccrel := activate(as_optional_cc_rel(cpars)); + f_expect_clear(); + deactivate(ccrel); + + /* Expect RELease indication on the MNCC socket */ + T.start; + alt { + [] MNCC.receive(tr_MNCC_REL_ind(cpars.mncc_callref)) -> value mncc_pdu { + log("Rx MNCC REL.ind, cause := ", mncc_pdu.u.signal.cause); + setverdict(pass); + } + [] MNCC.receive(MNCC_PDU:?) -> value mncc_pdu { + setverdict(fail, "Rx unexpected MNCC PDU: ", mncc_pdu); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for MNCC REL.ind"); + } + } +} +testcase TC_mo_call_clear_request() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_TC_mo_mt_call_clear_request), 2532766); // '66'H - MO + vc_conn.done; +} +testcase TC_mt_call_clear_request() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_start_handler(refers(f_TC_mo_mt_call_clear_request), 2532768); // '68'H - MT + vc_conn.done; +} + /* Test LU but BSC will send a clear request in the middle */ friend function f_tc_lu_disconnect(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); @@ -6345,6 +6405,8 @@ execute( TC_lu_auth_sai_timeout() ); execute( TC_lu_auth_sai_err() ); execute( TC_lu_clear_request() ); + execute( TC_mo_call_clear_request() ); + execute( TC_mt_call_clear_request() ); execute( TC_lu_disconnect() ); execute( TC_lu_by_imei() ); execute( TC_lu_by_tmsi_noauth_unknown() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 20:21:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 8 Feb 2021 20:21:25 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer:Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer:Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 4: The libosmocore change-id has been merged 4 days ago, but this one still fails. gb_proxy_peer.c:215:11: error: ?struct gbproxy_cell? has no member named ?id? if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { ^~ gb_proxy_peer.c:215:30: error: implicit declaration of function ?gsm48_compare_ra? [-Werror=implicit-function-declaration] if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { ^~~~~~~~~~~~~~~~ gb_proxy_peer.c:215:52: error: ?struct gbproxy_cell? has no member named ?id? if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { ^~ -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 20:21:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 21:01:24 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Mon, 8 Feb 2021 21:01:24 +0000 Subject: Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 to look at the new patch set (#4). Change subject: enb,epc,ms: refactor KPI API ...................................................................... enb,epc,ms: refactor KPI API we previously mixed component specific and component agnostic APIs (stdout vs. log file for example) for setting and retrieving KPI. This patch propose to use a single abstract get_kpis() method for all components that can be enriched with component-specific stuff as desired. In the case of srsLTE blocks, the main implementation will remain in srslte_common() and is shared among srsENB/srsUE/srsEPC. The KPI analyzer in srslte_common() extract and also manages all three KPI sources (log, csv and stdout) independently. In addition to the get_kpis() method that always returns a flat dictionary, it also exposes get_kpi_tree() that return a dict of KPI dicts that will be used for the Junit.xml generation. Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/epc.py M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/epc_srs.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 8 files changed, 53 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/00/22600/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 8 21:44:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 8 Feb 2021 21:44:10 +0000 Subject: Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: enb,epc,ms: refactor KPI API ...................................................................... Patch Set 4: Code-Review+2 thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 21:44:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 9 02:12:45 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 09 Feb 2021 02:12:45 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6021efb7c1246_34d62ab3609cc5f0307416@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 171s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 171s] [COMPILING libboard/qmod/source/card_pres.c] [ 171s] [COMPILING libboard/qmod/source/wwan_led.c] [ 171s] [COMPILING libboard/qmod/source/i2c.c] [ 171s] [COMPILING libboard/qmod/source/board_qmod.c] [ 171s] [COMPILING apps/dfu/main.c] [ 171s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 172s] Memory region Used Size Region Size %age Used [ 172s] rom: 16588 B 16 KB 101.25% [ 172s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 172s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 172s] collect2: error: ld returned 1 exit status [ 172s] % [ 172s] make[2]: *** [Makefile:234: flash] Error 1 [ 172s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 172s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] dh_auto_build: error: make -j1 returned exit code 2 [ 172s] make: *** [debian/rules:16: build] Error 25 [ 172s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 172s] ### VM INTERACTION START ### [ 175s] [ 160.243393] sysrq: Power Off [ 175s] [ 160.249197] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb07 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 9 02:12:33 UTC 2021. [ 175s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 9 02:42:11 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 09 Feb 2021 02:42:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6021f68b2d7f3_34d62ab3609cc5f03142fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 121s] [COMPILING apps/dfu/main.c] [ 121s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 121s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 121s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 121s] Memory region Used Size Region Size %age Used [ 121s] rom: 16580 B 16 KB 101.20% [ 121s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 122s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 122s] collect2: error: ld returned 1 exit status [ 122s] % [ 122s] make[2]: *** [Makefile:234: flash] Error 1 [ 122s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 122s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 122s] dh_auto_build: error: make -j1 returned exit code 2 [ 122s] make: *** [debian/rules:16: build] Error 25 [ 122s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 122s] ### VM INTERACTION START ### [ 125s] [ 105.250980] sysrq: Power Off [ 125s] [ 105.258451] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] goat11 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 9 02:41:56 UTC 2021. [ 125s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:29:34 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 11:29:34 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Adjust to osmo-gbproxy split from osmo-sgsn Related: OS#4992 Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 --- A recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc A recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 3 files changed, 28 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/91/22791/1 diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc new file mode 100644 index 0000000..39071c3 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Osmocom's Gb interface aggregation/conversion proxy" +HOMEPAGE = "https://osmocom.org/projects/osmo-gbproxy" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "c-ares libosmocore" + +INC_PR="r1.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" + +CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb new file mode 100644 index 0000000..12bf4ed --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "${AUTOREV}" +SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=git" +PV = "0.0.1+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 57ab845..1f6fd7a 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -16,25 +16,17 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" +PACKAGES =+ "osmo-gtphub-doc osmo-gtphub" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" -SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -FILES_osmo-gbproxy = " \ - ${bindir}/osmo-gbproxy \ - ${sysconfdir}/osmocom/osmo-gbproxy.cfg \ - " -CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" - FILES_osmo-gtphub = " \ ${bindir}/osmo-gtphub \ ${sysconfdir}/osmocom/osmo-gtphub.cfg \ " CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg" -FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy " FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub " -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:30:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 11:30:55 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/6/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/6/src/gb_proxy.c at 674 PS6, Line 674: memcpy(&bvc->cell->id.raid, &bvc->id.raid, sizeof(bvc->cell->id.raid)); > Shouldn't we use ra_id here and also copy ra_id to bvc->id.raid in the beginning of the function? [?] The current version also uses the value from bvc->cell, I think we should keep everything equivalent in this patch to avoid running into unexpected behavior changes again. I can not say if the parameter ra_id should be used here. I do not know the project well enough to estimate the behavior change. If you still want to have this changed, lets do this after we are through with the RIM integration. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 6 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 09 Feb 2021 11:30:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:30:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 11:30:56 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Patch Set 1: Verified+1 Verified that it builds with 201705-testbranch. -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 11:30:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:42:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 11:42:51 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/meta-telephony/+/22791/1/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc File recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc: https://gerrit.osmocom.org/c/meta-telephony/+/22791/1/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc at 6 PS1, Line 6: DEPENDS = "c-ares libosmocore" It looks like it shouldn't depend on gbproxy, that's a leftover from osmo-sgsn, we probably need to fix that in master. https://gerrit.osmocom.org/c/meta-telephony/+/22791/1/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc at 8 PS1, Line 8: INC_PR="r1.${META_TELEPHONY_OSMO_INC}" r0 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 11:42:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:58:15 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 11:58:15 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#5) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer: Add Function to get gbproxy cell by cell id ...................................................................... gb_proxy_peer: Add Function to get gbproxy cell by cell id Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy_peer.c 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/52/22652/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:59:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 11:59:51 +0000 Subject: Change in osmo-gbproxy[master]: Drop c-ares references References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 ) Change subject: Drop c-ares references ...................................................................... Drop c-ares references Those are leftovers from osmo-sgsn.git Change-Id: I2fabaa0d70d8675ba440d2bba6881a4cb0006861 --- M debian/control M debian/copyright M tests/atlocal.in M tests/sndcp_xid/Makefile.am 4 files changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/92/22792/1 diff --git a/debian/control b/debian/control index dd70480..520b4e9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ libtool, pkg-config, libtalloc-dev, - libc-ares-dev, libosmocore-dev (>= 1.4.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 diff --git a/debian/copyright b/debian/copyright index 66e36b9..b92bb2f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -84,7 +84,6 @@ src/gprs/crc24.c src/gprs/gprs_gb_parse.c src/gprs/gprs_utils.c - src/gprs/sgsn_ares.c src/gbproxy/gb_proxy.c src/gbproxy/gb_proxy_main.c src/gbproxy/gb_proxy_peer.c @@ -137,8 +136,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Files: src/gtphub/gtphub_ares.c - src/gtphub/gtphub_sock.c +Files: src/gtphub/gtphub_sock.c tests/gbproxy/gbproxy_test.c Copyright: 2013 Jacob Erlbeck 2013 sysmocom s.f.m.c. GmbH diff --git a/tests/atlocal.in b/tests/atlocal.in index c854487..e69de29 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,3 +0,0 @@ -enable_sgsn_test='@found_libgtp_and_libcares@' -enable_oap_test='@found_libgtp_and_libcares@' -enable_gtphub_test='@found_libgtp_and_libcares@' diff --git a/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am index 24626b3..dad41ea 100644 --- a/tests/sndcp_xid/Makefile.am +++ b/tests/sndcp_xid/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBCARES_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) EXTRA_DIST = sndcp_xid_test.ok @@ -13,8 +13,5 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOGB_LIBS) \ - $(LIBCARES_LIBS) \ $(LIBGTP_LIBS) \ -lrt -lm - - -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I2fabaa0d70d8675ba440d2bba6881a4cb0006861 Gerrit-Change-Number: 22792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 11:59:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 11:59:52 +0000 Subject: Change in osmo-gbproxy[master]: debian/copyright: Drop osmo-sgsn.git leftover files from list References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 ) Change subject: debian/copyright: Drop osmo-sgsn.git leftover files from list ...................................................................... debian/copyright: Drop osmo-sgsn.git leftover files from list Change-Id: Ia8630332a953b6bc3af80b6e0243c4edcfbd30b6 --- M debian/copyright 1 file changed, 5 insertions(+), 187 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/93/22793/1 diff --git a/debian/copyright b/debian/copyright index b92bb2f..8bdbc5d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,105 +16,32 @@ contrib/gprs/gprs-buffer-count.lua contrib/gprs/gprs-split-trace-by-tlli.lua contrib/gprs/gprs-verify-nu.lua - contrib/ipa.py contrib/jenkins.sh - contrib/soap.py contrib/systemd/osmo-gbproxy.service - contrib/systemd/osmo-sgsn.service - contrib/twisted_ipa.py doc/Makefile.am doc/examples/Makefile.am doc/examples/osmo-gbproxy/osmo-gbproxy.cfg - doc/examples/osmo-gtphub/gtphub-example.txt - doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg - doc/examples/osmo-gtphub/osmo-gtphub.cfg - doc/examples/osmo-sgsn/osmo-sgsn.cfg include/Makefile.am include/osmocom/sgsn/Makefile.am - include/osmocom/sgsn/common.h - include/osmocom/sgsn/crc24.h - include/osmocom/sgsn/debug.h include/osmocom/sgsn/gb_proxy.h - include/osmocom/sgsn/gprs_gb_parse.h - include/osmocom/sgsn/gprs_gmm.h - include/osmocom/sgsn/gprs_llc.h - include/osmocom/sgsn/gprs_sgsn.h - include/osmocom/sgsn/gprs_sndcp.h - include/osmocom/sgsn/gprs_subscriber.h - include/osmocom/sgsn/sgsn.h - include/osmocom/sgsn/vty.h m4/README src/Makefile.am src/gprs/.gitignore src/gprs/Makefile.am - src/gprs/osmo_sgsn.cfg tests/Makefile.am tests/atlocal.in - tests/gbproxy/Makefile.am - tests/gbproxy/gbproxy_test.ok - tests/gprs/Makefile.am - tests/gprs/gprs_test.c - tests/gprs/gprs_test.ok - tests/gtphub/Makefile.am - tests/gtphub/gtphub_test.ok - tests/sgsn/Makefile.am - tests/sgsn/sgsn_test.ok - tests/slhc/Makefile.am - tests/slhc/slhc_test.ok tests/sndcp_xid/Makefile.am tests/sndcp_xid/sndcp_xid_test.ok tests/testsuite.at - tests/v42bis/Makefile.am - tests/v42bis/v42bis_test.ok - tests/xid/Makefile.am - tests/xid/xid_test.ok Copyright: __NO_COPYRIGHT_NOR_LICENSE__ License: __NO_COPYRIGHT_NOR_LICENSE__ -Files: include/osmocom/sgsn/a_reset.h - include/osmocom/sgsn/gprs_llc_xid.h - include/osmocom/sgsn/gprs_sndcp_comp.h - include/osmocom/sgsn/gprs_sndcp_dcomp.h - include/osmocom/sgsn/gprs_sndcp_pcomp.h - include/osmocom/sgsn/gprs_sndcp_xid.h - include/osmocom/sgsn/gprs_utils.h - include/osmocom/sgsn/gtphub.h - include/osmocom/sgsn/signal.h - src/gprs/gprs_llc_parse.c - src/gprs/crc24.c - src/gprs/gprs_gb_parse.c - src/gprs/gprs_utils.c - src/gbproxy/gb_proxy.c - src/gbproxy/gb_proxy_main.c - src/gbproxy/gb_proxy_peer.c - src/gbproxy/gb_proxy_vty.c - src/gtphub/gtphub.c - src/gtphub/gtphub_main.c - src/gtphub/gtphub_vty.c - src/sgsn/gprs_gmm.c - src/sgsn/gprs_llc.c - src/sgsn/gprs_llc_vty.c - src/sgsn/gprs_llc_xid.c - src/sgsn/gprs_sgsn.c - src/sgsn/gprs_sndcp.c - src/sgsn/gprs_sndcp_comp.c - src/sgsn/gprs_sndcp_dcomp.c - src/sgsn/gprs_sndcp_pcomp.c - src/sgsn/gprs_sndcp_vty.c - src/sgsn/gprs_sndcp_xid.c - src/sgsn/gprs_subscriber.c - src/sgsn/sgsn_auth.c - src/sgsn/sgsn_cdr.c - src/sgsn/sgsn_ctrl.c - src/sgsn/sgsn_libgtp.c - src/sgsn/sgsn_main.c - src/sgsn/sgsn_vty.c - tests/gtphub/gtphub_test.c - tests/sgsn/sgsn_test.c - tests/slhc/slhc_test.c +Files: + src/gb_proxy.c + src/gb_proxy_main.c + src/gb_proxy_peer.c + src/gb_proxy_vty.c tests/sndcp_xid/sndcp_xid_test.c - tests/v42bis/v42bis_test.c - tests/xid/xid_test.c Copyright: 2008-2015 Holger Hans Peter Freyther 2008-2016 Harald Welte 2009-2015 Holger Hans Peter Freyther @@ -136,36 +63,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Files: src/gtphub/gtphub_sock.c - tests/gbproxy/gbproxy_test.c -Copyright: 2013 Jacob Erlbeck - 2013 sysmocom s.f.m.c. GmbH - 2014 Holger Hans Peter Freyther - 2015 sysmocom s.f.m.c. GmbH -License: __NO_LICENSE__ - -Files: include/osmocom/sgsn/v42bis.h - include/osmocom/sgsn/v42bis_private.h -Copyright: 2005-2011 Steve Underwood -License: LGPL-2.1 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version 2.1, - as published by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - The FSF address in the above text is the old one. - . - On Debian systems, the complete text of the GNU Lesser General Public License - Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. - Files: osmoappdesc.py tests/ctrl_test_runner.py tests/vty_test_runner.py @@ -228,85 +125,6 @@ On Debian systems, the complete text of the GNU General Public License Version 3 can be found in `/usr/share/common-licenses/GPL-3'. -Files: src/gprs/v42bis.c -Copyright: 2005-2011 Steve Underwood -License: LGPL-2.1 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version 2.1, - as published by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - THIS IS A WORK IN PROGRESS. IT IS NOT FINISHED. - Currently it performs the core compression and decompression functions OK. - However, a number of the bells and whistles in V.42bis are incomplete. - . - ! \file - . - The FSF address in the above text is the old one. - . - On Debian systems, the complete text of the GNU Lesser General Public License - Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. - -Files: include/osmocom/sgsn/slhc.h -Copyright: 1989 Regents of the University of California. -License: __UNKNOWN__ - Redistribution and use in source and binary forms are permitted - provided that the above copyright notice and this paragraph are - duplicated in all such forms and that any documentation, - advertising materials, and other materials related to such - distribution and use acknowledge that the software was developed - by the University of California, Berkeley. The name of the - University may not be used to endorse or promote products derived - from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - . - Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989: - - Initial distribution. - . - modified for KA9Q Internet Software Package by - Katie Stevens (dkstevens at ucdavis.edu) - University of California, Davis - Computing Services - - 01-31-90 initial adaptation - -Files: src/gprs/slhc.c -Copyright: 1989 Regents of the University of California. -License: __UNKNOWN__ - Redistribution and use in source and binary forms are permitted - provided that the above copyright notice and this paragraph are - duplicated in all such forms and that any documentation, - advertising materials, and other materials related to such - distribution and use acknowledge that the software was developed - by the University of California, Berkeley. The name of the - University may not be used to endorse or promote products derived - from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - . - Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989: - - Initial distribution. - . - modified for KA9Q Internet Software Package by - Katie Stevens (dkstevens at ucdavis.edu) - University of California, Davis - Computing Services - - 01-31-90 initial adaptation (from 1.19) - PPP.05 02-15-90 [ks] - PPP.08 05-02-90 [ks] use PPP protocol field to signal compression - PPP.15 09-90 [ks] improve mbuf handling - PPP.16 11-02 [karn] substantially rewritten to use NOS facilities - Files: m4/ax_check_compile_flag.m4 Copyright: 2008 Guido U. Draheim 2011 Maarten Bosmans -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ia8630332a953b6bc3af80b6e0243c4edcfbd30b6 Gerrit-Change-Number: 22793 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:00:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 12:00:29 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Patch Set 1: c-ares was only required (errnously) on debian packages, so you should be fine building without it in OE in tag 0.0.1, see https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 12:00:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:03:16 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 12:03:16 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer: Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 5: > Patch Set 4: > > The libosmocore change-id has been merged 4 days ago, but this one still fails. > > gb_proxy_peer.c:215:11: error: ?struct gbproxy_cell? has no member named ?id? > if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { > ^~ > gb_proxy_peer.c:215:30: error: implicit declaration of function ?gsm48_compare_ra? [-Werror=implicit-function-declaration] > if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { > ^~~~~~~~~~~~~~~~ > gb_proxy_peer.c:215:52: error: ?struct gbproxy_cell? has no member named ?id? > if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { > ^~ This is strange. Now it builds fine against master. Maybe gsm48_compare_ra() was in a different patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 12:03:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:05:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 12:05:02 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer: Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 5: > Patch Set 5: > > > Patch Set 4: > > > > The libosmocore change-id has been merged 4 days ago, but this one still fails. > > > > gb_proxy_peer.c:215:11: error: ?struct gbproxy_cell? has no member named ?id? > > if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { > > ^~ > > gb_proxy_peer.c:215:30: error: implicit declaration of function ?gsm48_compare_ra? [-Werror=implicit-function-declaration] > > if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { > > ^~~~~~~~~~~~~~~~ > > gb_proxy_peer.c:215:52: error: ?struct gbproxy_cell? has no member named ?id? > > if (cell->id.cid == cid && gsm48_compare_ra(&cell->id.raid, raid) == 0) { > > ^~ > > This is strange. Now it builds fine against master. Maybe gsm48_compare_ra() was in a different patch. I see now: It was most likely an issue with renaming gsm48_compare_ra to gsm48_ra_equal. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 5 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 12:05:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:25:52 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 12:25:52 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#8) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... gb_proxy: simplify raid data storage Instead of storing the raw ra_id in its unparsed binary form, store it as a parsed struct. Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Related: OS#4894 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 25 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 8 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:32:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 12:32:55 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#9) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... gb_proxy: simplify raid data storage Instead of storing the raw ra_id in its unparsed binary form, store it as a parsed struct. Also store the cell-id on cell allocation for later use. Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Related: OS#4894 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 26 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/53/22653/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 9 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:38:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 12:38:01 +0000 Subject: Change in osmo-bsc[master]: Introduce VTY cmd to configure Alpha in SI13 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22794 ) Change subject: Introduce VTY cmd to configure Alpha in SI13 ...................................................................... Introduce VTY cmd to configure Alpha in SI13 Related: SYS#5358 Change-Id: I8b97ea11bad5fe05f2f634945b5703ee9abde81d --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/system_information.c 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/22794/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 6797d1c..9a226f5 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -391,6 +391,9 @@ bool active; /* CCN_ACTIVE */ bool forced_vty; /* set by VTY ? */ } ccn; /* TS 44.060 sec 8.8.2 */ + struct { + uint8_t alpha; /* ALPHA*10, units of 0.1, range <0-10> */ + } pwr_ctrl; /* TS 44.060 Table 12.9.1 */ } gprs; /* threshold (in percent) when BTS shall send CCCH LOAD IND */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9005aab..0388e8e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -761,6 +761,8 @@ if (bts->gprs.ccn.forced_vty) vty_out(vty, " gprs ccn-active %d%s", bts->gprs.ccn.active ? 1 : 0, VTY_NEWLINE); + vty_out(vty, " gprs power-control alpha %u%s", + bts->gprs.pwr_ctrl.alpha, VTY_NEWLINE); vty_out(vty, " gprs cell bvci %u%s", bts->gprs.cell.bvci, VTY_NEWLINE); for (i = 0; i < ARRAY_SIZE(bts->gprs.cell.timer); i++) @@ -3509,6 +3511,22 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_bts_gprs_pwr_ctrl_alpha, + cfg_bts_gprs_pwr_ctrl_alpha_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "gprs power-control alpha <0-10>", + GPRS_TEXT + "GPRS Global Power Control Parameters IE (SI13)\n" + "Set alpha\n" + "alpha for MS output power control in units of 0.1 (defaults to 0)\n") +{ + struct gsm_bts *bts = vty->index; + + bts->gprs.pwr_ctrl.alpha = atoi(argv[0]); + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_no_bts_gprs_ctrl_ack, cfg_no_bts_gprs_ctrl_ack_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), @@ -7682,6 +7700,7 @@ install_element(BTS_NODE, &cfg_bts_gprs_net_ctrl_ord_cmd); install_element(BTS_NODE, &cfg_bts_gprs_ctrl_ack_cmd); install_element(BTS_NODE, &cfg_bts_gprs_ccn_active_cmd); + install_element(BTS_NODE, &cfg_bts_gprs_pwr_ctrl_alpha_cmd); install_element(BTS_NODE, &cfg_no_bts_gprs_ctrl_ack_cmd); install_element(BTS_NODE, &cfg_bts_gprs_bvci_cmd); install_element(BTS_NODE, &cfg_bts_gprs_cell_timer_cmd); diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index d018ec3..094c35e 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1260,6 +1260,7 @@ bts->gprs.ccn.active : osmo_bts_has_feature(&bts->model->features, BTS_FEAT_CCN); + si13_default.pwr_ctrl_pars.alpha = bts->gprs.pwr_ctrl.alpha; ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_default); if (ret < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b97ea11bad5fe05f2f634945b5703ee9abde81d Gerrit-Change-Number: 22794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:39:34 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 12:39:34 +0000 Subject: Change in osmo-gbproxy[master]: Drop c-ares references In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 ) Change subject: Drop c-ares references ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I2fabaa0d70d8675ba440d2bba6881a4cb0006861 Gerrit-Change-Number: 22792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 09 Feb 2021 12:39:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:45:34 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 12:45:34 +0000 Subject: Change in osmo-gbproxy[master]: debian/copyright: Drop osmo-sgsn.git leftover files from list In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 ) Change subject: debian/copyright: Drop osmo-sgsn.git leftover files from list ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ia8630332a953b6bc3af80b6e0243c4edcfbd30b6 Gerrit-Change-Number: 22793 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 09 Feb 2021 12:45:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:46:52 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 12:46:52 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 to look at the new patch set (#2). Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Adjust to osmo-gbproxy split from osmo-sgsn Related: OS#4992 Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 --- A recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc A recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 3 files changed, 28 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/91/22791/2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 12:47:22 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 12:47:22 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 12:47:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 13:07:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 13:07:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22742 to look at the new patch set (#7). Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failed. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Related: OS#5355 Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 90 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/22742/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 13:09:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 13:09:05 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 13:09:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 13:10:22 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 13:10:22 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 13:10:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 13:21:40 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 13:21:40 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22742/6/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22742/6/src/gb/gprs_ns2_sns.c at a95 PS6, Line 95: { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" }, > value_string for new event missing. [?] I've created a ticket for this. https://osmocom.org/issues/5014 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 13:21:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 13:41:37 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 13:41:37 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... Patch Set 9: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/6/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653/6/src/gb_proxy.c at 674 PS6, Line 674: memcpy(&bvc->cell->id.raid, &bvc->id.raid, sizeof(bvc->cell->id.raid)); > The current version also uses the value from bvc->cell, I think we should keep everything equivalent [?] Ok, let's get this merged then and deal with it when we consolidate bvc and cell raid -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 9 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 09 Feb 2021 13:41:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 13:58:10 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 13:58:10 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer: Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 7 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 13:58:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 14:49:19 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 14:49:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 to look at the new patch set (#3). Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... pcu: move generic RAW_NS_CT function to library/RAW_NS Allow the NS tests to use the SNS functions. Change-Id: I6c404475f39dd00023eb11e98da93ee423604039 --- M library/RAW_NS.ttcnpp M pcu/PCU_Tests_SNS.ttcn 2 files changed, 184 insertions(+), 184 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/22657/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 14:54:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 9 Feb 2021 14:54:15 +0000 Subject: Change in meta-telephony[laforge/nightly]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/22791 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Adjust to osmo-gbproxy split from osmo-sgsn Related: OS#4992 Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 --- A recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc A recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 3 files changed, 28 insertions(+), 10 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, approved diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc new file mode 100644 index 0000000..1add0b9 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Osmocom's Gb interface aggregation/conversion proxy" +HOMEPAGE = "https://osmocom.org/projects/osmo-gbproxy" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" + +CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb new file mode 100644 index 0000000..12bf4ed --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "${AUTOREV}" +SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=git" +PV = "0.0.1+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 57ab845..1f6fd7a 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -16,25 +16,17 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" +PACKAGES =+ "osmo-gtphub-doc osmo-gtphub" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" -SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -FILES_osmo-gbproxy = " \ - ${bindir}/osmo-gbproxy \ - ${sysconfdir}/osmocom/osmo-gbproxy.cfg \ - " -CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" - FILES_osmo-gtphub = " \ ${bindir}/osmo-gtphub \ ${sysconfdir}/osmocom/osmo-gtphub.cfg \ " CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg" -FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy " FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub " -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/22791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 22791 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:08:16 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 15:08:16 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 to look at the new patch set (#2). Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc pass raid and cell id directly as parameter to gbproxy_cell_alloc so that we do not need to fill tas parameter to gbproxy_cell_alloc so that we do not need to fill the struct members later. Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/71/22671/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:11:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 15:11:00 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/2/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/2/src/gb_proxy.c at 671 PS2, Line 671: Do we use bvc->raid or the raid from the parameter list here? The old version of this patch used raid from the parameter list but I have changed it to bvc->raid to keep the behavior equivalent to the current state (master) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:11:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:38:29 2021 From: gerrit-no-reply at lists.osmocom.org (srs_andre) Date: Tue, 9 Feb 2021 15:38:29 +0000 Subject: Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 to look at the new patch set (#5). Change subject: enb,epc,ms: refactor KPI API ...................................................................... enb,epc,ms: refactor KPI API we previously mixed component specific and component agnostic APIs (stdout vs. log file for example) for setting and retrieving KPI. This patch propose to use a single abstract get_kpis() method for all components that can be enriched with component-specific stuff as desired. In the case of srsLTE blocks, the main implementation will remain in srslte_common() and is shared among srsENB/srsUE/srsEPC. The KPI analyzer in srslte_common() extract and also manages all three KPI sources (log, csv and stdout) independently. In addition to the get_kpis() method that always returns a flat dictionary, it also exposes get_kpi_tree() that return a dict of KPI dicts that will be used for the Junit.xml generation. Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/epc.py M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/epc_srs.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 8 files changed, 56 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/00/22600/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 5 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:40:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:40:46 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:40:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:41:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:41:29 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22743/6/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22743/6/src/gb/gprs_ns2_sns.c at 1376 PS6, Line 1376: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); > might be nice to ahve the log lines differ from the case above, so that the log indicates something [?] I didn't see any change? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:41:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:41:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:41:59 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:41:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:42:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:42:02 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22742 ) Change subject: gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state ...................................................................... gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state The SNS must know when all NS-VC have failed. Further more there might be a corner case when the SNS configuration succeeds but no NS-VC comes up afterwards. Related: OS#5355 Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c 3 files changed, 90 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index de27fb4..ca47934 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -577,7 +577,7 @@ ns2_nse_notify_unblocked(nsvc, false); /* check if sns is using this VC */ - ns2_sns_free_nsvc(nsvc); + ns2_sns_replace_nsvc(nsvc); osmo_fsm_inst_term(nsvc->fi, OSMO_FSM_TERM_REQUEST, NULL); /* let the driver/bind clean up it's internal state */ @@ -1175,6 +1175,7 @@ { struct gprs_ns2_nse *nse = nsvc->nse; + ns2_sns_notify_alive(nse, nsvc, unblocked); ns2_nse_data_sum(nse); if (unblocked == nse->alive) diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 6462907..ff95c81 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -350,7 +350,8 @@ int ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp); struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, const char *id); -void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc); +void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc); +void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive); /* vc */ struct osmo_fsm_inst *ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc, diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 427a153..b80a880 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -80,6 +80,7 @@ GPRS_SNS_EV_DELETE, GPRS_SNS_EV_CHANGE_WEIGHT, GPRS_SNS_EV_NO_NSVC, + GPRS_SNS_EV_NSVC_ALIVE, /*!< a NS-VC became alive */ }; static const struct value_string gprs_sns_event_names[] = { @@ -93,6 +94,7 @@ { GPRS_SNS_EV_DELETE, "DELETE" }, { GPRS_SNS_EV_CHANGE_WEIGHT, "CHANGE_WEIGHT" }, { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" }, + { GPRS_SNS_EV_NSVC_ALIVE, "NSVC_ALIVE"}, { 0, NULL } }; @@ -122,6 +124,8 @@ int bind_offset; /* timer N */ int N; + /* true if at least one nsvc is alive */ + bool alive; /* local configuration to send to the remote end */ struct gprs_ns_ie_ip4_elem *ip4_local; @@ -227,13 +231,13 @@ return &gss->initial->saddr; } -/*! called when a nsvc is beeing freed */ -void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc) +/*! called when a nsvc is beeing freed or the nsvc became dead */ +void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc) { - struct gprs_ns2_nse *nse; + struct gprs_ns2_nse *nse = nsvc->nse; struct gprs_ns2_vc *tmp; + struct osmo_fsm_inst *fi = nse->bss_sns_fi; struct ns2_sns_state *gss; - struct osmo_fsm_inst *fi = nsvc->nse->bss_sns_fi; if (!fi) return; @@ -242,17 +246,26 @@ if (nsvc != gss->sns_nsvc) return; - nse = nsvc->nse; - if (nse->alive) { - /* choose a different sns nsvc */ + gss->sns_nsvc = NULL; + if (gss->alive) { llist_for_each_entry(tmp, &nse->nsvc, list) { - if (ns2_vc_is_unblocked(tmp)) + if (ns2_vc_is_unblocked(tmp)) { gss->sns_nsvc = tmp; + return; + } } } else { - gss->sns_nsvc = NULL; - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL); + /* the SNS is waiting for its first NS-VC to come up + * choose any other nsvc */ + llist_for_each_entry(tmp, &nse->nsvc, list) { + if (nsvc != tmp) { + gss->sns_nsvc = tmp; + return; + } + } } + + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL); } static void ns2_clear_ipv46_entries(struct ns2_sns_state *gss) @@ -715,6 +728,7 @@ if (old_state != GPRS_SNS_ST_UNCONFIGURED) ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE); + gss->alive = false; ns2_clear_ipv46_entries(gss); /* no initial available */ @@ -873,6 +887,18 @@ } } +/* calculate the timeout of the configured state. the configured + * state will fail if not at least one NS-VC is alive within X second. + */ +static inline int ns_sns_configured_timeout(struct osmo_fsm_inst *fi) +{ + int secs; + struct gprs_ns2_inst *nsi = nse_inst_from_fi(fi)->nsi; + secs = nsi->timeout[NS_TOUT_TNS_ALIVE] * nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]; + secs += nsi->timeout[NS_TOUT_TNS_TEST]; + + return secs; +} static void ns_sns_st_config_sgsn_ip4(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -917,7 +943,7 @@ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); /* start the test procedure on ALL NSVCs! */ gprs_ns2_start_alive_all_nsvcs(nse); - osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 3); } else { /* just send CONFIG-ACK */ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); @@ -1259,6 +1285,9 @@ case GPRS_SNS_EV_CHANGE_WEIGHT: ns2_sns_st_configured_change(fi, gss, tp); break; + case GPRS_SNS_EV_NSVC_ALIVE: + osmo_timer_del(&fi->timer); + break; } } @@ -1307,7 +1336,8 @@ [GPRS_SNS_ST_CONFIGURED] = { .in_event_mask = S(GPRS_SNS_EV_ADD) | S(GPRS_SNS_EV_DELETE) | - S(GPRS_SNS_EV_CHANGE_WEIGHT), + S(GPRS_SNS_EV_CHANGE_WEIGHT) | + S(GPRS_SNS_EV_NSVC_ALIVE), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_SIZE), .name = "CONFIGURED", @@ -1340,6 +1370,10 @@ osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2); } break; + case 3: + LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + break; } return 0; } @@ -1709,6 +1743,46 @@ return count; } +void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive) +{ + struct ns2_sns_state *gss; + struct gprs_ns2_vc *tmp; + + if (!nse->bss_sns_fi) + return; + + gss = nse->bss_sns_fi->priv; + if(nse->bss_sns_fi->state != GPRS_SNS_ST_CONFIGURED) + return; + + if (alive == gss->alive) + return; + + /* check if this is the current SNS NS-VC */ + if (nsvc == gss->sns_nsvc) { + /* only replace the SNS NS-VC if there are other alive NS-VC. + * There aren't any other alive NS-VC when the SNS fsm just reached CONFIGURED + * and couldn't confirm yet if the NS-VC comes up */ + if (gss->alive && !alive) + ns2_sns_replace_nsvc(nsvc); + } + + if (alive) { + gss->alive = true; + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NSVC_ALIVE, NULL); + } else { + /* is there at least another alive nsvc? */ + llist_for_each_entry(tmp, &nse->nsvc, list) { + if (ns2_vc_is_unblocked(tmp)) + return; + } + + /* all NS-VC have failed */ + gss->alive = false; + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NO_NSVC, NULL); + } +} + /* initialize osmo_ctx on main tread */ static __attribute__((constructor)) void on_dso_load_ctx(void) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie72da9adeefe0c2850d49a9208b2d0a4556f9101 Gerrit-Change-Number: 22742 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:42:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:42:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:42:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:43:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:43:25 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 9 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:43:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:43:31 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 9 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:43:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:44:29 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer: Add Function to get gbproxy cell by cell id ...................................................................... Patch Set 7: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/7/src/gb_proxy_peer.c File src/gb_proxy_peer.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652/7/src/gb_proxy_peer.c at 216 PS7, Line 216: return cell; should we maybe also check that the cell_id is unique when adding a cell? (Not in this patch ,but a further/follow-up)? -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 7 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:44:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:44:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:44:45 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: simplify raid data storage In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 ) Change subject: gb_proxy: simplify raid data storage ...................................................................... gb_proxy: simplify raid data storage Instead of storing the raw ra_id in its unparsed binary form, store it as a parsed struct. Also store the cell-id on cell allocation for later use. Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Related: OS#4894 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_ctrl.c M src/gb_proxy_vty.c 4 files changed, 26 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index d988cae..269b851 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -110,8 +111,13 @@ /* BVCI of PTP BVCs associated to this cell */ uint16_t bvci; - /* Routing Area that this BVC is part of (raw 04.08 encoding) */ - uint8_t ra[6]; + struct { + /* Routing Area that this cell is part of */ + struct gprs_ra_id raid; + + /* Cell ID of this cell */ + uint16_t cid; + } id; /* pointer to the BSS-side BVC */ struct gbproxy_bvc *bss_bvc; @@ -131,8 +137,8 @@ /* PTP BVCI of this BVC */ uint16_t bvci; - /* Routing Area that this BVC is part of (raw 04.08 encoding) */ - uint8_t ra[6]; + /* Routing Area that this BVC is part of */ + struct gprs_ra_id raid; /* Counter */ struct rate_ctr_group *ctrg; diff --git a/src/gb_proxy.c b/src/gb_proxy.c index e8a78f2..12e685d 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -671,7 +671,8 @@ bvc->cell = gbproxy_cell_alloc(cfg, bvci); OSMO_ASSERT(bvc->cell); - memcpy(bvc->cell->ra, bvc->ra, sizeof(bvc->cell->ra)); + memcpy(&bvc->cell->id.raid, &bvc->raid, sizeof(bvc->cell->id.raid)); + bvc->cell->id.cid = cell_id; /* link us to the cell and vice-versa */ bvc->cell->bss_bvc = bvc; @@ -688,7 +689,7 @@ OSMO_ASSERT(sgsn_bvc); sgsn_bvc->cell = bvc->cell; - memcpy(sgsn_bvc->ra, bvc->cell->ra, sizeof(sgsn_bvc->ra)); + memcpy(&sgsn_bvc->raid, &bvc->cell->id.raid, sizeof(sgsn_bvc->raid)); sgsn_bvc->fi = bssgp_bvc_fsm_alloc_ptp_bss(sgsn_bvc, cfg->nsi, sgsn_nse->nsei, bvci, ra_id, cell_id); OSMO_ASSERT(sgsn_bvc->fi); @@ -878,8 +879,8 @@ * PDU, this means we can extend our local * state information about this particular cell * */ - memcpy(from_bvc->ra, TLVP_VAL(tp, BSSGP_IE_CELL_ID), sizeof(from_bvc->ra)); - gsm48_parse_ra(&raid, from_bvc->ra); + gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_CELL_ID)); + memcpy(&from_bvc->raid, &raid, sizeof(from_bvc->raid)); LOGPBVC(from_bvc, LOGL_INFO, "Cell ID %s\n", osmo_rai_name(&raid)); } } @@ -1053,11 +1054,13 @@ LOGPBVC(sgsn_bvc, LOGL_INFO, "Rx %s: routing by BVCI\n", pdut_name); return gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci); } else if (TLVP_PRES_LEN(tp, BSSGP_IE_ROUTEING_AREA, 6)) { + struct gprs_ra_id raid; errctr = GBPROX_GLOB_CTR_INV_RAI; + gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA)); /* iterate over all bvcs and dispatch the paging to each matching one */ hash_for_each(cfg->bss_nses, i, nse, list) { hash_for_each(nse->bvcs, j, bss_bvc, list) { - if (!memcmp(bss_bvc->ra, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA), 6)) { + if (gsm48_ra_equal(&bss_bvc->raid, &raid)) { LOGPNSE(nse, LOGL_INFO, "Rx %s: routing to NSE (RAI match)\n", pdut_name); gbprox_relay2peer(msg, bss_bvc, ns_bvci); @@ -1068,11 +1071,13 @@ } } } else if (TLVP_PRES_LEN(tp, BSSGP_IE_LOCATION_AREA, 5)) { + struct gsm48_ra_id lac; errctr = GBPROX_GLOB_CTR_INV_LAI; /* iterate over all bvcs and dispatch the paging to each matching one */ hash_for_each(cfg->bss_nses, i, nse, list) { hash_for_each(nse->bvcs, j, bss_bvc, list) { - if (!memcmp(bss_bvc->ra, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) { + gsm48_encode_ra(&lac, &bss_bvc->raid); + if (!memcmp(&lac, TLVP_VAL(tp, BSSGP_IE_LOCATION_AREA), 5)) { LOGPNSE(nse, LOGL_INFO, "Rx %s: routing to NSE (LAI match)\n", pdut_name); gbprox_relay2peer(msg, bss_bvc, ns_bvci); diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c index 10d3727..b6f01af 100644 --- a/src/gb_proxy_ctrl.c +++ b/src/gb_proxy_ctrl.c @@ -91,13 +91,12 @@ hash_for_each(cfg->bss_nses, i, nse_peer, list) { struct gbproxy_bvc *bvc; hash_for_each(nse_peer->bvcs, j, bvc, list) { - struct gprs_ra_id raid; - gsm48_parse_ra(&raid, bvc->ra); + struct gprs_ra_id *raid = &bvc->cell->id.raid; cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u-%u-%u-%u,%s\n", nse_peer->nsei, bvc->bvci, - raid.mcc, raid.mnc, - raid.lac, raid.rac, + raid->mcc, raid->mnc, + raid->lac, raid->rac, osmo_fsm_inst_state_name(bvc->fi)); } } diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index fd4692d..9dbde58 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -78,10 +78,8 @@ vty_out(vty, "NSEI %5u, SIG-BVCI %5u [%s]%s", bvc->nse->nsei, bvc->bvci, osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE); } else { - struct gprs_ra_id raid; - gsm48_parse_ra(&raid, bvc->ra); vty_out(vty, "NSEI %5u, PTP-BVCI %5u, RAI %s [%s]%s", bvc->nse->nsei, bvc->bvci, - osmo_rai_name(&raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE); + osmo_rai_name(&bvc->cell->id.raid), osmo_fsm_inst_state_name(bvc->fi), VTY_NEWLINE); } } @@ -100,12 +98,10 @@ static void gbproxy_vty_print_cell(struct vty *vty, struct gbproxy_cell *cell, bool show_stats) { - struct gprs_ra_id raid; - gsm48_parse_ra(&raid, cell->ra); unsigned int num_sgsn_bvc = 0; unsigned int i; - vty_out(vty, "BVCI %5u RAI %s: ", cell->bvci, osmo_rai_name(&raid)); + vty_out(vty, "BVCI %5u RAI %s CID %05u: ", cell->bvci, osmo_rai_name(&cell->id.raid), cell->id.cid); if (cell->bss_bvc) vty_out(vty, "BSS NSEI %5u, SGSN NSEI ", cell->bss_bvc->nse->nsei); else -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib58b9188e3ce4bd3fdadb03f158d56b29778387c Gerrit-Change-Number: 22653 Gerrit-PatchSet: 9 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:44:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:44:45 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Add Function to get gbproxy cell by cell id In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 ) Change subject: gb_proxy_peer: Add Function to get gbproxy cell by cell id ...................................................................... gb_proxy_peer: Add Function to get gbproxy cell by cell id Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy_peer.c 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 269b851..96b2bcc 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -270,6 +270,7 @@ struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci); struct gbproxy_cell *gbproxy_cell_by_bvci(struct gbproxy_config *cfg, uint16_t bvci); +struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid); void gbproxy_cell_free(struct gbproxy_cell *cell); bool gbproxy_cell_add_sgsn_bvc(struct gbproxy_cell *cell, struct gbproxy_bvc *bvc); diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index e276c85..8855a44 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -206,6 +206,19 @@ return cell; } +struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid) +{ + int i; + struct gbproxy_cell *cell; + + hash_for_each(cfg->cells, i, cell, list) { + if (cell->id.cid == cid && gsm48_ra_equal(&cell->id.raid, raid)) { + return cell; + } + } + return NULL; +} + void gbproxy_cell_free(struct gbproxy_cell *cell) { unsigned int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a Gerrit-Change-Number: 22652 Gerrit-PatchSet: 7 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:44:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:44:46 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22672 ) Change subject: gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new ...................................................................... gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new Change-Id: I43ec049540c10c8ded5a668229447ab1acb6c832 Related: SYS#5103 --- M src/gb_proxy_peer.c 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 8855a44..753355e 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -194,18 +194,6 @@ return NULL; } -struct gbproxy_cell *gbproxy_cell_by_bvci_or_new(struct gbproxy_config *cfg, uint16_t bvci) -{ - struct gbproxy_cell *cell; - OSMO_ASSERT(cfg); - - cell = gbproxy_cell_by_bvci(cfg, bvci); - if (!cell) - cell = gbproxy_cell_alloc(cfg, bvci); - - return cell; -} - struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid) { int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I43ec049540c10c8ded5a668229447ab1acb6c832 Gerrit-Change-Number: 22672 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:46:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:46:12 +0000 Subject: Change in osmo-gbproxy[master]: Drop c-ares references In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 ) Change subject: Drop c-ares references ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I2fabaa0d70d8675ba440d2bba6881a4cb0006861 Gerrit-Change-Number: 22792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 09 Feb 2021 15:46:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:46:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:46:22 +0000 Subject: Change in osmo-gbproxy[master]: debian/copyright: Drop osmo-sgsn.git leftover files from list In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 ) Change subject: debian/copyright: Drop osmo-sgsn.git leftover files from list ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ia8630332a953b6bc3af80b6e0243c4edcfbd30b6 Gerrit-Change-Number: 22793 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 09 Feb 2021 15:46:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:46:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:46:25 +0000 Subject: Change in osmo-gbproxy[master]: Drop c-ares references In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 ) Change subject: Drop c-ares references ...................................................................... Drop c-ares references Those are leftovers from osmo-sgsn.git Change-Id: I2fabaa0d70d8675ba440d2bba6881a4cb0006861 --- M debian/control M debian/copyright M tests/atlocal.in M tests/sndcp_xid/Makefile.am 4 files changed, 2 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/control b/debian/control index dd70480..520b4e9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ libtool, pkg-config, libtalloc-dev, - libc-ares-dev, libosmocore-dev (>= 1.4.0), osmo-gsm-manuals-dev Standards-Version: 3.9.8 diff --git a/debian/copyright b/debian/copyright index 66e36b9..b92bb2f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -84,7 +84,6 @@ src/gprs/crc24.c src/gprs/gprs_gb_parse.c src/gprs/gprs_utils.c - src/gprs/sgsn_ares.c src/gbproxy/gb_proxy.c src/gbproxy/gb_proxy_main.c src/gbproxy/gb_proxy_peer.c @@ -137,8 +136,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Files: src/gtphub/gtphub_ares.c - src/gtphub/gtphub_sock.c +Files: src/gtphub/gtphub_sock.c tests/gbproxy/gbproxy_test.c Copyright: 2013 Jacob Erlbeck 2013 sysmocom s.f.m.c. GmbH diff --git a/tests/atlocal.in b/tests/atlocal.in index c854487..e69de29 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,3 +0,0 @@ -enable_sgsn_test='@found_libgtp_and_libcares@' -enable_oap_test='@found_libgtp_and_libcares@' -enable_gtphub_test='@found_libgtp_and_libcares@' diff --git a/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am index 24626b3..dad41ea 100644 --- a/tests/sndcp_xid/Makefile.am +++ b/tests/sndcp_xid/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBCARES_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) EXTRA_DIST = sndcp_xid_test.ok @@ -13,8 +13,5 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOGB_LIBS) \ - $(LIBCARES_LIBS) \ $(LIBGTP_LIBS) \ -lrt -lm - - -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I2fabaa0d70d8675ba440d2bba6881a4cb0006861 Gerrit-Change-Number: 22792 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:46:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:46:25 +0000 Subject: Change in osmo-gbproxy[master]: debian/copyright: Drop osmo-sgsn.git leftover files from list In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 ) Change subject: debian/copyright: Drop osmo-sgsn.git leftover files from list ...................................................................... debian/copyright: Drop osmo-sgsn.git leftover files from list Change-Id: Ia8630332a953b6bc3af80b6e0243c4edcfbd30b6 --- M debian/copyright 1 file changed, 5 insertions(+), 187 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/copyright b/debian/copyright index b92bb2f..8bdbc5d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,105 +16,32 @@ contrib/gprs/gprs-buffer-count.lua contrib/gprs/gprs-split-trace-by-tlli.lua contrib/gprs/gprs-verify-nu.lua - contrib/ipa.py contrib/jenkins.sh - contrib/soap.py contrib/systemd/osmo-gbproxy.service - contrib/systemd/osmo-sgsn.service - contrib/twisted_ipa.py doc/Makefile.am doc/examples/Makefile.am doc/examples/osmo-gbproxy/osmo-gbproxy.cfg - doc/examples/osmo-gtphub/gtphub-example.txt - doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg - doc/examples/osmo-gtphub/osmo-gtphub.cfg - doc/examples/osmo-sgsn/osmo-sgsn.cfg include/Makefile.am include/osmocom/sgsn/Makefile.am - include/osmocom/sgsn/common.h - include/osmocom/sgsn/crc24.h - include/osmocom/sgsn/debug.h include/osmocom/sgsn/gb_proxy.h - include/osmocom/sgsn/gprs_gb_parse.h - include/osmocom/sgsn/gprs_gmm.h - include/osmocom/sgsn/gprs_llc.h - include/osmocom/sgsn/gprs_sgsn.h - include/osmocom/sgsn/gprs_sndcp.h - include/osmocom/sgsn/gprs_subscriber.h - include/osmocom/sgsn/sgsn.h - include/osmocom/sgsn/vty.h m4/README src/Makefile.am src/gprs/.gitignore src/gprs/Makefile.am - src/gprs/osmo_sgsn.cfg tests/Makefile.am tests/atlocal.in - tests/gbproxy/Makefile.am - tests/gbproxy/gbproxy_test.ok - tests/gprs/Makefile.am - tests/gprs/gprs_test.c - tests/gprs/gprs_test.ok - tests/gtphub/Makefile.am - tests/gtphub/gtphub_test.ok - tests/sgsn/Makefile.am - tests/sgsn/sgsn_test.ok - tests/slhc/Makefile.am - tests/slhc/slhc_test.ok tests/sndcp_xid/Makefile.am tests/sndcp_xid/sndcp_xid_test.ok tests/testsuite.at - tests/v42bis/Makefile.am - tests/v42bis/v42bis_test.ok - tests/xid/Makefile.am - tests/xid/xid_test.ok Copyright: __NO_COPYRIGHT_NOR_LICENSE__ License: __NO_COPYRIGHT_NOR_LICENSE__ -Files: include/osmocom/sgsn/a_reset.h - include/osmocom/sgsn/gprs_llc_xid.h - include/osmocom/sgsn/gprs_sndcp_comp.h - include/osmocom/sgsn/gprs_sndcp_dcomp.h - include/osmocom/sgsn/gprs_sndcp_pcomp.h - include/osmocom/sgsn/gprs_sndcp_xid.h - include/osmocom/sgsn/gprs_utils.h - include/osmocom/sgsn/gtphub.h - include/osmocom/sgsn/signal.h - src/gprs/gprs_llc_parse.c - src/gprs/crc24.c - src/gprs/gprs_gb_parse.c - src/gprs/gprs_utils.c - src/gbproxy/gb_proxy.c - src/gbproxy/gb_proxy_main.c - src/gbproxy/gb_proxy_peer.c - src/gbproxy/gb_proxy_vty.c - src/gtphub/gtphub.c - src/gtphub/gtphub_main.c - src/gtphub/gtphub_vty.c - src/sgsn/gprs_gmm.c - src/sgsn/gprs_llc.c - src/sgsn/gprs_llc_vty.c - src/sgsn/gprs_llc_xid.c - src/sgsn/gprs_sgsn.c - src/sgsn/gprs_sndcp.c - src/sgsn/gprs_sndcp_comp.c - src/sgsn/gprs_sndcp_dcomp.c - src/sgsn/gprs_sndcp_pcomp.c - src/sgsn/gprs_sndcp_vty.c - src/sgsn/gprs_sndcp_xid.c - src/sgsn/gprs_subscriber.c - src/sgsn/sgsn_auth.c - src/sgsn/sgsn_cdr.c - src/sgsn/sgsn_ctrl.c - src/sgsn/sgsn_libgtp.c - src/sgsn/sgsn_main.c - src/sgsn/sgsn_vty.c - tests/gtphub/gtphub_test.c - tests/sgsn/sgsn_test.c - tests/slhc/slhc_test.c +Files: + src/gb_proxy.c + src/gb_proxy_main.c + src/gb_proxy_peer.c + src/gb_proxy_vty.c tests/sndcp_xid/sndcp_xid_test.c - tests/v42bis/v42bis_test.c - tests/xid/xid_test.c Copyright: 2008-2015 Holger Hans Peter Freyther 2008-2016 Harald Welte 2009-2015 Holger Hans Peter Freyther @@ -136,36 +63,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Files: src/gtphub/gtphub_sock.c - tests/gbproxy/gbproxy_test.c -Copyright: 2013 Jacob Erlbeck - 2013 sysmocom s.f.m.c. GmbH - 2014 Holger Hans Peter Freyther - 2015 sysmocom s.f.m.c. GmbH -License: __NO_LICENSE__ - -Files: include/osmocom/sgsn/v42bis.h - include/osmocom/sgsn/v42bis_private.h -Copyright: 2005-2011 Steve Underwood -License: LGPL-2.1 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version 2.1, - as published by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - The FSF address in the above text is the old one. - . - On Debian systems, the complete text of the GNU Lesser General Public License - Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. - Files: osmoappdesc.py tests/ctrl_test_runner.py tests/vty_test_runner.py @@ -228,85 +125,6 @@ On Debian systems, the complete text of the GNU General Public License Version 3 can be found in `/usr/share/common-licenses/GPL-3'. -Files: src/gprs/v42bis.c -Copyright: 2005-2011 Steve Underwood -License: LGPL-2.1 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version 2.1, - as published by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - THIS IS A WORK IN PROGRESS. IT IS NOT FINISHED. - Currently it performs the core compression and decompression functions OK. - However, a number of the bells and whistles in V.42bis are incomplete. - . - ! \file - . - The FSF address in the above text is the old one. - . - On Debian systems, the complete text of the GNU Lesser General Public License - Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. - -Files: include/osmocom/sgsn/slhc.h -Copyright: 1989 Regents of the University of California. -License: __UNKNOWN__ - Redistribution and use in source and binary forms are permitted - provided that the above copyright notice and this paragraph are - duplicated in all such forms and that any documentation, - advertising materials, and other materials related to such - distribution and use acknowledge that the software was developed - by the University of California, Berkeley. The name of the - University may not be used to endorse or promote products derived - from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - . - Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989: - - Initial distribution. - . - modified for KA9Q Internet Software Package by - Katie Stevens (dkstevens at ucdavis.edu) - University of California, Davis - Computing Services - - 01-31-90 initial adaptation - -Files: src/gprs/slhc.c -Copyright: 1989 Regents of the University of California. -License: __UNKNOWN__ - Redistribution and use in source and binary forms are permitted - provided that the above copyright notice and this paragraph are - duplicated in all such forms and that any documentation, - advertising materials, and other materials related to such - distribution and use acknowledge that the software was developed - by the University of California, Berkeley. The name of the - University may not be used to endorse or promote products derived - from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - . - Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989: - - Initial distribution. - . - modified for KA9Q Internet Software Package by - Katie Stevens (dkstevens at ucdavis.edu) - University of California, Davis - Computing Services - - 01-31-90 initial adaptation (from 1.19) - PPP.05 02-15-90 [ks] - PPP.08 05-02-90 [ks] use PPP protocol field to signal compression - PPP.15 09-90 [ks] improve mbuf handling - PPP.16 11-02 [karn] substantially rewritten to use NOS facilities - Files: m4/ax_check_compile_flag.m4 Copyright: 2008 Guido U. Draheim 2011 Maarten Bosmans -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ia8630332a953b6bc3af80b6e0243c4edcfbd30b6 Gerrit-Change-Number: 22793 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:46:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:46:46 +0000 Subject: Change in osmo-bsc[master]: Introduce VTY cmd to configure Alpha in SI13 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22794 ) Change subject: Introduce VTY cmd to configure Alpha in SI13 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b97ea11bad5fe05f2f634945b5703ee9abde81d Gerrit-Change-Number: 22794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 09 Feb 2021 15:46:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:46:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 15:46:49 +0000 Subject: Change in osmo-bsc[master]: Introduce VTY cmd to configure Alpha in SI13 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22794 ) Change subject: Introduce VTY cmd to configure Alpha in SI13 ...................................................................... Introduce VTY cmd to configure Alpha in SI13 Related: SYS#5358 Change-Id: I8b97ea11bad5fe05f2f634945b5703ee9abde81d --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/system_information.c 3 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 6797d1c..9a226f5 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -391,6 +391,9 @@ bool active; /* CCN_ACTIVE */ bool forced_vty; /* set by VTY ? */ } ccn; /* TS 44.060 sec 8.8.2 */ + struct { + uint8_t alpha; /* ALPHA*10, units of 0.1, range <0-10> */ + } pwr_ctrl; /* TS 44.060 Table 12.9.1 */ } gprs; /* threshold (in percent) when BTS shall send CCCH LOAD IND */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9005aab..0388e8e 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -761,6 +761,8 @@ if (bts->gprs.ccn.forced_vty) vty_out(vty, " gprs ccn-active %d%s", bts->gprs.ccn.active ? 1 : 0, VTY_NEWLINE); + vty_out(vty, " gprs power-control alpha %u%s", + bts->gprs.pwr_ctrl.alpha, VTY_NEWLINE); vty_out(vty, " gprs cell bvci %u%s", bts->gprs.cell.bvci, VTY_NEWLINE); for (i = 0; i < ARRAY_SIZE(bts->gprs.cell.timer); i++) @@ -3509,6 +3511,22 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_bts_gprs_pwr_ctrl_alpha, + cfg_bts_gprs_pwr_ctrl_alpha_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "gprs power-control alpha <0-10>", + GPRS_TEXT + "GPRS Global Power Control Parameters IE (SI13)\n" + "Set alpha\n" + "alpha for MS output power control in units of 0.1 (defaults to 0)\n") +{ + struct gsm_bts *bts = vty->index; + + bts->gprs.pwr_ctrl.alpha = atoi(argv[0]); + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_no_bts_gprs_ctrl_ack, cfg_no_bts_gprs_ctrl_ack_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), @@ -7682,6 +7700,7 @@ install_element(BTS_NODE, &cfg_bts_gprs_net_ctrl_ord_cmd); install_element(BTS_NODE, &cfg_bts_gprs_ctrl_ack_cmd); install_element(BTS_NODE, &cfg_bts_gprs_ccn_active_cmd); + install_element(BTS_NODE, &cfg_bts_gprs_pwr_ctrl_alpha_cmd); install_element(BTS_NODE, &cfg_no_bts_gprs_ctrl_ack_cmd); install_element(BTS_NODE, &cfg_bts_gprs_bvci_cmd); install_element(BTS_NODE, &cfg_bts_gprs_cell_timer_cmd); diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index d018ec3..094c35e 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1260,6 +1260,7 @@ bts->gprs.ccn.active : osmo_bts_has_feature(&bts->model->features, BTS_FEAT_CCN); + si13_default.pwr_ctrl_pars.alpha = bts->gprs.pwr_ctrl.alpha; ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_default); if (ret < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b97ea11bad5fe05f2f634945b5703ee9abde81d Gerrit-Change-Number: 22794 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:48:24 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 15:48:24 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22743 to look at the new patch set (#8). Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... gprs_ns2_sns: add timeout to ST_CONFIG_SGSN The state CONFIG_SGSN must be also protected by the timeout Tsns-prov. Related: OS#5355 Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 --- M src/gb/gprs_ns2_sns.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22743/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:48:25 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 15:48:25 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22795 ) Change subject: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote ...................................................................... gprs_ns2: rename vty-command ip-sns -> ip-sns-remote In prepration to introduce more commands e.g. ip-sns-bind rename the ip-sns-remote Related: SYS#5354 Change-Id: Ida979f3b9daa5f7280a629441e4006a7635653b0 --- M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/22795/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index cd0a211..7b28754 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1634,7 +1634,7 @@ /* It's unlikely that an error happens, but let's better be safe. */ if (osmo_sockaddr_str_from_sockaddr(&addr_str, &endpoint->saddr.u.sas) != 0) addr_str = (struct osmo_sockaddr_str) { .ip = "" }; - vty_out(vty, " ip-sns %s %u%s", addr_str.ip, addr_str.port, VTY_NEWLINE); + vty_out(vty, " ip-sns-remote %s %u%s", addr_str.ip, addr_str.port, VTY_NEWLINE); } } diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index a3aa6ee..978c73b 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1201,8 +1201,8 @@ return CMD_SUCCESS; } -DEFUN(cfg_ns_nse_ip_sns, cfg_ns_nse_ip_sns_cmd, - "ip-sns " VTY_IPV46_CMD " <1-65535>", +DEFUN(cfg_ns_nse_ip_sns_remote, cfg_ns_nse_ip_sns_remote_cmd, + "ip-sns-remote " VTY_IPV46_CMD " <1-65535>", "SNS Initial Endpoint\n" "SGSN IPv4 Address\n" "SGSN IPv6 Address\n" "SGSN UDP Port\n" @@ -1273,8 +1273,8 @@ return CMD_WARNING; } -DEFUN(cfg_no_ns_nse_ip_sns, cfg_no_ns_nse_ip_sns_cmd, - "no ip-sns " VTY_IPV46_CMD " <1-65535>", +DEFUN(cfg_no_ns_nse_ip_sns_remote, cfg_no_ns_nse_ip_sns_remote_cmd, + "no ip-sns-remote " VTY_IPV46_CMD " <1-65535>", NO_STR "Delete a SNS Initial Endpoint\n" "SGSN IPv4 Address\n" "SGSN IPv6 Address\n" @@ -1699,8 +1699,8 @@ install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_udp_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_nsvc_ipa_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_ipa_cmd); - install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_cmd); - install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_remote_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_remote_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida979f3b9daa5f7280a629441e4006a7635653b0 Gerrit-Change-Number: 22795 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:48:26 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 15:48:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: fix memory leak of vty_binds References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22796 ) Change subject: gprs_ns2_vty: fix memory leak of vty_binds ...................................................................... gprs_ns2_vty: fix memory leak of vty_binds They never got freed, only removed from the vty_bind queue. Change-Id: I100897c32dc152f9acbb322782fae49b1f0bc030 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/22796/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 978c73b..3646080 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -128,6 +128,7 @@ return; llist_del(&vbind->list); + talloc_free(vbind); } static struct cmd_node ns_node = { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I100897c32dc152f9acbb322782fae49b1f0bc030 Gerrit-Change-Number: 22796 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:48:33 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 15:48:33 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend TLV parser References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 ) Change subject: gb_proxy: extend TLV parser ...................................................................... gb_proxy: extend TLV parser In BSSGP RIM the routing information IE is appearing twice (source and destination). The current one dimensional TLV parsing method would only give us access to the first routing information IE (destination), so lets increase the dimension to 2, so that we get also IEs that appear twice. Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/97/22797/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 9ff1ad7..65c1730 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -893,7 +893,7 @@ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg); uint8_t pdu_type = bgph->pdu_type; const char *pdut_name = osmo_tlv_prot_msg_name(&osmo_pdef_bssgp, bgph->pdu_type); - struct tlv_parsed tp; + struct tlv_parsed tp[2]; int data_len = msgb_bssgp_len(msg) - sizeof(*bgph); struct gbproxy_bvc *from_bvc = NULL; char log_pfx[32]; @@ -920,34 +920,34 @@ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } - rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, pdu_type, bgph->data, data_len, 0, 0, + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); return tx_status_from_tlvp(rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ - msgb_bcid(msg) = (void *)&tp; + msgb_bcid(msg) = (void *)tp; /* special case handling for some PDU types */ switch (pdu_type) { case BSSGP_PDUT_BVC_RESET: /* resolve or create gbproxy_bvc + handlei n BVC-FSM */ - return rx_bvc_reset_from_bss(nse, msg, &tp); + return rx_bvc_reset_from_bss(nse, msg, &tp[0]); case BSSGP_PDUT_BVC_RESET_ACK: - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; return osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_RESET_ACK, msg); case BSSGP_PDUT_BVC_BLOCK: - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; return osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_BLOCK, msg); case BSSGP_PDUT_BVC_UNBLOCK: - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; @@ -957,7 +957,7 @@ { struct gbproxy_sgsn *sgsn; - tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TLLI)); + tlli = osmo_load32be(TLVP_VAL(&tp[0], BSSGP_IE_TLLI)); sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); if (!sgsn) { LOGP(DGPRS, LOGL_ERROR, "Could not find any SGSN for TLLI, dropping message!\n"); @@ -971,7 +971,7 @@ #if 0 /* TODO: Validate the RAI for consistency with the RAI * we expect for any of the BVC within this BSS side NSE */ - memcpy(ra, TLVP_VAL(&tp, BSSGP_IE_ROUTEING_AREA), sizeof(from_bvc->ra)); + memcpy(ra, TLVP_VAL(&tp[0], BSSGP_IE_ROUTEING_AREA), sizeof(from_bvc->ra)); gsm48_parse_ra(&raid, from_bvc->ra); #endif break; @@ -991,8 +991,8 @@ case BSSGP_PDUT_LLC_DISCARD: case BSSGP_PDUT_FLUSH_LL_ACK: /* route based on BVCI + TLLI */ - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); - tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TLLI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); + tlli = osmo_load32be(TLVP_VAL(&tp[0], BSSGP_IE_TLLI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; @@ -1003,8 +1003,8 @@ { /* Route according to IMSI<->NSE cache entry */ struct osmo_mobile_identity mi; - const uint8_t *mi_data = TLVP_VAL(&tp, BSSGP_IE_IMSI); - uint8_t mi_len = TLVP_LEN(&tp, BSSGP_IE_IMSI); + const uint8_t *mi_data = TLVP_VAL(&tp[0], BSSGP_IE_IMSI); + uint8_t mi_len = TLVP_LEN(&tp[0], BSSGP_IE_IMSI); osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); nse = gbproxy_nse_by_imsi(nse->cfg, mi.imsi); if (!nse) { @@ -1143,7 +1143,7 @@ const char *pdut_name = osmo_tlv_prot_msg_name(&osmo_pdef_bssgp, bgph->pdu_type); struct gbproxy_config *cfg = nse->cfg; struct gbproxy_bvc *sgsn_bvc; - struct tlv_parsed tp; + struct tlv_parsed tp[2]; int data_len; uint16_t bvci; char log_pfx[32]; @@ -1173,7 +1173,7 @@ data_len = msgb_bssgp_len(msg) - sizeof(*bgph); - rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, pdu_type, bgph->data, data_len, 0, 0, + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { rc = tx_status_from_tlvp(rc, msg); @@ -1181,30 +1181,30 @@ return rc; } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ - msgb_bcid(msg) = (void *)&tp; + msgb_bcid(msg) = (void *)tp; switch (pdu_type) { case BSSGP_PDUT_BVC_RESET: /* resolve or create ggbproxy_bvc + handle in BVC-FSM */ - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); - rc = rx_bvc_reset_from_sgsn(nse, msg, &tp, ns_bvci); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); + rc = rx_bvc_reset_from_sgsn(nse, msg, &tp[0], ns_bvci); break; case BSSGP_PDUT_BVC_RESET_ACK: - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; rc = osmo_fsm_inst_dispatch(sgsn_bvc->fi, BSSGP_BVCFSM_E_RX_RESET_ACK, msg); break; case BSSGP_PDUT_BVC_BLOCK_ACK: - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; rc = osmo_fsm_inst_dispatch(sgsn_bvc->fi, BSSGP_BVCFSM_E_RX_BLOCK_ACK, msg); break; case BSSGP_PDUT_BVC_UNBLOCK_ACK: - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; @@ -1212,7 +1212,7 @@ break; case BSSGP_PDUT_FLUSH_LL: /* simple case: BVCI IE is mandatory */ - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; @@ -1228,23 +1228,23 @@ { /* Cache the IMSI<->NSE to route PAGING REJECT */ struct osmo_mobile_identity mi; - const uint8_t *mi_data = TLVP_VAL(&tp, BSSGP_IE_IMSI); - uint8_t mi_len = TLVP_LEN(&tp, BSSGP_IE_IMSI); + const uint8_t *mi_data = TLVP_VAL(&tp[0], BSSGP_IE_IMSI); + uint8_t mi_len = TLVP_LEN(&tp[0], BSSGP_IE_IMSI); osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); gbproxy_imsi_cache_update(nse, mi.imsi); /* fall through */ } case BSSGP_PDUT_PAGING_CS: /* process the paging request (LAI/RAI lookup) */ - rc = gbprox_rx_paging(nse, msg, pdut_name, &tp, ns_bvci, paging_bc); + rc = gbprox_rx_paging(nse, msg, pdut_name, &tp[0], ns_bvci, paging_bc); break; case BSSGP_PDUT_STATUS: /* Some exception has occurred */ - cause = *TLVP_VAL(&tp, BSSGP_IE_CAUSE); + cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, bssgp_cause_str(cause)); - if (TLVP_PRES_LEN(&tp, BSSGP_IE_BVCI, 2)) { - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + if (TLVP_PRES_LEN(&tp[0], BSSGP_IE_BVCI, 2)) { + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%05u\n", bvci); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); /* don't send STATUS in response to STATUS if !bvc */ @@ -1260,7 +1260,7 @@ case BSSGP_PDUT_RESUME_NACK: { struct gbproxy_nse *nse_peer; - uint32_t tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TLLI)); + uint32_t tlli = osmo_load32be(TLVP_VAL(&tp[0], BSSGP_IE_TLLI)); nse_peer = gbproxy_nse_by_tlli(cfg, tlli); if (!nse_peer) { -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Gerrit-Change-Number: 22797 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:48:35 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 15:48:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22743/6/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22743/6/src/gb/gprs_ns2_sns.c at 1376 PS6, Line 1376: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); > I didn't see any change? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:48:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 15:57:57 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 15:57:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 15:57:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:03:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 9 Feb 2021 16:03:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22587 ) Change subject: gprs_ns2: add gprs_ns2_vty_ignore_legacy() to support old configuration ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a4fc0637f475116273a98b104c108e3c5f8ba8f Gerrit-Change-Number: 22587 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:15 +0000 Subject: Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: enb,epc,ms: refactor KPI API ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 5 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:14:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:34 +0000 Subject: Change in osmo-gsm-tester[master]: enb, ue, process: move stdout counter helper to process objects In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 ) Change subject: enb,ue,process: move stdout counter helper to process objects ...................................................................... enb,ue,process: move stdout counter helper to process objects this patch adds the stdout counter to count events happening on the stdout (known from the UE already) to the common process class so they can also be used from the eNB (and other objects) In addition, we add a PRACH counter to be used for tests. Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 --- M src/osmo_gsm_tester/core/process.py M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 6 files changed, 31 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py index bac258a..e305c64 100644 --- a/src/osmo_gsm_tester/core/process.py +++ b/src/osmo_gsm_tester/core/process.py @@ -164,6 +164,15 @@ self.outputs[name] = (path, f) return f + def get_counter_stdout(self, keyword): + # Match stdout against keyword + n = 0 + stdout_lines = (self.get_stdout() or '').splitlines() + for l in stdout_lines: + if keyword in l: + n += 1 + return n + def launch(self): preexec_fn = None log.dbg('cd %r; %s %s' % ( diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 3944459..d2e48a6 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -346,4 +346,8 @@ def addr(self): return self._run_node.run_addr() + @abstractmethod + def get_counter(self, counter_name): + pass + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index ef28100..60985f4 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -247,6 +247,11 @@ def running(self): return not self.process.terminated() + def get_counter(self, counter_name): + if counter_name == 'prach_received': + return self.process.get_counter_stdout('PRACH:') + raise log.Error('counter %s not implemented!' % counter_name) + def get_rfemu(self, cell=0, dl=True): cell_list = self.gen_conf['enb'].get('cell_list', None) if cell_list is None or len(cell_list) < cell + 1: diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index 6afc873..bf988eb 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -258,6 +258,11 @@ def running(self): return not self.process.terminated() + def get_counter(self, counter_name): + if counter_name == 'prach_received': + return self.process.get_counter_stdout('RACH:') + raise log.Error('counter %s not implemented!' % counter_name) + def get_rfemu(self, cell=0, dl=True): cell_list = self.gen_conf['enb'].get('cell_list', None) if cell_list is None or len(cell_list) < cell + 1: diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index 610d3e6..2f19f3f 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -382,30 +382,21 @@ proc.launch_sync() return proc - def _get_counter_stdout(self, keyword): - # Match stdout against keyword - n = 0 - stdout_lines = (self.process.get_stdout() or '').splitlines() - for l in stdout_lines: - if keyword in l: - n += 1 - return n - def get_counter(self, counter_name): if counter_name == 'handover_success': - return self._get_counter_stdout('HO successful') + return self.process.get_counter_stdout('HO successful') if counter_name == 'prach_sent': - return self._get_counter_stdout('Random Access Transmission') + return self.process.get_counter_stdout('Random Access Transmission') if counter_name == 'paging_received': - return self._get_counter_stdout('S-TMSI match in paging message') + return self.process.get_counter_stdout('S-TMSI match in paging message') if counter_name == 'reestablishment_attempts': - return self._get_counter_stdout('RRC Connection Reestablishment') + return self.process.get_counter_stdout('RRC Connection Reestablishment') if counter_name == 'reestablishment_ok': - return self._get_counter_stdout('Reestablishment OK') + return self.process.get_counter_stdout('Reestablishment OK') if counter_name == 'rrc_connected_transitions': - return self._get_counter_stdout('RRC Connected') + return self.process.get_counter_stdout('RRC Connected') if counter_name == 'rrc_idle_transitions': - return self._get_counter_stdout('RRC IDLE') + return self.process.get_counter_stdout('RRC IDLE') raise log.Error('counter %s not implemented!' % counter_name) def verify_metric(self, value, operation='avg', metric='dl_brate', criterion='gt', window=1): diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py index e221940..1d03a58 100644 --- a/src/osmo_gsm_tester/obj/srslte_common.py +++ b/src/osmo_gsm_tester/obj/srslte_common.py @@ -97,4 +97,4 @@ return analyzer.get_num_phy_errors(kpi) except ImportError: self.log("Can't load KPI analyzer module.") - return 0 \ No newline at end of file + return 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 Gerrit-Change-Number: 22042 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:35 +0000 Subject: Change in osmo-gsm-tester[master]: 4g: add checks for received PRACHs for ping tests In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22043 ) Change subject: 4g: add checks for received PRACHs for ping tests ...................................................................... 4g: add checks for received PRACHs for ping tests the tests already check for sent PRACHs, this will also check for received PRACHs on the eNB to make sure we don't detect any fake PRACHs during the tests. Change-Id: Ib23056b1ad4b18a7dde6cd0c997f5114ac2acb61 --- M sysmocom/suites/4g/rrc_idle_mo_ping.py M sysmocom/suites/4g/rrc_idle_mt_ping.py 2 files changed, 19 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sysmocom/suites/4g/rrc_idle_mo_ping.py b/sysmocom/suites/4g/rrc_idle_mo_ping.py index ced798d..389e5a2 100755 --- a/sysmocom/suites/4g/rrc_idle_mo_ping.py +++ b/sysmocom/suites/4g/rrc_idle_mo_ping.py @@ -31,9 +31,16 @@ output = proc.get_stdout() # Check PRACH transmissions +num_prachs = 2 num_prach_sent = ue.get_counter('prach_sent') -if num_prach_sent != 2: - raise Exception("Expected to have sent exactly 2 PRACHs, but in fact sent {}".format(num_prach_sent)) +if num_prach_sent != num_prachs: + raise Exception("Expected to have sent exactly {} PRACHs, but in fact sent {}".format(num_prachs, num_prach_sent)) +# Check PRACH receptions +num_prach_received = enb.get_counter('prach_received') +if num_prach_sent != num_prachs: + raise Exception("Expected to have received exactly {} PRACHs, but in fact received {}".format(num_prachs, num_prach_received)) + +output += "\nnum_prach_sent={}\nnum_prach_received={}\n".format(num_prach_sent, num_prach_received) print(output) test.set_report_stdout(output) diff --git a/sysmocom/suites/4g/rrc_idle_mt_ping.py b/sysmocom/suites/4g/rrc_idle_mt_ping.py index dcabe21..bdebb26 100755 --- a/sysmocom/suites/4g/rrc_idle_mt_ping.py +++ b/sysmocom/suites/4g/rrc_idle_mt_ping.py @@ -26,7 +26,7 @@ # Wait a bit sleep(5) -# Generate MO traffic, send single ping +# Generate MT traffic, send single ping proc = epc.prepare_process('ping', ('ping', '-c', '1', ue.get_assigned_addr())) proc.launch_sync() output = proc.get_stdout() @@ -37,9 +37,16 @@ raise Exception("Expected to receive exactly 1 paging message, but in fact received {}".format(num_paging_received)) # Check PRACH transmissions +num_prachs = 2 num_prach_sent = ue.get_counter('prach_sent') -if num_prach_sent != 2: - raise Exception("Expected to have sent exactly 2 PRACHs, but in fact sent {}".format(num_prach_sent)) +if num_prach_sent != num_prachs: + raise Exception("Expected to have sent exactly {} PRACHs, but in fact sent {}".format(num_prachs, num_prach_sent)) +# Check PRACH receptions +num_prach_received = enb.get_counter('prach_received') +if num_prach_sent != num_prachs: + raise Exception("Expected to have received exactly {} PRACHs, but in fact received {}".format(num_prachs, num_prach_received)) + +output += "\nnum_prach_sent={}\nnum_prach_received={}\n".format(num_prach_sent, num_prach_received) print(output) test.set_report_stdout(output) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib23056b1ad4b18a7dde6cd0c997f5114ac2acb61 Gerrit-Change-Number: 22043 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:35 +0000 Subject: Change in osmo-gsm-tester[master]: enb: add abstract method stop() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 ) Change subject: enb: add abstract method stop() ...................................................................... enb: add abstract method stop() implement as noop for Amarisoft eNB, srsENB will send q+Enter to stdin, which is implemented in class srslte_common() Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 4 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index d2e48a6..50a8832 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -327,6 +327,10 @@ pass @abstractmethod + def stop(self): + pass + + @abstractmethod def ue_add(self, ue): pass diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index 60985f4..b7ede3b 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -130,6 +130,10 @@ self.testenv.remember_to_stop(self.process) self.process.launch() + def stop(self): + # Not implemented + pass + def gen_conf_file(self, path, filename, values): self.dbg('AmarisoftENB ' + filename + ':\n' + pprint.pformat(values)) with open(path, 'w') as f: diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py index bf988eb..aee3f61 100644 --- a/src/osmo_gsm_tester/obj/enb_srs.py +++ b/src/osmo_gsm_tester/obj/enb_srs.py @@ -119,6 +119,10 @@ self.dbg('Enabling console trace') self.process.stdin_write('t\n') + def stop(self): + # Implemented in srslte_common.py + srslte_common.stop(self) + def start_remotely(self): remote_env = { 'LD_LIBRARY_PATH': self.remote_inst.child('lib') } remote_binary = self.remote_inst.child('bin', srsENB.BINFILE) diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py index 1d03a58..21001b7 100644 --- a/src/osmo_gsm_tester/obj/srslte_common.py +++ b/src/osmo_gsm_tester/obj/srslte_common.py @@ -36,6 +36,8 @@ self.stop_sleep_time = 0 def stop(self): + # Send q+Enter to stdin to self-terminate application + self.process.stdin_write('q\n') self.testenv.stop_process(self.process) self.sleep_after_stop() -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ide606e1a6b523997215aa2fa39d4d56ae1f49181 Gerrit-Change-Number: 22054 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:35 +0000 Subject: Change in osmo-gsm-tester[master]: enb: Set cipher and integrity via scenario file In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21582 ) Change subject: enb: Set cipher and integrity via scenario file ...................................................................... enb: Set cipher and integrity via scenario file This patch enables setting cipher and integrity algorithms in Amarisoft eNB and srsENB via scenario files. If no settings are defined following defaults are applied: - Cipher algorithm: EEA0, EEA2, EEA1 - Integrity algorithm: EIA2, EIA1, EIA0 Example of setting cipher algorithms: - 4g:srsue-rftype at uhd+srsenb-rftype@uhd+mod-enb-cipher at eea1+mod-enb-cipher@eea0+mod-enb-nprb at 6 Change-Id: I595206b7d49016fb6d0aec175c828d9537c53886 --- M src/osmo_gsm_tester/core/schema.py M src/osmo_gsm_tester/obj/bts.py M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/ms.py M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M src/osmo_gsm_tester/templates/srsenb.conf.tmpl M sysmocom/defaults.conf A sysmocom/scenarios/mod-enb-cipher at .conf A sysmocom/scenarios/mod-enb-integrity at .conf 10 files changed, 45 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/core/schema.py b/src/osmo_gsm_tester/core/schema.py index d4a460d..4064c20 100644 --- a/src/osmo_gsm_tester/core/schema.py +++ b/src/osmo_gsm_tester/core/schema.py @@ -105,11 +105,22 @@ raise ValueError('Positive value >0 expected instead of %d' % n) return True -def cipher(val): +def cipher_2g(val): if val in ('a5_0', 'a5_1', 'a5_2', 'a5_3', 'a5_4', 'a5_5', 'a5_6', 'a5_7'): return True raise ValueError('Unknown Cipher value: %r' % val) +def cipher_4g(val): + if val.lower() in ('eea0', 'eea1', 'eea2'): + return True + raise ValueError('Unknown 4G cipher value: %r' % val) + +def integrity_4g(val): + if val.lower() in ('eia0', 'eia1', 'eia2'): + # srsENB + return True + raise ValueError('Unknown 4G integrity value %r' % val) + def modem_feature(val): if val in ('sms', 'gprs', 'voice', 'ussd', 'sim', '2g', '3g', '4g', 'dl_qam256', 'ul_qam64', 'qc_diag'): return True @@ -165,7 +176,9 @@ MSISDN = 'msisdn' AUTH_ALGO = 'auth_algo' TIMES='times' -CIPHER = 'cipher' +CIPHER_2G = 'cipher_2g' +CIPHER_4G = 'cipher_4g' +INTEGRITY_4G = 'integrity_4g' MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' @@ -189,7 +202,8 @@ MSISDN: msisdn, AUTH_ALGO: auth_algo, TIMES: times, - CIPHER: cipher, + CIPHER_2G: cipher_2g, + CIPHER_4G: cipher_4g, MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, @@ -198,6 +212,7 @@ OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref, LTE_TRANSMISSION_MODE: lte_transmission_mode, DURATION: duration, + INTEGRITY_4G: integrity_4g, } def add(dest, src): diff --git a/src/osmo_gsm_tester/obj/bts.py b/src/osmo_gsm_tester/obj/bts.py index 76a6875..fd9fa3a 100644 --- a/src/osmo_gsm_tester/obj/bts.py +++ b/src/osmo_gsm_tester/obj/bts.py @@ -31,7 +31,7 @@ 'addr': schema.IPV4, 'band': schema.BAND, 'direct_pcu': schema.BOOL_STR, - 'ciphers[]': schema.CIPHER, + 'ciphers[]': schema.CIPHER_2G, 'channel_allocator': schema.CHAN_ALLOCATOR, 'gprs_mode': schema.GPRS_MODE, 'emergency_calls_allowed': schema.BOOL_STR, diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 50a8832..32ead69 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -44,6 +44,8 @@ 'enable_measurements': schema.BOOL_STR, 'enable_dl_awgn': schema.BOOL_STR, 'dl_awgn_snr': schema.INT, + 'cipher_list[]': schema.CIPHER_4G, + 'integrity_list[]': schema.INTEGRITY_4G, 'a1_report_type': schema.STR, 'a1_report_value': schema.INT, 'a1_hysteresis': schema.INT, diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py index b7ede3b..e97bb90 100644 --- a/src/osmo_gsm_tester/obj/enb_amarisoft.py +++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py @@ -176,6 +176,10 @@ config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))})) + # Remove EEA0 from cipher list, if specified, as it's always assumed as default + cipher_list = values['enb'].get('cipher_list', None) + if "eea0" in cipher_list: cipher_list.remove("eea0") + # We need to set some specific variables programatically here to match IP addresses: if self._conf.get('rf_dev_type') == 'zmq': base_srate = self.num_prb2base_srate(self.num_prb()) diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py index 552de71..cd4a8a1 100644 --- a/src/osmo_gsm_tester/obj/ms.py +++ b/src/osmo_gsm_tester/obj/ms.py @@ -31,7 +31,7 @@ 'opc': schema.OPC, 'auth_algo': schema.AUTH_ALGO, 'apn_ipaddr': schema.IPV4, - 'ciphers[]': schema.CIPHER, + 'ciphers[]': schema.CIPHER_2G, 'features[]': schema.MODEM_FEATURE } schema.register_resource_schema('modem', resource_schema) diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 4c7aa33..2c6fcc0 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -224,9 +224,9 @@ dpc_pucch_snr_target: 10, /* RRC/UP ciphering algorithm preference. EEA0 is always the last. */ - cipher_algo_pref: [], + cipher_algo_pref: [${', '.join(list(dict.fromkeys(enb.cipher_list))).split("eea")[1] if len(list(dict.fromkeys(enb.cipher_list))) > 0 else ''}], /* RRC integrity algorithm preference. EIA0 is always the last. */ - integ_algo_pref: [2, 1], + integ_algo_pref: [${', '.join(list(dict.fromkeys(enb.integrity_list))).split("eia")[1]}], /* (in ms) send RRC connection release after this time of network inactivity */ diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index 7ac75bb..794edea 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -285,5 +285,5 @@ #link_failure_nof_err = 50 rrc_inactivity_timer = ${enb.inactivity_timer} #max_prach_offset_us = 30 -#eea_pref_list = EEA0, EEA2, EEA1 -#eia_pref_list = EIA2, EIA1, EIA0 +eea_pref_list = ${', '.join(list(dict.fromkeys(enb.cipher_list))).upper()} +eia_pref_list = ${', '.join(list(dict.fromkeys(enb.integrity_list))).upper()} diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index 7f1368b..d66e030 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -144,6 +144,13 @@ root_seq_idx: 205 scell_list: [] ncell_list: [] + cipher_4g: + - eea0 + - eea2 + - eea1 + integrity_4g: + - eia2 + - eia1 srsenb: num_prb: 100 diff --git a/sysmocom/scenarios/mod-enb-cipher at .conf b/sysmocom/scenarios/mod-enb-cipher at .conf new file mode 100644 index 0000000..7cd453f --- /dev/null +++ b/sysmocom/scenarios/mod-enb-cipher at .conf @@ -0,0 +1,4 @@ +modifiers: + enb: + - cipher_list: + - ${param1} diff --git a/sysmocom/scenarios/mod-enb-integrity at .conf b/sysmocom/scenarios/mod-enb-integrity at .conf new file mode 100644 index 0000000..fa708ad --- /dev/null +++ b/sysmocom/scenarios/mod-enb-integrity at .conf @@ -0,0 +1,4 @@ +modifiers: + enb: + - integrity_list: + - ${param1} -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I595206b7d49016fb6d0aec175c828d9537c53886 Gerrit-Change-Number: 21582 Gerrit-PatchSet: 9 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:36 +0000 Subject: Change in osmo-gsm-tester[master]: scenarios: remove ncells@ scenario and define number of cells explicitly In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22055 ) Change subject: scenarios: remove ncells@ scenario and define number of cells explicitly ...................................................................... scenarios: remove ncells@ scenario and define number of cells explicitly the specific cell scenarios files already contain cell-related information so having a extra ncells scenario seems too much overhead. furthermore, in more complex tests its helps to reduce the filename/path lenght to avoid hitting the 255 character limit Change-Id: If022d9e8d239805ee1280fb52660e68dda7484a0 --- M sysmocom/scenarios/mod-enb-cells-2ca.conf M sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf M sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf D sysmocom/scenarios/mod-enb-ncells at .conf 4 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sysmocom/scenarios/mod-enb-cells-2ca.conf b/sysmocom/scenarios/mod-enb-cells-2ca.conf index c9468c6..916d0eb 100644 --- a/sysmocom/scenarios/mod-enb-cells-2ca.conf +++ b/sysmocom/scenarios/mod-enb-cells-2ca.conf @@ -2,6 +2,7 @@ modifiers: enb: - id: 0x19B + num_cells: 2 cell_list: - cell_id: 0x00 pci: 0x01 diff --git a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf index 899ec4b..2d629f9 100644 --- a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf +++ b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf @@ -2,6 +2,7 @@ modifiers: enb: - id: 0x19B + num_cells: 2 cell_list: - cell_id: 0x01 pci: 0x01 diff --git a/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf b/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf index f4223a5..720b75b 100644 --- a/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf +++ b/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf @@ -3,6 +3,7 @@ enb: - id: 0x19B enable_measurements: true + num_cells: 2 cell_list: - cell_id: 0x01 pci: 0x01 diff --git a/sysmocom/scenarios/mod-enb-ncells at .conf b/sysmocom/scenarios/mod-enb-ncells at .conf deleted file mode 100644 index b57b94a..0000000 --- a/sysmocom/scenarios/mod-enb-ncells at .conf +++ /dev/null @@ -1,3 +0,0 @@ -modifiers: - enb: - - num_cells: ${param1} -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If022d9e8d239805ee1280fb52660e68dda7484a0 Gerrit-Change-Number: 22055 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:36 +0000 Subject: Change in osmo-gsm-tester[master]: srsepc.conf.tmpl: double value of T3413 (paging timer) In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22597 ) Change subject: srsepc.conf.tmpl: double value of T3413 (paging timer) ...................................................................... srsepc.conf.tmpl: double value of T3413 (paging timer) we've already incrased the t3413 value in 9c7fd618d226dc532b9408c329cfc2380de4850a but realized it may still be too low in some cases. we set it to 12s now. Change-Id: I9c3c59c0ff8f539a44b420f8ba31eea016c211ce --- M src/osmo_gsm_tester/templates/srsepc.conf.tmpl M sysmocom/suites/4g/rrc_idle_mt_ping.py 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl index 62f9977..d6ecaec 100644 --- a/src/osmo_gsm_tester/templates/srsepc.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsepc.conf.tmpl @@ -31,7 +31,7 @@ dns_addr = 8.8.8.8 encryption_algo = EEA0 integrity_algo = EIA1 -paging_timer = 6 +paging_timer = 12 ##################################################################### # HSS configuration diff --git a/sysmocom/suites/4g/rrc_idle_mt_ping.py b/sysmocom/suites/4g/rrc_idle_mt_ping.py index bdebb26..3360dba 100755 --- a/sysmocom/suites/4g/rrc_idle_mt_ping.py +++ b/sysmocom/suites/4g/rrc_idle_mt_ping.py @@ -26,8 +26,8 @@ # Wait a bit sleep(5) -# Generate MT traffic, send single ping -proc = epc.prepare_process('ping', ('ping', '-c', '1', ue.get_assigned_addr())) +# Generate MT traffic, send single ping (10s timeout) +proc = epc.prepare_process('ping', ('ping', '-w', '10', '-c', '1', ue.get_assigned_addr())) proc.launch_sync() output = proc.get_stdout() -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I9c3c59c0ff8f539a44b420f8ba31eea016c211ce Gerrit-Change-Number: 22597 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:14:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:14:36 +0000 Subject: Change in osmo-gsm-tester[master]: srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22598 ) Change subject: srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ ...................................................................... srsue.conf.tmpl: reduce nof PHY threads to 2 for ZMQ we've detected a possible race condition during the Msg3 transmission that caused the thread that sets the Msg3 grant to be delayed. The PHY worker that executed TTI+2 finished by that time already and didn't even see the pending UL grant. This is issue is more likely to happen on loaded system, for example when running parallel ZMQ jobs. We therefore decided to reduce the number of parallel PHY workers to 2 so the issue is circumvented. Change-Id: Ibdb42a1705d87b6d343201458c8fe397398802bc --- M src/osmo_gsm_tester/templates/srsue.conf.tmpl 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index a50f91e..0939823 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -336,7 +336,9 @@ #snr_ema_coeff = 0.1 #snr_estim_alg = refs #pdsch_max_its = 8 # These are half iterations -#nof_phy_threads = 3 +% if ue.rf_dev_type == 'zmq': +nof_phy_threads = 2 +% endif #equalizer_mode = mmse #sfo_ema = 0.1 #sfo_correct_period = 10 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibdb42a1705d87b6d343201458c8fe397398802bc Gerrit-Change-Number: 22598 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:16:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:16:23 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix typo in comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22790 ) Change subject: cosmetic: fix typo in comment ...................................................................... cosmetic: fix typo in comment Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d --- M src/gsm_rlcmac.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 9b8782d..c56526e 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -5832,7 +5832,7 @@ LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n"); return CSN_ERROR_GENERAL; } - /* We can decode the message */ + /* We can encode the message */ else { /* First print the message type and create a tree item */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d Gerrit-Change-Number: 22790 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:17:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:17:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:17:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:17:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:17:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: move generic RAW_NS_CT function to library/RAW_NS In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 ) Change subject: pcu: move generic RAW_NS_CT function to library/RAW_NS ...................................................................... pcu: move generic RAW_NS_CT function to library/RAW_NS Allow the NS tests to use the SNS functions. Change-Id: I6c404475f39dd00023eb11e98da93ee423604039 --- M library/RAW_NS.ttcnpp M pcu/PCU_Tests_SNS.ttcn 2 files changed, 184 insertions(+), 184 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp index 2aaa770..298ef1e 100644 --- a/library/RAW_NS.ttcnpp +++ b/library/RAW_NS.ttcnpp @@ -266,4 +266,188 @@ } } +/********************************************************************************** + * IP Sub-Network Service (SNS) + **********************************************************************************/ + +/* perform inbound SNS-SIZE procedure */ +function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_incoming_sns_size(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, + num_v4 := 4, num_v6 := omit), idx); + } else { + /* expect one single SNS-SIZE with RESET flag; no v4 EP; 4x v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, + num_v4 := omit, num_v6 := 4), idx); + } + NSCP[idx].send(ts_SNS_SIZE_ACK(g_nsconfig.nsei, cause)); +} + +/* perform outbound SNS-SIZE procedure */ +function f_outgoing_sns_size(template (omit) NsCause cause := omit, integer idx:= 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_size(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, + num_v4 := 1, num_v6 := omit) + ); + } else { + NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, + num_v4 := omit, num_v6 := 1) + ); + } + /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ + rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig.nsei, cause), idx); +} + +/* perform inbound SNS-CONFIG procedure */ +function f_incoming_sns_config(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_incoming_sns_config(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template IP4_Elements v4_elem := { tr_SNS_IPv4(nsvc_cfg.provider.ip.remote_ip, + nsvc_cfg.provider.ip.remote_udp_port) }; + rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v4 := v4_elem), idx); + } else { + var template IP6_Elements v6_elem := { tr_SNS_IPv6(nsvc_cfg.provider.ip.remote_ip, + nsvc_cfg.provider.ip.remote_udp_port) }; + rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v6 := v6_elem), idx); + } + NSCP[idx].send(ts_SNS_CONFIG_ACK(g_nsconfig.nsei, cause)); +} + +/* perform outbound SNS-CONFIG procedure */ +function f_outgoing_sns_config(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_config(idx=", idx, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; + + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port) } + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port) } + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); + } + rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); +} + +/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ +function f_outgoing_sns_config_1c1u(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_config_1c1u(idx=", idx, ")"); + var PDU_NS rx; + + if (g_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[0].provider.ip.local_ip, + g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[0].provider.ip.local_ip, + g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); + } + rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); +} + +/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ +function f_outgoing_sns_config_1c1u_separate(template (omit) NsCause cause := omit, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")"); + var PDU_NS rx; + if (g_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv4(g_nsconfig.nsvc[2].provider.ip.local_ip, + g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, + g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), + ts_SNS_IPv6(g_nsconfig.nsvc[2].provider.ip.local_ip, + g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; + NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); + } + rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); +} + +function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit) +runs on RAW_NS_CT { + log("f_outgoing_sns_add(idx_add=", idx_add, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_add]; + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, v6)); + } +} + +function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_del(idx_del=", idx_del, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_del]; + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, omit, v6)); + } +} + +function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0) +runs on RAW_NS_CT { + log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); + var PDU_NS rx; + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_chg]; + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, v4)); + } else { + var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, v6)); + } +} + } diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 4fca26e..c4f6b6e 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -22,190 +22,6 @@ * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) **********************************************************************************/ -/* perform inbound SNS-SIZE procedure */ -function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_incoming_sns_size(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, - num_v4 := 4, num_v6 := omit), idx); - } else { - /* expect one single SNS-SIZE with RESET flag; no v4 EP; 4x v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8, - num_v4 := omit, num_v6 := 4), idx); - } - NSCP[idx].send(ts_SNS_SIZE_ACK(g_nsconfig.nsei, cause)); -} - -/* perform outbound SNS-SIZE procedure */ -function f_outgoing_sns_size(template (omit) NsCause cause := omit, integer idx:= 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_size(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, - num_v4 := 1, num_v6 := omit) - ); - } else { - NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1, - num_v4 := omit, num_v6 := 1) - ); - } - /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */ - rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig.nsei, cause), idx); -} - -/* perform inbound SNS-CONFIG procedure */ -function f_incoming_sns_config(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_incoming_sns_config(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template IP4_Elements v4_elem := { tr_SNS_IPv4(nsvc_cfg.provider.ip.remote_ip, - nsvc_cfg.provider.ip.remote_udp_port) }; - rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v4 := v4_elem), idx); - } else { - var template IP6_Elements v6_elem := { tr_SNS_IPv6(nsvc_cfg.provider.ip.remote_ip, - nsvc_cfg.provider.ip.remote_udp_port) }; - rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v6 := v6_elem), idx); - } - NSCP[idx].send(ts_SNS_CONFIG_ACK(g_nsconfig.nsei, cause)); -} - -/* perform outbound SNS-CONFIG procedure */ -function f_outgoing_sns_config(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_config(idx=", idx, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx]; - - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port) } - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port) } - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); - } - rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); -} - -/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ -function f_outgoing_sns_config_1c1u(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_config_1c1u(idx=", idx, ")"); - var PDU_NS rx; - - if (mp_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[0].provider.ip.local_ip, - g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[0].provider.ip.local_ip, - g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); - } - rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); -} - -/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */ -function f_outgoing_sns_config_1c1u_separate(template (omit) NsCause cause := omit, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")"); - var PDU_NS rx; - if (mp_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv4(g_nsconfig.nsvc[2].provider.ip.local_ip, - g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip, - g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0), - ts_SNS_IPv6(g_nsconfig.nsvc[2].provider.ip.local_ip, - g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) }; - NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6)); - } - rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx); -} - -function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit) -runs on RAW_NS_CT { - log("f_outgoing_sns_add(idx_add=", idx_add, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_add]; - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, v6)); - } -} - -function f_outgoing_sns_del(integer idx_del, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_del(idx_del=", idx_del, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_del]; - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, omit, v6)); - } -} - -function f_outgoing_sns_chg_weight(integer idx_chg, uint8_t w_sig, uint8_t w_user, integer idx := 0) -runs on RAW_NS_CT { - log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")"); - var PDU_NS rx; - var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_chg]; - if (nsvc_cfg.provider.ip.address_family == AF_INET) { - var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, v4)); - } else { - var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, - nsvc_cfg.provider.ip.local_udp_port, - w_sig, w_user) }; - NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, v6)); - } -} - - - - - /* PCU-originated SNS-SIZE: successful case */ testcase TC_sns_po_size_success() runs on RAW_Test_CT { f_init_ns_codec(mp_nsconfig); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22657 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: I6c404475f39dd00023eb11e98da93ee423604039 Gerrit-Change-Number: 22657 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:19:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:19:34 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22795 ) Change subject: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida979f3b9daa5f7280a629441e4006a7635653b0 Gerrit-Change-Number: 22795 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:19:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:19:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:19:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: fix memory leak of vty_binds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22796 ) Change subject: gprs_ns2_vty: fix memory leak of vty_binds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I100897c32dc152f9acbb322782fae49b1f0bc030 Gerrit-Change-Number: 22796 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:19:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:22:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 16:22:31 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend TLV parser In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 ) Change subject: gb_proxy: extend TLV parser ...................................................................... Patch Set 1: So this commit is only a preparation but not really using the 2nd IE right? -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Gerrit-Change-Number: 22797 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:22:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:36:12 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:36:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:36:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:36:19 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:36:19 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN ...................................................................... gprs_ns2_sns: add timeout to ST_CONFIG_SGSN The state CONFIG_SGSN must be also protected by the timeout Tsns-prov. Related: OS#5355 Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 --- M src/gb/gprs_ns2_sns.c 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index b80a880..e84c79d 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -852,6 +852,7 @@ static void ns2_sns_st_config_bss(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct tlv_parsed *tp = NULL; + struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); switch (event) { case GPRS_SNS_EV_CONFIG_ACK: @@ -861,7 +862,7 @@ gprs_ns2_cause_str(*TLVP_VAL(tp, NS_IE_CAUSE))); /* TODO: What to do? */ } else { - osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, 0, 0); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 3); } break; default: @@ -943,10 +944,11 @@ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); /* start the test procedure on ALL NSVCs! */ gprs_ns2_start_alive_all_nsvcs(nse); - osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 3); + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIGURED, ns_sns_configured_timeout(fi), 4); } else { /* just send CONFIG-ACK */ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); + osmo_timer_schedule(&fi->timer, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 0); } } @@ -1364,13 +1366,21 @@ break; case 2: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { - LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); + LOGPFSML(fi, LOGL_ERROR, "NSE %d: BSS Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2); } break; case 3: + if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { + LOGPFSML(fi, LOGL_ERROR, "NSE %d: SGSN Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + } else { + osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nsi->timeout[NS_TOUT_TSNS_PROV], 3); + } + break; + case 4: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei); osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:37:14 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:37:14 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22795 ) Change subject: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida979f3b9daa5f7280a629441e4006a7635653b0 Gerrit-Change-Number: 22795 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:37:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:37:35 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:37:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: fix memory leak of vty_binds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22796 ) Change subject: gprs_ns2_vty: fix memory leak of vty_binds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I100897c32dc152f9acbb322782fae49b1f0bc030 Gerrit-Change-Number: 22796 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:37:39 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:37:39 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state ...................................................................... gprs_ns2_sns: reset the N of timeout when entering a new state Otherwise retries are splitted between the states. Related: OS#5355 Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be --- M src/gb/gprs_ns2_sns.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index e84c79d..cd0a211 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -727,6 +727,9 @@ /* on a generic failure, the timer callback will recover */ if (old_state != GPRS_SNS_ST_UNCONFIGURED) ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE); + if (old_state != GPRS_SNS_ST_SIZE) + gss->N = 0; + gss->alive = false; ns2_clear_ipv46_entries(gss); @@ -873,6 +876,10 @@ static void ns2_sns_st_config_bss_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + + if (old_state != GPRS_SNS_ST_CONFIG_BSS) + gss->N = 0; + /* Transmit SNS-CONFIG */ switch (gss->ip) { case IPv4: @@ -999,9 +1006,18 @@ } else { /* just send CONFIG-ACK */ ns2_tx_sns_config_ack(gss->sns_nsvc, NULL); + osmo_timer_schedule(&fi->timer, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 0); } } +static void ns2_sns_st_config_sgsn_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) +{ + struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; + + if (old_state != GPRS_SNS_ST_CONFIG_SGSN) + gss->N = 0; +} + static void ns2_sns_st_config_sgsn(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; @@ -1334,6 +1350,7 @@ S(GPRS_SNS_ST_SIZE), .name = "CONFIG_SGSN", .action = ns2_sns_st_config_sgsn, + .onenter = ns2_sns_st_config_sgsn_onenter, }, [GPRS_SNS_ST_CONFIGURED] = { .in_event_mask = S(GPRS_SNS_EV_ADD) | -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:37:39 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:37:39 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22795 ) Change subject: gprs_ns2: rename vty-command ip-sns -> ip-sns-remote ...................................................................... gprs_ns2: rename vty-command ip-sns -> ip-sns-remote In prepration to introduce more commands e.g. ip-sns-bind rename the ip-sns-remote Related: SYS#5354 Change-Id: Ida979f3b9daa5f7280a629441e4006a7635653b0 --- M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index cd0a211..7b28754 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1634,7 +1634,7 @@ /* It's unlikely that an error happens, but let's better be safe. */ if (osmo_sockaddr_str_from_sockaddr(&addr_str, &endpoint->saddr.u.sas) != 0) addr_str = (struct osmo_sockaddr_str) { .ip = "" }; - vty_out(vty, " ip-sns %s %u%s", addr_str.ip, addr_str.port, VTY_NEWLINE); + vty_out(vty, " ip-sns-remote %s %u%s", addr_str.ip, addr_str.port, VTY_NEWLINE); } } diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index a3aa6ee..978c73b 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1201,8 +1201,8 @@ return CMD_SUCCESS; } -DEFUN(cfg_ns_nse_ip_sns, cfg_ns_nse_ip_sns_cmd, - "ip-sns " VTY_IPV46_CMD " <1-65535>", +DEFUN(cfg_ns_nse_ip_sns_remote, cfg_ns_nse_ip_sns_remote_cmd, + "ip-sns-remote " VTY_IPV46_CMD " <1-65535>", "SNS Initial Endpoint\n" "SGSN IPv4 Address\n" "SGSN IPv6 Address\n" "SGSN UDP Port\n" @@ -1273,8 +1273,8 @@ return CMD_WARNING; } -DEFUN(cfg_no_ns_nse_ip_sns, cfg_no_ns_nse_ip_sns_cmd, - "no ip-sns " VTY_IPV46_CMD " <1-65535>", +DEFUN(cfg_no_ns_nse_ip_sns_remote, cfg_no_ns_nse_ip_sns_remote_cmd, + "no ip-sns-remote " VTY_IPV46_CMD " <1-65535>", NO_STR "Delete a SNS Initial Endpoint\n" "SGSN IPv4 Address\n" "SGSN IPv6 Address\n" @@ -1699,8 +1699,8 @@ install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_udp_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_nsvc_ipa_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_ipa_cmd); - install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_cmd); - install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_remote_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_remote_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ida979f3b9daa5f7280a629441e4006a7635653b0 Gerrit-Change-Number: 22795 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:37:39 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 16:37:39 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: fix memory leak of vty_binds In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22796 ) Change subject: gprs_ns2_vty: fix memory leak of vty_binds ...................................................................... gprs_ns2_vty: fix memory leak of vty_binds They never got freed, only removed from the vty_bind queue. Change-Id: I100897c32dc152f9acbb322782fae49b1f0bc030 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 978c73b..3646080 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -128,6 +128,7 @@ return; llist_del(&vbind->list); + talloc_free(vbind); } static struct cmd_node ns_node = { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I100897c32dc152f9acbb322782fae49b1f0bc030 Gerrit-Change-Number: 22796 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 16:54:50 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 16:54:50 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend TLV parser In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 ) Change subject: gb_proxy: extend TLV parser ...................................................................... Patch Set 1: > Patch Set 1: > > So this commit is only a preparation but not really using the 2nd IE right? yes, I will need this for RIM -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Gerrit-Change-Number: 22797 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 16:54:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 17:24:56 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 17:24:56 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Patch Set 3: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/1/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/1/include/osmocom/sgsn/gb_proxy.h at 225 PS1, Line 225: LOGP(SUBSYS, LEVEL, "CELL(%05u/%05u) " FMT, (CELL)->bvci, (CELL)->id.cid, ## ARGS) > is the CI enough to show the cell? I bet no. You should be printing the RAI+CI as "%u-%u-%u-... [?] BVCI should already be unique. But yeah, your format makes more sense. I'd suggest to just remove this change and we'll have it in a separate commit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/2/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671/2/src/gb_proxy.c at 671 PS2, Line 671: > Do we use bvc->raid or the raid from the parameter list here? The old version of this patch used rai [?] The parameter ra_id is definitely the one the BVC reported with its BVC reset. This code leads to an inconsistent state if an existing BVC sends a BVC reset with a different raid than before. However, in line 874 we sort-of fix it up. The cell and bvc ra_ids might be different in that case as well. Let's keep it as it was and worry about it in a separate issue. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 17:24:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 17:34:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 9 Feb 2021 17:34:51 +0000 Subject: Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 to look at the new patch set (#3). Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request ...................................................................... fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request Calling gsm48_cc_tx_release() before mncc_release_ind() has a side effect: the former may change CC state to GSM_CSTATE_RELEASE_REQ. This makes the later send MNCC_REL_CNF instead of MNCC_REL_IND, so if one of the call leg disconnects due to RF failure, the other one will not be terminated correctly. Makes both TC_{mo,mt}_call_clear_request TTCN-3 test cases pass. Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Related: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Related: SYS#5340 --- M src/libmsc/gsm_04_08_cc.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 3 files changed, 10 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/22747/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 17:35:12 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 17:35:12 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend TLV parser In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 ) Change subject: gb_proxy: extend TLV parser ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797/1/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797/1/src/gb_proxy.c at 930 PS1, Line 930: msgb_bcid(msg) = (void *)tp; tp is passed to bssgp_bvc_fsm, but since we only use tp (which is &tp[0]) this should be okay, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Gerrit-Change-Number: 22797 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 17:35:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 17:50:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 9 Feb 2021 17:50:51 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... Patch Set 2: > Patch Set 2: > > I'm still not convinced why this is a good idea. How many of those ACK/NACKs do we need to send per second in order to be optimizing it? Why can additional IEs not be added toa copy? I agree that we don't urgently need this optimization, since OML link is quite silent compared to RSL, and the msgb_copy() approach should also work for the patch on top of it (I5c73e83daad0cea07b9cb674c393e0bfc6268a61). On the other hand, I don't see a reason not to merge this change. We already implement this approach (do-not-free indication) in other places, and doing msgb_copy() whilst it could have been avoided looks sub-optimal to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 09 Feb 2021 17:50:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 18:30:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 18:30:44 +0000 Subject: Change in libosmocore[master]: cosmetic: Move comment one line below in append_gprs_cell_opt References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22798 ) Change subject: cosmetic: Move comment one line below in append_gprs_cell_opt ...................................................................... cosmetic: Move comment one line below in append_gprs_cell_opt Move it above the place where the bit is set, since the bit represents whether Extension Information is available, not whether R99 is available. Change-Id: Ice592acc50a24efd7fe4cf1a91f1d48fd74f38d8 --- M src/gsm/gsm48_rest_octets.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/22798/1 diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c index f45e818..1bab8e0 100644 --- a/src/gsm/gsm48_rest_octets.c +++ b/src/gsm/gsm48_rest_octets.c @@ -906,9 +906,8 @@ bitvec_set_bit(bv, 0); } else { /* extension information */ - - /* R99 extension: */ bitvec_set_bit(bv, 1); + /* R99 extension: */ if (!gco->ext_info.egprs_supported) { /* 6bit length of extension */ bitvec_set_uint(bv, (1 + 5)-1, 6); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ice592acc50a24efd7fe4cf1a91f1d48fd74f38d8 Gerrit-Change-Number: 22798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 18:46:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 18:46:44 +0000 Subject: Change in osmo-bsc[master]: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22799 ) Change subject: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS ...................................................................... SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS The EGPRS bits are anyway conditionally enabled by egprs_supported. Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/22799/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 094c35e..fae1355 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1296,10 +1296,10 @@ switch (bts->gprs.mode) { case BTS_GPRS_EGPRS: - si13_default.cell_opts.ext_info_present = 1; si13_default.cell_opts.ext_info.egprs_supported = 1; /* fallthrough */ case BTS_GPRS_GPRS: + si13_default.cell_opts.ext_info_present = 1; si_info.gprs_ind.present = 1; break; case BTS_GPRS_NONE: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 Gerrit-Change-Number: 22799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 18:52:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 18:52:59 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... gsm: Introduce API osmo_gsm48_rest_octets_si13_decode Related: SYS#5358 Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb --- M include/osmocom/gsm/gsm48_rest_octets.h M src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 3 files changed, 131 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22800/1 diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h index 8f143be..f295824 100644 --- a/include/osmocom/gsm/gsm48_rest_octets.h +++ b/include/osmocom/gsm/gsm48_rest_octets.h @@ -120,7 +120,8 @@ uint8_t prio_acc_thr; }; -/* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ +/* Parse/Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ +int osmo_gsm48_rest_octets_si13_decode(struct osmo_gsm48_si13_info *si13, const uint8_t *data); int osmo_gsm48_rest_octets_si13_encode(uint8_t *data, const struct osmo_gsm48_si13_info *si13); /* Parse SI3 Rest Octets */ diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c index 1bab8e0..79ee0d9 100644 --- a/src/gsm/gsm48_rest_octets.c +++ b/src/gsm/gsm48_rest_octets.c @@ -749,6 +749,134 @@ return bv.data_len; } + +static int decode_t3192(unsigned int t3192) +{ + /* See also 3GPP TS 44.060 + Table 12.24.2: GPRS Cell Options information element details */ + + switch (t3192) { + case 0: return 500; + case 1: return 1000; + case 2: return 1500; + case 3: return 0; + case 4: return 80; + case 5: return 120; + case 6: return 160; + case 7: return 200; + default: + OSMO_ASSERT(t3192 <= 7); + return 0; + } +} + +static int decode_drx_timer(unsigned int drx) +{ + switch (drx) { + case 0: return 0; + case 1: return 1; + case 2: return 2; + case 3: return 4; + case 4: return 8; + case 5: return 16; + case 6: return 32; + case 7: return 64; + default: + OSMO_ASSERT(drx <= 7); + return 0; + } +} + +static void decode_gprs_cell_opt(struct osmo_gprs_cell_options *gco, struct bitvec *bv) +{ + gco->nmo = bitvec_get_uint(bv, 2); + gco->t3168 = (bitvec_get_uint(bv, 3) + 1) * 500; + gco->t3192 = decode_t3192(bitvec_get_uint(bv, 3)); + gco->drx_timer_max = decode_drx_timer(bitvec_get_uint(bv, 3)); + + /* ACCESS_BURST_TYPE: */ + bitvec_get_uint(bv, 1); + /* CONTROL_ACK_TYPE: */ + gco->ctrl_ack_type_use_block = bitvec_get_uint(bv, 1); + gco->bs_cv_max = bitvec_get_uint(bv, 4); + + if (bitvec_get_uint(bv, 1)) { + bitvec_get_uint(bv, 3); /* DEC */ + bitvec_get_uint(bv, 3); /* INC */ + bitvec_get_uint(bv, 3); /* MAX */ + } + + if (bitvec_get_uint(bv, 1)) { + uint8_t ext_len = bitvec_get_uint(bv, 6); + unsigned int cur_bit = bv->cur_bit; + /* Extension Information */ + /* R99 extension: */ + gco->ext_info.egprs_supported = bitvec_get_uint(bv, 1); + if (gco->ext_info.egprs_supported) { + gco->ext_info.use_egprs_p_ch_req = !bitvec_get_uint(bv, 1); + gco->ext_info.bep_period = bitvec_get_uint(bv, 4); + } + gco->ext_info.pfc_supported = bitvec_get_uint(bv, 1); + gco->ext_info.dtm_supported = bitvec_get_uint(bv, 1); + gco->ext_info.bss_paging_coordination = bitvec_get_uint(bv, 1); + /* REL-4 extension: */ + gco->ext_info.ccn_active = bitvec_get_uint(bv, 1); + bitvec_get_uint(bv, 1); /* NW_EXT_UTBF */ + bv->cur_bit = cur_bit + ext_len + 1; + } +} + +static void decode_gprs_pwr_ctrl_pars(struct osmo_gprs_power_ctrl_pars *pcp, struct bitvec *bv) +{ + pcp->alpha = bitvec_get_uint(bv, 4); + pcp->t_avg_w = bitvec_get_uint(bv,5); + pcp->t_avg_t = bitvec_get_uint(bv, 5); + pcp->pc_meas_chan = bitvec_get_uint(bv, 1); + pcp->n_avg_i = bitvec_get_uint(bv, 4); +} + +/*! Decode SI13 Rest Octests (04.08 Chapter 10.5.2.37b). + * \param[out] si13 decoded SI13 rest octets + * \param[in] encoded SI13 rest octets +* \returns parsed bits on success, negative on error */ +int osmo_gsm48_rest_octets_si13_decode(struct osmo_gsm48_si13_info *si13, const uint8_t *data) +{ + struct osmo_gprs_cell_options *co = &si13->cell_opts; + struct osmo_gprs_power_ctrl_pars *pcp = &si13->pwr_ctrl_pars; + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = (uint8_t *) data; + bv.data_len = 20; + + memset(si13, 0, sizeof(*si13)); + + + if (bitvec_get_bit_high(&bv) == H) { + si13->bcch_change_mark = bitvec_get_uint(&bv, 3); + si13->si_change_field = bitvec_get_uint(&bv, 4); + if (bitvec_get_uint(&bv, 1)) { + si13->bcch_change_mark = bitvec_get_uint(&bv, 2); + /* FIXME: implement parsing GPRS Mobile Allocation IE */ + return -1; + } + if (bitvec_get_uint(&bv, 1)) { + /* PBCCH present in cell */ + /* FIXME: parse not implemented */ + return -1; + } else { + /* PBCCH not present in cell */ + si13->rac = bitvec_get_uint(&bv, 8); + si13->spgc_ccch_sup = bitvec_get_uint(&bv, 1); + si13->prio_acc_thr = bitvec_get_uint(&bv, 3); + si13->net_ctrl_ord = bitvec_get_uint(&bv, 2); + decode_gprs_cell_opt(co, &bv); + decode_gprs_pwr_ctrl_pars(pcp, &bv); + } + } + return bv.cur_bit; +} + /* GPRS Mobile Allocation as per TS 04.60 Chapter 12.10a: < GPRS Mobile Allocation IE > ::= < HSN : bit (6) > diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index efa23e6..0ea0678 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -320,6 +320,7 @@ osmo_gsm48_rest_octets_si6_encode; osmo_gsm48_rest_octets_si3_encode; osmo_gsm48_rest_octets_si4_encode; +osmo_gsm48_rest_octets_si13_decode; osmo_gsm48_rest_octets_si13_encode; osmo_gsm48_rest_octets_si3_decode; osmo_gsm48_rest_octets_si4_decode; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 18:53:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 18:53:09 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Use ALPHA value received in SI13 from PCUIF The old VTY command is marked as deprecated and still overrides the use in case it's used. Related: SYS#5358 Depends: libosmocore.git Change-Id I74fb0a3afc1ac4aadbfc609b882d929401f790eb Depends: osmo-bsc.git Change-Id I8b97ea11bad5fe05f2f634945b5703ee9abde81d Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 --- M doc/examples/osmo-pcu.cfg M doc/manuals/chapters/configuration.adoc M src/bts.cpp M src/bts.h M src/gprs_pcu.c M src/gprs_pcu.h M src/pcu_l1_if.cpp M src/pcu_vty.c M src/tbf.cpp M tests/emu/pcu_emu.cpp 10 files changed, 40 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/22801/1 diff --git a/doc/examples/osmo-pcu.cfg b/doc/examples/osmo-pcu.cfg index b88e6e7..4a3842d 100644 --- a/doc/examples/osmo-pcu.cfg +++ b/doc/examples/osmo-pcu.cfg @@ -2,5 +2,4 @@ flow-control-interval 10 cs 2 alloc-algorithm dynamic - alpha 0 gamma 0 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 01e4d65..5cb21ba 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -15,14 +15,12 @@ flow-control-interval 10 <1> cs 2 <2> alloc-algorithm dynamic <3> - alpha 0 <4> gamma 0 ---- <1> send a BSSGP flow-control PDU every 10 seconds <2> start a TBF with the initial coding scheme 2 <3> dynamically chose between single-slot or multi-slot TBF allocations depending on system load -<4> disable MS power control loop However, there are plenty of tuning parameters for people interested to optimize PCU throughput or latency according to their requirements. @@ -212,13 +210,12 @@ You can set those parameters at the `pcu` VTY config node as follows: -`alpha <0-10>`:: - Alpha parameter for MS power control in units of 0.1. - Make sure to set the alpha value at System Information 13 (in - the BSC), too! `gamma <0-62>`:: Set the gamma parameter for MS power control in units of dB. +Parameter `ALPHA` is set on the BSC VTY configuration file on a per-BTS basis, +and forwarded by OsmoPCU to the MS through the SI13 received from the former +over PCUIF. === Configuring Network Assisted Cell Change (NACC) diff --git a/src/bts.cpp b/src/bts.cpp index fb7de64..11aef3f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -918,7 +918,7 @@ plen = Encoding::write_immediate_assignment( &bts->trx[trx_no].pdch[ts_no], tbf, bv, false, rip->ra, Fn, ta, usf, false, sb_fn, - bts->pcu->vty.alpha, bts->pcu->vty.gamma, -1, + bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, rip->burst_type); bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); } @@ -999,7 +999,7 @@ tbf, immediate_assignment, true, 125, (tbf->pdch[ts_no]->last_rts_fn + 21216) % GSM_MAX_FN, tbf->ta(), 7, poll, tbf->poll_fn, - bts->pcu->vty.alpha, bts->pcu->vty.gamma, -1, + bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, GSM_L1_BURST_TYPE_ACCESS_0); if (plen >= 0) { bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF); @@ -1292,3 +1292,14 @@ { return bts_ms_store(bts)->ms_list(); } + +uint8_t bts_get_ms_pwr_alpha(const struct gprs_rlcmac_bts *bts) +{ + if (bts->pcu->vty.force_alpha != (uint8_t)-1) + return bts->pcu->vty.force_alpha; + if (bts->si13_is_set) + return bts->si31_ro_decoded.pwr_ctrl_pars.alpha; + /* default if no SI13 is received yet: closed loop control, TS 44.060 + * B.2 Closed loop control */ + return 0; +} diff --git a/src/bts.h b/src/bts.h index e67668c..90367ac 100644 --- a/src/bts.h +++ b/src/bts.h @@ -35,6 +35,7 @@ #include #include #include +#include #include #include "mslot_class.h" #include "gsm_rlcmac.h" @@ -224,6 +225,7 @@ uint8_t si3[GSM_MACBLOCK_LEN]; bool si3_is_set; uint8_t si13[GSM_MACBLOCK_LEN]; + struct osmo_gsm48_si13_info si31_ro_decoded; bool si13_is_set; /* State for dynamic algorithm selection */ @@ -346,6 +348,7 @@ void bts_set_max_mcs_ul(struct gprs_rlcmac_bts *bts, uint8_t mcs_ul); bool bts_cs_dl_is_supported(const struct gprs_rlcmac_bts *bts, enum CodingScheme cs); const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts); +uint8_t bts_get_ms_pwr_alpha(const struct gprs_rlcmac_bts *bts); #ifdef __cplusplus } #endif diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index 554007e..52e9825 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -65,7 +65,7 @@ pcu->vty.max_cs_dl = MAX_GPRS_CS; pcu->vty.max_mcs_ul = MAX_EDGE_MCS; pcu->vty.max_mcs_dl = MAX_EDGE_MCS; - pcu->vty.alpha = 0; /* a = 0.0 */ + pcu->vty.force_alpha = (uint8_t)-1; /* don't force by default, use BTS SI13 provided value */ pcu->vty.dl_tbf_preemptive_retransmission = true; /* By default resegmentation is supported in DL can also be configured * through VTY */ diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h index 9f75fb8..76e3937 100644 --- a/src/gprs_pcu.h +++ b/src/gprs_pcu.h @@ -90,7 +90,7 @@ uint8_t max_cs_dl, max_cs_ul; uint8_t max_mcs_dl, max_mcs_ul; uint8_t force_two_phase; - uint8_t alpha, gamma; + uint8_t force_alpha, gamma; bool dl_tbf_preemptive_retransmission; enum egprs_arq_type dl_arq_type; /* EGPRS_ARQ1 to support resegmentation in DL, EGPRS_ARQ2 for no reseg */ bool cs_adj_enabled; /* whether cs_adj_{upper,lower}_limit are used to adjust DL CS */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 9873469..803f513 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include } @@ -291,6 +292,7 @@ static int pcu_rx_data_ind_bcch(struct gprs_rlcmac_bts *bts, uint8_t *data, uint8_t len) { + const uint8_t *si_ro; switch (len) { case 0: /* Due to historical reasons also accept a completely empty message as @@ -337,6 +339,9 @@ case GSM48_MT_RR_SYSINFO_13: memcpy(bts->si13, data, GSM_MACBLOCK_LEN); bts->si13_is_set = true; + si_ro = ((struct gsm48_system_information_type_13*)data)->rest_octets; + if (osmo_gsm48_rest_octets_si13_decode(&bts->si31_ro_decoded, si_ro) < 0) + LOGP(DPCU, LOGL_ERROR, "Error decoding SI13\n"); break; default: LOGP(DL1IF, LOGL_ERROR, diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 6db8b05..7e9a75a 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -230,7 +230,8 @@ vty_out(vty, " alloc-algorithm dynamic%s", VTY_NEWLINE); if (the_pcu->vty.force_two_phase) vty_out(vty, " two-phase-access%s", VTY_NEWLINE); - vty_out(vty, " alpha %d%s", the_pcu->vty.alpha, VTY_NEWLINE); + if (the_pcu->vty.force_alpha != (uint8_t)-1) + vty_out(vty, " alpha %u%s", the_pcu->vty.force_alpha, VTY_NEWLINE); vty_out(vty, " gamma %d%s", the_pcu->vty.gamma * 2, VTY_NEWLINE); if (!the_pcu->vty.dl_tbf_preemptive_retransmission) vty_out(vty, " no dl-tbf-preemptive-retransmission%s", VTY_NEWLINE); @@ -730,13 +731,19 @@ DEFUN_ATTR(cfg_pcu_alpha, cfg_pcu_alpha_cmd, - "alpha <0-10>", + "alpha (si13|<0-10>)", "Alpha parameter for MS power control in units of 0.1 (see TS 05.08) " "NOTE: Be sure to set Alpha value at System information 13 too.\n" - "Alpha in units of 0.1\n", - CMD_ATTR_IMMEDIATE) + "Use value received from BSC in System Intormation 13 (default)\n" + "Force Alpha in units of 0.1\n", + CMD_ATTR_IMMEDIATE | CMD_ATTR_DEPRECATED) { - the_pcu->vty.alpha = atoi(argv[0]); + vty_out(vty, "%% 'alpha <0-10>' is now deprecated: use osmo-bsc's 'gprs power-control alpha <0-10>' instead%s", + VTY_NEWLINE); + if (strcmp(argv[0], "si13") == 0) + the_pcu->vty.force_alpha = (uint8_t) -1; + else + the_pcu->vty.force_alpha = atoi(argv[0]); return CMD_SUCCESS; } diff --git a/src/tbf.cpp b/src/tbf.cpp index 7caa2ce..1885927 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -930,7 +930,7 @@ Encoding::write_packet_downlink_assignment(mac_control_block, old_tfi_is_valid, m_tfi, (direction == GPRS_RLCMAC_DL_TBF), new_dl_tbf, poll_ass_dl, rrbp, - the_pcu->vty.alpha, the_pcu->vty.gamma, -1, 0, + bts_get_ms_pwr_alpha(new_dl_tbf->bts), the_pcu->vty.gamma, -1, 0, is_egprs_enabled()); LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++\n"); rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block); @@ -1033,7 +1033,7 @@ mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t); Encoding::write_packet_uplink_assignment(mac_control_block, m_tfi, (direction == GPRS_RLCMAC_DL_TBF), tlli(), - is_tlli_valid(), new_tbf, 1, rrbp, the_pcu->vty.alpha, + is_tlli_valid(), new_tbf, 1, rrbp, bts_get_ms_pwr_alpha(new_tbf->bts), the_pcu->vty.gamma, -1, is_egprs_enabled()); LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n"); diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index ef573a7..0f2d305 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -77,7 +77,6 @@ if (!pcu->alloc_algorithm) pcu->alloc_algorithm = alloc_algorithm_b; pcu->vty.fc_interval = 100; - pcu->vty.alpha = 0; /* a = 0.0 */ } static void bvci_unblocked(struct gprs_bssgp_pcu *pcu) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 18:58:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 9 Feb 2021 18:58:38 +0000 Subject: Change in osmo-bsc[master]: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22799 ) Change subject: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS ...................................................................... Patch Set 1: Code-Review+2 You may probably need to adjust 'SystemInformationConfig_default' in ttcn-bsc-test. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 Gerrit-Change-Number: 22799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 09 Feb 2021 18:58:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:07:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 9 Feb 2021 19:07:49 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/doc/manuals/chapters/configuration.adoc File doc/manuals/chapters/configuration.adoc: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/doc/manuals/chapters/configuration.adoc at 216 PS1, Line 216: Parameter `ALPHA` is set on the BSC VTY configuration file on a per-BTS basis, Please also clarify here that presence of 'alpha <0-10>' in the config file makes osmo-pcu ignore the value received from the BSC. Some users tend to ignore deprecation warnings... https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c at 234 PS1, Line 234: vty_out(vty, " alpha %u%s", the_pcu->vty.force_alpha, VTY_NEWLINE); code formatting https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c at 746 PS1, Line 746: the_pcu->vty.force_alpha = atoi(argv[0]); How about printing a warning that presence of 'alpha <0-10>' in the configuration file makes osmo-pcu ignore the value received from the BSC? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 09 Feb 2021 19:07:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:27:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 19:27:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: Implement SystemInformation13 Rest Octets types References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 ) Change subject: WIP: Implement SystemInformation13 Rest Octets types ...................................................................... WIP: Implement SystemInformation13 Rest Octets types Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 --- M bsc/BSC_Tests.ttcn M library/GSM_RestOctets.ttcn M library/GSM_SystemInformation.ttcn 3 files changed, 41 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/22802/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 52b4906..e2c17e6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -165,8 +165,7 @@ SI2quaterRestOctetsList si2quater optional, SystemInformationType3 si3 optional, SystemInformationType4 si4 optional, - /* TODO: replace with proper decoding of SI13, implement SI13 in GSM_SystemInformation.ttcn */ - octetstring si13 optional, + SystemInformationType13 si13 optional, SystemInformationType5 si5 optional, SystemInformationType5bis si5bis optional, SystemInformationType5ter si5ter optional, @@ -371,7 +370,9 @@ s := omit } }, - si13 := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O, + si13 := { + rest_octets := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O + }, si5 := { bcch_freq_list := '10000000000000000000000000000000'O }, diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index d47e510..ec817eb 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -692,6 +692,30 @@ variant "PADDING(yes), PADDING_PATTERN('00101011'B)" }; +/* 10.5.2.37b SI 13 Rest Octets (O & S) */ +type record SI13RestOctets { + BIT1 presence, // L/H + + + SelectionParamsOpt sel_params, + PowerOffsetOpt pwr_offset, + GPRSIndicatorOpt gprs_ind, + BIT1 s_presence, // L/H + /* TODO: optional "Rest Octets S" part */ + bitstring s optional +} with { + + variant (presence) "CSN.1 L/H" + + + variant (s_presence) "CSN.1 L/H" + variant (s) "PRESENCE(s_presence = '1'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + /* Selection Parameters */ type record SelectionParams { boolean cbq, @@ -777,6 +801,11 @@ external function dec_SI4RestOctets(in octetstring stream) return SI4RestOctets with { extension "prototype(convert) decode(RAW)" }; +external function enc_SI13RestOctets(in SI13RestOctets ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_SI13RestOctets(in octetstring stream) return SI13RestOctets + with { extension "prototype(convert) decode(RAW)" }; + /* Basic templates to be extended in place */ template (value) SI3RestOctets ts_SI3RestOctets := { diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 85abb7f..86ff817 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -160,7 +160,7 @@ rach_control := ?, rest_octets := ? }; - + /* 44.018 9.1.36 */ type record SystemInformationType4 { @@ -196,6 +196,11 @@ RestOctets rest_octets length(0..7) } with { variant "" }; + /* 44.018 9.1.43a */ + type record SystemInformationType13 { + SI13RestOctets rest_octets + } with { variant "" }; + type union SystemInformationUnion { SystemInformationType1 si1, SystemInformationType2 si2, @@ -208,6 +213,7 @@ SystemInformationType5bis si5bis, SystemInformationType5ter si5ter, SystemInformationType6 si6, + SystemInformationType13 si13, octetstring other } with { variant "" }; @@ -225,6 +231,7 @@ si5bis, header.message_type = SYSTEM_INFORMATION_TYPE_5bis; si5ter, header.message_type = SYSTEM_INFORMATION_TYPE_5ter; si6, header.message_type = SYSTEM_INFORMATION_TYPE_6; + si13, header.message_type = SYSTEM_INFORMATION_TYPE_13; other, OTHERWISE; )" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:29:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 9 Feb 2021 19:29:28 +0000 Subject: Change in libosmocore[master]: cosmetic: Move comment one line below in append_gprs_cell_opt In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22798 ) Change subject: cosmetic: Move comment one line below in append_gprs_cell_opt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ice592acc50a24efd7fe4cf1a91f1d48fd74f38d8 Gerrit-Change-Number: 22798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 09 Feb 2021 19:29:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:29:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 19:29:56 +0000 Subject: Change in osmo-bsc[master]: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22799 ) Change subject: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS ...................................................................... Patch Set 1: Code-Review-1 Indeed, SI13 rest octets in osmo-ttcn3-hacks is a hardcoded octetstring. I started adding support for it here: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 I'm marking it with -1 until I submit a related osmo-ttcn3-hacks patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 Gerrit-Change-Number: 22799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 19:29:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:36:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 19:36:35 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend TLV parser In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 ) Change subject: gb_proxy: extend TLV parser ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Gerrit-Change-Number: 22797 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 19:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:39:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 9 Feb 2021 19:39:35 +0000 Subject: Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22747 ) Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/22747/3/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/c/osmo-msc/+/22747/3/src/libmsc/gsm_04_08_cc.c at 276 PS3, Line 276: if (trans->cc.mncc_initiated) { I would also add a comment stating why this must be here and not below. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 19:39:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 19:47:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 9 Feb 2021 19:47:53 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... Patch Set 1: (5 comments) Would be also nice to have a unit test given that we already have the encoding function. https://gerrit.osmocom.org/c/libosmocore/+/22800/1/src/gsm/gsm48_rest_octets.c File src/gsm/gsm48_rest_octets.c: https://gerrit.osmocom.org/c/libosmocore/+/22800/1/src/gsm/gsm48_rest_octets.c at 758 PS1, Line 758: switch (t3192) { Let's better use a lookup table here, it's only 8 elements in total... https://gerrit.osmocom.org/c/libosmocore/+/22800/1/src/gsm/gsm48_rest_octets.c at 775 PS1, Line 775: switch (drx) { Same here, use lookup table. Furthermore, you would not even need separate functions for that. https://gerrit.osmocom.org/c/libosmocore/+/22800/1/src/gsm/gsm48_rest_octets.c at 797 PS1, Line 797: /* ACCESS_BURST_TYPE: */ add FIXME? https://gerrit.osmocom.org/c/libosmocore/+/22800/1/src/gsm/gsm48_rest_octets.c at 861 PS1, Line 861: -1 -ENOTSUPP? https://gerrit.osmocom.org/c/libosmocore/+/22800/1/src/gsm/gsm48_rest_octets.c at 866 PS1, Line 866: return -1; -ENOTSUPP? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 09 Feb 2021 19:47:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 22:02:01 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 22:02:01 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 to look at the new patch set (#4). Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc pass raid and cell id directly as parameter to gbproxy_cell_alloc so that we do not need to fill tas parameter to gbproxy_cell_alloc so that we do not need to fill the struct members later. Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/71/22671/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 22:02:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 22:02:02 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend logging macro to log BVCI and Cell ID References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22803 ) Change subject: gb_proxy: extend logging macro to log BVCI and Cell ID ...................................................................... gb_proxy: extend logging macro to log BVCI and Cell ID At the moment we are logging cells by the BVCI, which is already unique, but since we store the cell id now as well we should display the cell id as well. Change-Id: I11b8fa322f143c6ef7fee36c12cb106a0b4c5f70 Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/03/22803/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index a36f305..466444e 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -227,7 +227,7 @@ LOGPBVC_CAT(BVC, DGPRS, LEVEL, FMT, ## ARGS) #define LOGPCELL_CAT(CELL, SUBSYS, LEVEL, FMT, ARGS...) \ - LOGP(SUBSYS, LEVEL, "CELL(%05u) " FMT, (CELL)->bvci, ## ARGS) + LOGP(SUBSYS, LEVEL, "CELL(%05u/%05u) " FMT, (CELL)->bvci, (CELL)->id.cid, ## ARGS) #define LOGPCELL(CELL, LEVEL, FMT, ARGS...) \ LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I11b8fa322f143c6ef7fee36c12cb106a0b4c5f70 Gerrit-Change-Number: 22803 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 22:02:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 9 Feb 2021 22:02:02 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 ) Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... gb_proxy: add support for relaying BSSGP RIM messages BSSGP RIM messages are routed from a source to a destination cell by a RIM routing information IE. Add parsing for the routing information and support for relaying RIM messages to the destination cell/PCU. If the destination cell/PCU is not directly connected to osmo-gbproxy route the rim message to the first connected SGSN. Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 126 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/04/22804/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index f773584..907a6eb 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -887,6 +888,82 @@ return 0; } +/* Receive an incoming RIM message from a BSS-side NS-VC */ +static int gbprox_rx_rim_from_bss(struct tlv_parsed *tp, struct gbproxy_nse *nse, struct msgb *msg, char *log_pfx, + const char *pdut_name) +{ + struct gbproxy_sgsn *sgsn; + struct gbproxy_cell *dest_cell; + struct gbproxy_cell *src_cell; + struct bssgp_rim_routing_info dest_ri; + struct bssgp_rim_routing_info src_ri; + int rc; + + rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + + /* Since gbproxy is 2G only we do not expect to get RIM messages only from GERAN cells. */ + if (src_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { + LOGP(DGPRS, LOGL_ERROR, "%s %s source RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&src_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* Lookup source cell to make sure that the source RIM routing information actually belongs + * to a valid cell that we know */ + src_cell = gbproxy_cell_by_cellid(nse->cfg, &src_ri.geran.raid, src_ri.geran.cid); + if (!src_cell) { + LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for source RIM routing info (%s)\n", log_pfx, + pdut_name, bssgp_rim_ri_name(&src_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* TODO: Use bssgp_bvc_get_features_negotiated(src_cell->bss_bvc->fi) to check if the the BSS sided BVC actually + * did negotiate RIM support. If not we should respond with a BSSGP STATUS message. The cause code should be + * BSSGP_CAUSE_PDU_INCOMP_FEAT. */ + + /* If Destination is known by gbproxy, route directly */ + if (dest_ri.discr == BSSGP_RIM_ROUTING_INFO_GERAN) { + dest_cell = gbproxy_cell_by_cellid(nse->cfg, &dest_ri.geran.raid, dest_ri.geran.cid); + if (dest_cell) { + /* TODO: Also check if dest_cell->bss_bvc is RIM-capable (see also above). If not we shoud + * respond with a BSSGP STATUS message as well because it also would make no sense to try + * routing the RIM message to the next RIM-capable SGSN. */ + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); + } + LOGP(DGPRS, LOGL_NOTICE, + "%s %s cannot find cell for destination RIM routing info (%s), will try to route to any RIM capable SGSN instead.\n", + log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri)); + } + + /* Otherwise pass on to a RIM-capable SGSN */ + /* TODO: We need to extend gbproxy_select_sgsn() so that it selects a RIM-capable SGSN, at the moment we just + * get any SGSN and just assume that it is RIM-capable. */ + sgsn = gbproxy_select_sgsn(nse->cfg, NULL); + if (!sgsn) { + LOGP(DGPRS, LOGL_NOTICE, + "%s %s cannot route RIM message (%s to %s) since no RIM capable SGSN is found!\n", log_pfx, + pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + + return gbprox_relay2nse(msg, sgsn->nse, 0); +} + /* Receive an incoming signalling message from a BSS-side NS-VC */ static int gbprox_rx_sig_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -985,8 +1062,7 @@ case BSSGP_PDUT_RAN_INFO_ACK: case BSSGP_PDUT_RAN_INFO_ERROR: case BSSGP_PDUT_RAN_INFO_APP_ERROR: - /* FIXME: route based in RIM Routing IE */ - rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); + rc = gbprox_rx_rim_from_bss(tp, nse, msg, log_pfx, pdut_name); break; case BSSGP_PDUT_LLC_DISCARD: case BSSGP_PDUT_FLUSH_LL_ACK: @@ -1135,6 +1211,53 @@ return 0; } +/* Receive an incoming RIM message from the SGSN-side NS-VC */ +static int gbprox_rx_rim_from_sgsn(struct tlv_parsed *tp, struct gbproxy_nse *nse, struct msgb *msg, char *log_pfx, + const char *pdut_name) +{ + struct gbproxy_cell *dest_cell; + struct bssgp_rim_routing_info dest_ri; + struct bssgp_rim_routing_info src_ri; + int rc; + + rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + + /* Since gbproxy is 2G only we do not expect to get RIM messages that target GERAN cells. */ + if (dest_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { + LOGP(DGPRS, LOGL_ERROR, "%s %s destination RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&dest_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in + gbprox_rx_rim_from_bss() */ + + /* Lookup destination cell */ + dest_cell = gbproxy_cell_by_cellid(nse->cfg, &dest_ri.geran.raid, dest_ri.geran.cid); + if (!dest_cell) { + LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for destination RIM routing info (%s)\n", log_pfx, + pdut_name, bssgp_rim_ri_name(&dest_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* TODO: Check if the BVC of the destination cell actually did negotiate RIM support, see also comments + * in gbprox_rx_rim_from_bss() */ + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); +} + /* Receive an incoming signalling message from the SGSN-side NS-VC */ static int gbprox_rx_sig_from_sgsn(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -1287,9 +1410,7 @@ case BSSGP_PDUT_RAN_INFO_ACK: case BSSGP_PDUT_RAN_INFO_ERROR: case BSSGP_PDUT_RAN_INFO_APP_ERROR: - /* FIXME: route based in RIM Routing IE */ - rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); - break; + rc = gbprox_rx_rim_from_sgsn(tp, nse, msg, log_pfx, pdut_name); default: LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 22:11:20 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 22:11:20 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 22:11:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 22:20:12 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 22:20:12 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend logging macro to log BVCI and Cell ID In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22803 ) Change subject: gb_proxy: extend logging macro to log BVCI and Cell ID ...................................................................... Patch Set 1: Code-Review-1 I'd say worry about this after RIM since getting that done is high priority. In general I think Pau is right: we should log mcc, mnc, lac, rac, cid preferably in a uniform and concise way across the code. We already do something similar in gb_proxy_ctrl.c (omitting cid), but maybe we want to think more about the format (%03u instead of %u for mcc/mnc, %04x for cid)... -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I11b8fa322f143c6ef7fee36c12cb106a0b4c5f70 Gerrit-Change-Number: 22803 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 09 Feb 2021 22:20:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 22:44:39 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 9 Feb 2021 22:44:39 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 ) Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... Patch Set 1: (8 comments) A few minor nitpicks/log suggestions, but nothing major. Overall I think it's pretty far along to being merge-able. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 931 PS1, Line 931: /* TODO: Use bssgp_bvc_get_features_negotiated(src_cell->bss_bvc->fi) to check if the the BSS sided BVC actually When this is implemented it should be done as first step. So move this comment to the beginning of or even before the call to this function. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 939 PS1, Line 939: shoud should https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 942 PS1, Line 942: LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, Could you vary the log lines so they indicate which path is taken? "relaying RIM-PDU BSS->BSS" https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 946 PS1, Line 946: LOGP(DGPRS, LOGL_NOTICE, I don't think we need this log at all and if we do it should be DEBUG. A GERAN destination could just as easily be connected to the SGSN directly (or to a different gbproxy) so this is not an abnormal condition. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 961 PS1, Line 961: LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, "relaying RIM-PDU to SGSN(%05u/%s) "..., sgsn->nse->nsei, sgsn->name https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 1236 PS1, Line 1236: target GERAN "target non-GERAN cells" https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 1243 PS1, Line 1243: /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in When this is implemented it should be done as first step. So move this comment to the beginning of or even before the call to this function. https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 1256 PS1, Line 1256: LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, "relaying RIM-PDU from SGSN(%05u/%s) " ... -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-Comment-Date: Tue, 09 Feb 2021 22:44:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 9 23:39:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 9 Feb 2021 23:39:13 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 09 Feb 2021 23:39:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 10 02:36:16 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 10 Feb 2021 02:36:16 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602346bd96c98_34d62ab3609cc5f0736029@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 130s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 130s] [COMPILING libboard/qmod/source/card_pres.c] [ 130s] [COMPILING libboard/qmod/source/wwan_led.c] [ 130s] [COMPILING libboard/qmod/source/i2c.c] [ 130s] [COMPILING libboard/qmod/source/board_qmod.c] [ 131s] [COMPILING apps/dfu/main.c] [ 131s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 131s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 131s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 131s] Memory region Used Size Region Size %age Used [ 131s] rom: 16588 B 16 KB 101.25% [ 131s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 131s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 131s] collect2: error: ld returned 1 exit status [ 131s] % [ 131s] make[2]: *** [Makefile:234: flash] Error 1 [ 131s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 131s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 131s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 131s] dh_auto_build: error: make -j1 returned exit code 2 [ 131s] make: *** [debian/rules:16: build] Error 25 [ 131s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 131s] ### VM INTERACTION START ### [ 134s] [ 115.479389] sysrq: Power Off [ 134s] [ 115.486345] reboot: Power down [ 134s] ### VM INTERACTION END ### [ 134s] [ 134s] goat03 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 10 02:35:59 UTC 2021. [ 134s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 10 02:37:07 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 10 Feb 2021 02:37:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602346dbbe5d1_34d62ab3609cc5f0736356@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 178s] [COMPILING apps/dfu/main.c] [ 178s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 178s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 178s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 179s] Memory region Used Size Region Size %age Used [ 179s] rom: 16580 B 16 KB 101.20% [ 179s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 179s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 179s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 179s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 179s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 179s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 179s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 179s] collect2: error: ld returned 1 exit status [ 179s] % [ 179s] make[2]: *** [Makefile:234: flash] Error 1 [ 179s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 179s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 179s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 179s] dh_auto_build: error: make -j1 returned exit code 2 [ 179s] make: *** [debian/rules:16: build] Error 25 [ 179s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 179s] ### VM INTERACTION START ### [ 182s] [ 163.727817] sysrq: Power Off [ 182s] [ 163.749517] reboot: Power down [ 182s] ### VM INTERACTION END ### [ 182s] [ 182s] lamb62 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 10 02:36:52 UTC 2021. [ 182s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 10 08:10:27 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 10 Feb 2021 08:10:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_10/armv7l In-Reply-To: References: Message-ID: <6023950e9ab55_34d62ab3609cc5f08021b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_10/armv7l Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: connect to src-opensuse:5353: Connection timed out (worker was obs-arm-5:8) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 10 08:26:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 08:26:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update SCCP dependency References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22805 ) Change subject: deps/Makefile: Update SCCP dependency ...................................................................... deps/Makefile: Update SCCP dependency * upstream has merged all two Osmocom patches * we can now switch back to the official repo instead of our fork Change-Id: Ia9bc82db4c0814b06c55460d2123b5e4fa1a2335 --- M deps/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/22805/1 diff --git a/deps/Makefile b/deps/Makefile index 507306b..c5fd338 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -44,6 +44,7 @@ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolEmulations.M3UA \ + titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.GRE \ titan.ProtocolModules.M2PA \ titan.ProtocolModules.ROSE \ @@ -64,7 +65,6 @@ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ titan.TestPorts.UDPasp \ - titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.BSSGP_v13.0.0 OSMOGIT_REPOS= titan.ProtocolModules.MAP \ @@ -80,7 +80,7 @@ # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba +titan.ProtocolEmulations.SCCP_commit= R.7.A-10-g2ca1566 titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= master -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22805 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: Ia9bc82db4c0814b06c55460d2123b5e4fa1a2335 Gerrit-Change-Number: 22805 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 08:28:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 08:28:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update SCCP dependency In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22805 ) Change subject: deps/Makefile: Update SCCP dependency ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22805 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: Ia9bc82db4c0814b06c55460d2123b5e4fa1a2335 Gerrit-Change-Number: 22805 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 08:28:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 08:28:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 08:28:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps/Makefile: Update SCCP dependency In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22805 ) Change subject: deps/Makefile: Update SCCP dependency ...................................................................... deps/Makefile: Update SCCP dependency * upstream has merged all two Osmocom patches * we can now switch back to the official repo instead of our fork Change-Id: Ia9bc82db4c0814b06c55460d2123b5e4fa1a2335 --- M deps/Makefile 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index 507306b..c5fd338 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -44,6 +44,7 @@ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolEmulations.M3UA \ + titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.GRE \ titan.ProtocolModules.M2PA \ titan.ProtocolModules.ROSE \ @@ -64,7 +65,6 @@ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ titan.TestPorts.UDPasp \ - titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.BSSGP_v13.0.0 OSMOGIT_REPOS= titan.ProtocolModules.MAP \ @@ -80,7 +80,7 @@ # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= R.7.A-9-g9e70fba +titan.ProtocolEmulations.SCCP_commit= R.7.A-10-g2ca1566 titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= master -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22805 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: Ia9bc82db4c0814b06c55460d2123b5e4fa1a2335 Gerrit-Change-Number: 22805 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:03:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 12:03:01 +0000 Subject: Change in osmo-bsc[master]: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22799 ) Change subject: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS ...................................................................... Patch Set 1: As a reminder: Most "TC_si*" tests in BSC_Tests fail after this patch due to the changed SI content. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 Gerrit-Change-Number: 22799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 12:03:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:06:22 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 12:06:22 +0000 Subject: Change in osmo-ci[master]: repo-install-test: add label for relevant nodes References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22806 ) Change subject: repo-install-test: add label for relevant nodes ...................................................................... repo-install-test: add label for relevant nodes Add the slave axis again, so the jobs aren't stuck forever. I had assumed that without the axis, it would run on any node, but that's not how it works. Add a label for this job, with several nodes attached, like we do it for TTCN-3, master-builds, gerrit-verifications etc. Related: https://jenkins.osmocom.org/jenkins/label/repo-install-test/ Related: OS#4567 Fixes: fcf669 ("repo-install-test: run on all build slaves again") Change-Id: I276ab47f76a0f4db542ca99825ebb019236b4d27 --- M jobs/repo-install-test.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/22806/1 diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 64b66cb..ad48f1b 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -40,6 +40,10 @@ default: 'master' axes: - axis: + type: slave + name: label + values: !!python/tuple [repo-install-test] + - axis: type: user-defined name: feed values: '{obj:feeds}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I276ab47f76a0f4db542ca99825ebb019236b4d27 Gerrit-Change-Number: 22806 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:09:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 12:09:55 +0000 Subject: Change in osmo-ci[master]: repo-install-test: add label for relevant nodes In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22806 ) Change subject: repo-install-test: add label for relevant nodes ...................................................................... Patch Set 1: Verified+1 https://jenkins.osmocom.org/jenkins/job/Osmocom-repo-install-centos8/82/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I276ab47f76a0f4db542ca99825ebb019236b4d27 Gerrit-Change-Number: 22806 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Feb 2021 12:09:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:25:54 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 12:25:54 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: fix possible null pointer dereference In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22678 ) Change subject: assignment_fsm: fix possible null pointer dereference ...................................................................... Abandoned a different solution was merged earlier -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b4f44113b24d4ee4d44f54eff87056b20a7158d Gerrit-Change-Number: 22678 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:30:11 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 12:30:11 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 ) Change subject: gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc ...................................................................... gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc pass raid and cell id directly as parameter to gbproxy_cell_alloc so that we do not need to fill tas parameter to gbproxy_cell_alloc so that we do not need to fill the struct members later. Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Related: SYS#5103 --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c 3 files changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 96b2bcc..a36f305 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -268,7 +268,7 @@ void gbproxy_bvc_free(struct gbproxy_bvc *bvc); int gbproxy_cleanup_bvcs(struct gbproxy_nse *nse, uint16_t bvci); -struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci); +struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci, const struct gprs_ra_id *raid, uint16_t cid); struct gbproxy_cell *gbproxy_cell_by_bvci(struct gbproxy_config *cfg, uint16_t bvci); struct gbproxy_cell *gbproxy_cell_by_cellid(struct gbproxy_config *cfg, const struct gprs_ra_id *raid, uint16_t cid); void gbproxy_cell_free(struct gbproxy_cell *cell); diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 12e685d..116530f 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -669,10 +669,8 @@ * for this BVC. We need to create the 'cell' data structure and the SGSN-side * BVC counterparts */ - bvc->cell = gbproxy_cell_alloc(cfg, bvci); + bvc->cell = gbproxy_cell_alloc(cfg, bvci, ra_id, cell_id); OSMO_ASSERT(bvc->cell); - memcpy(&bvc->cell->id.raid, &bvc->raid, sizeof(bvc->cell->id.raid)); - bvc->cell->id.cid = cell_id; /* link us to the cell and vice-versa */ bvc->cell->bss_bvc = bvc; diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 753355e..9ea00a9 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -163,7 +163,8 @@ ***********************************************************************/ /* Allocate a new 'cell' object */ -struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci) +struct gbproxy_cell *gbproxy_cell_alloc(struct gbproxy_config *cfg, uint16_t bvci, + const struct gprs_ra_id *raid, uint16_t cid) { struct gbproxy_cell *cell; OSMO_ASSERT(cfg); @@ -174,6 +175,8 @@ cell->cfg = cfg; cell->bvci = bvci; + cell->id.cid = cid; + memcpy(&cell->id.raid, raid, sizeof(cell->id.raid)); hash_add(cfg->cells, &cell->list, cell->bvci); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic7deae5ccf839b941d70557d28451d52f32cebbb Gerrit-Change-Number: 22671 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:34:01 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 12:34:01 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend logging macro to log BVCI and Cell ID In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22803 ) Change subject: gb_proxy: extend logging macro to log BVCI and Cell ID ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I11b8fa322f143c6ef7fee36c12cb106a0b4c5f70 Gerrit-Change-Number: 22803 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:44:56 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 12:44:56 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy_vty: Fix NRI VTY help MSC->SGSN References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22807 ) Change subject: gbproxy_vty: Fix NRI VTY help MSC->SGSN ...................................................................... gbproxy_vty: Fix NRI VTY help MSC->SGSN Change-Id: I33a60578c7dc28ec50b98c9b67b5cdb0d821d3d1 --- M src/gb_proxy_vty.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/07/22807/1 diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index 9dbde58..9240d2d 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -276,7 +276,7 @@ DEFUN_ATTR(cfg_sgsn_nri_add, cfg_sgsn_nri_add_cmd, "nri add <0-32767> [<0-32767>]", - NRI_STR "Add NRI value or range to the NRI mapping for this MSC\n" + NRI_STR "Add NRI value or range to the NRI mapping for this SGSN\n" NRI_FIRST_LAST_STR, CMD_ATTR_IMMEDIATE) { @@ -318,7 +318,7 @@ DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd, "nri del <0-32767> [<0-32767>]", - NRI_STR "Remove NRI value or range from the NRI mapping for this MSC\n" + NRI_STR "Remove NRI value or range from the NRI mapping for this SGSN\n" NRI_FIRST_LAST_STR, CMD_ATTR_IMMEDIATE) { @@ -348,10 +348,10 @@ DEFUN_ATTR(cfg_sgsn_no_allow_attach, cfg_sgsn_no_allow_attach_cmd, "no allow-attach", NO_STR - "Do not assign new subscribers to this MSC." - " Useful if an MSC in an MSC pool is configured to off-load subscribers." - " The MSC will still be operational for already IMSI-Attached subscribers," - " but the NAS node selection function will skip this MSC for new subscribers\n", + "Do not assign new subscribers to this SGSN." + " Useful if an SGSN in an SGSN pool is configured to off-load subscribers." + " The SGSN will still be operational for already IMSI-Attached subscribers," + " but the NAS node selection function will skip this SGSN for new subscribers\n", CMD_ATTR_IMMEDIATE) { struct gbproxy_sgsn *sgsn = vty->index; @@ -442,7 +442,7 @@ DEFUN_ATTR(cfg_gbproxy_nri_null_del, cfg_gbproxy_nri_null_del_cmd, "nri null del <0-32767> [<0-32767>]", - NRI_STR NULL_NRI_STR "Remove NRI value or range from the NRI mapping for this MSC\n" + NRI_STR NULL_NRI_STR "Remove NULL-NRI value (or range)\n" NRI_FIRST_LAST_STR, CMD_ATTR_IMMEDIATE) { -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I33a60578c7dc28ec50b98c9b67b5cdb0d821d3d1 Gerrit-Change-Number: 22807 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:44:56 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 12:44:56 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808 ) Change subject: gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc ...................................................................... gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc The MSC-pooling chapter in OsmoBSC mentions that overlapping NRI ranges will warn if configured though the VTY interface, but fail when started with such a config. The manual for OsmoGbProxy promises a similar behaviour, this patch implements it. Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d --- M src/gb_proxy_vty.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/08/22808/1 diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index 9240d2d..f069e88 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -283,6 +283,7 @@ struct gbproxy_sgsn *sgsn = vty->index; struct gbproxy_sgsn *other_sgsn; bool before; + bool overlaps = false; int rc; const char *message; struct osmo_nri_range add_range; @@ -307,13 +308,17 @@ if (osmo_nri_range_overlaps_ranges(&add_range, other_sgsn->pool.nri_ranges)) { uint16_t nsei = sgsn->nse->nsei; uint16_t other_nsei = other_sgsn->nse->nsei; + overlaps = true; NRI_WARN(sgsn, "NRI range [%d..%d] overlaps between NSE %05d and NSE %05d." " For overlaps, NSE %05d has higher priority than NSE %05d", add_range.first, add_range.last, nsei, other_nsei, before ? other_nsei : nsei, before ? nsei : other_nsei); } } - return CMD_SUCCESS; + if (overlaps) + return CMD_WARNING; + else + return CMD_SUCCESS; } DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd, -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d Gerrit-Change-Number: 22808 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:44:57 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 12:44:57 +0000 Subject: Change in osmo-gbproxy[master]: Various comment/whitespace changes References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22809 ) Change subject: Various comment/whitespace changes ...................................................................... Various comment/whitespace changes Change-Id: I0eeef3ec16c249d65e9358889d21cc4984b7b51f --- M src/gb_proxy.c M src/gb_proxy_peer.c 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/09/22809/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 116530f..90f7bb7 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -461,7 +461,6 @@ } else if (TLVP_PRESENT(&tp, BSSGP_IE_IMSI)) { /* FIXME: Use the IMSI as selector? */ rc = gbprox_bss2sgsn_tlli(bss_bvc->cell, msg, NULL, false); - /* rc = gbprox_bss2sgsn_hashed(bss_bvc->cell, msg, NULL); */ } else LOGPBVC(bss_bvc, LOGL_ERROR, "Rx RADIO-STATUS without any of the conditional IEs\n"); break; @@ -1392,7 +1391,7 @@ uint8_t cause = BSSGP_CAUSE_OML_INTERV; bvc = gbproxy_bvc_by_bvci(sgsn_nse, 0); if (bvc) - osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); + osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); } break; case GPRS_NS2_AFF_CAUSE_FAILURE: diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 9ea00a9..27d73b8 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -93,8 +93,7 @@ /* We leave allocating the bvc->fi to the caller, as the FSM details depend * on the type of BVC (SIG/PTP) and role (SGSN/BSS) */ - - return bvc; + return bvc; } void gbproxy_bvc_free(struct gbproxy_bvc *bvc) @@ -711,7 +710,7 @@ return NULL; } -/*! Seleect a pseudo-random SGSN for a given TLLI, ignoring any SGSN that is not accepting connections +/*! Select a pseudo-random SGSN for a given TLLI, ignoring any SGSN that is not accepting connections * \param[in] cfg The gbproxy configuration * \param[in] sgsn_avoid If not NULL then avoid this SGSN when selecting a new one. Use for load redistribution * \param[in] tlli The tlli to choose an SGSN for. The same tlli will map to the same SGSN as long as no SGSN is -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0eeef3ec16c249d65e9358889d21cc4984b7b51f Gerrit-Change-Number: 22809 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:56:01 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 12:56:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix ip-sns VTY config References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22810 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... gbproxy: Fix ip-sns VTY config Change-Id: Ia826ec4b5045360c1b37826f86f03bdccaf63360 Related: SYS#5354 Depends: Ida979f3b9daa5f7280a629441e4006a7635653b0 (libosmocore.git) --- M gbproxy/osmo-gbproxy.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/22810/1 diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index 53dc0f2..15f9f04 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -28,9 +28,9 @@ listen 127.0.0.1 23000 accept-ipaccess nse 101 - ip-sns 127.0.0.10 7777 + ip-sns-remote 127.0.0.10 7777 nse 102 - ip-sns 127.0.0.11 8888 + ip-sns-remote 127.0.0.11 8888 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22810 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: Ia826ec4b5045360c1b37826f86f03bdccaf63360 Gerrit-Change-Number: 22810 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:56:33 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 12:56:33 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: fix VTY config References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22811 ) Change subject: ttcn3-gbproxy-test: fix VTY config ...................................................................... ttcn3-gbproxy-test: fix VTY config The VTY configuration syntax is changed. "ip-sns" is now "ip-sns-remote". Change-Id: I75fc1dd74f10edd377d0182590e8d276c73c2024 --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg M ttcn3-gbproxy-test/osmo-gbproxy.cfg 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/11/22811/1 diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index 7d26b3c..f5bda9d 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -31,9 +31,9 @@ bind udp local listen 172.18.25.10 23000 nse 101 - ip-sns 172.18.25.103 7777 + ip-sns-remote 172.18.25.103 7777 nse 102 - ip-sns 172.18.25.103 8888 + ip-sns-remote 172.18.25.103 8888 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg index 6f49f06..c817e2c 100644 --- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg @@ -32,9 +32,9 @@ listen 172.18.24.10 23000 accept-ipaccess nse 101 - ip-sns 172.18.24.103 7777 + ip-sns-remote 172.18.24.103 7777 nse 102 - ip-sns 172.18.24.103 8888 + ip-sns-remote 172.18.24.103 8888 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I75fc1dd74f10edd377d0182590e8d276c73c2024 Gerrit-Change-Number: 22811 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:58:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 12:58:20 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: fix VTY config In-Reply-To: References: Message-ID: Hello daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22811 to look at the new patch set (#2). Change subject: ttcn3-gbproxy-test: fix VTY config ...................................................................... ttcn3-gbproxy-test: fix VTY config The VTY configuration syntax is changed. "ip-sns" is now "ip-sns-remote". Change-Id: I75fc1dd74f10edd377d0182590e8d276c73c2024 Related: SYS#5354 --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg M ttcn3-gbproxy-test/osmo-gbproxy.cfg 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/11/22811/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I75fc1dd74f10edd377d0182590e8d276c73c2024 Gerrit-Change-Number: 22811 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 12:59:00 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 12:59:00 +0000 Subject: Change in docker-playground[master]: gbproxy: Fix ip-sns VTY config References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22812 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... gbproxy: Fix ip-sns VTY config Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3 Related: SYS#5354 Depends: Ida979f3b9daa5f7280a629441e4006a7635653b0 (libosmocore.git) --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg M ttcn3-gbproxy-test/osmo-gbproxy.cfg 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/22812/1 diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index 7d26b3c..f5bda9d 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -31,9 +31,9 @@ bind udp local listen 172.18.25.10 23000 nse 101 - ip-sns 172.18.25.103 7777 + ip-sns-remote 172.18.25.103 7777 nse 102 - ip-sns 172.18.25.103 8888 + ip-sns-remote 172.18.25.103 8888 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg index 6f49f06..c817e2c 100644 --- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg @@ -32,9 +32,9 @@ listen 172.18.24.10 23000 accept-ipaccess nse 101 - ip-sns 172.18.24.103 7777 + ip-sns-remote 172.18.24.103 7777 nse 102 - ip-sns 172.18.24.103 8888 + ip-sns-remote 172.18.24.103 8888 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3 Gerrit-Change-Number: 22812 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 13:01:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 13:01:00 +0000 Subject: Change in docker-playground[master]: gbproxy: Fix ip-sns VTY config In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22812 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3 Gerrit-Change-Number: 22812 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 10 Feb 2021 13:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 13:01:18 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 13:01:18 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: fix VTY config In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22811 ) Change subject: ttcn3-gbproxy-test: fix VTY config ...................................................................... Abandoned Duplicate of I8faa5d29bfffe50c76c1b907717144ff893126a3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I75fc1dd74f10edd377d0182590e8d276c73c2024 Gerrit-Change-Number: 22811 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 13:01:50 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 13:01:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix ip-sns VTY config In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22810 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22810 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: Ia826ec4b5045360c1b37826f86f03bdccaf63360 Gerrit-Change-Number: 22810 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 10 Feb 2021 13:01:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 13:05:44 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 13:05:44 +0000 Subject: Change in docker-playground[master]: gbproxy: Fix ip-sns VTY config In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22812 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3 Gerrit-Change-Number: 22812 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 10 Feb 2021 13:05:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 13:05:48 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 13:05:48 +0000 Subject: Change in docker-playground[master]: gbproxy: Fix ip-sns VTY config In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22812 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... gbproxy: Fix ip-sns VTY config Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3 Related: SYS#5354 Depends: Ida979f3b9daa5f7280a629441e4006a7635653b0 (libosmocore.git) --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg M ttcn3-gbproxy-test/osmo-gbproxy.cfg 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: dexter: Looks good to me, approved daniel: Verified diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index 7d26b3c..f5bda9d 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -31,9 +31,9 @@ bind udp local listen 172.18.25.10 23000 nse 101 - ip-sns 172.18.25.103 7777 + ip-sns-remote 172.18.25.103 7777 nse 102 - ip-sns 172.18.25.103 8888 + ip-sns-remote 172.18.25.103 8888 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg index 6f49f06..c817e2c 100644 --- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg @@ -32,9 +32,9 @@ listen 172.18.24.10 23000 accept-ipaccess nse 101 - ip-sns 172.18.24.103 7777 + ip-sns-remote 172.18.24.103 7777 nse 102 - ip-sns 172.18.24.103 8888 + ip-sns-remote 172.18.24.103 8888 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8faa5d29bfffe50c76c1b907717144ff893126a3 Gerrit-Change-Number: 22812 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 13:05:58 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 13:05:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix ip-sns VTY config In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22810 ) Change subject: gbproxy: Fix ip-sns VTY config ...................................................................... gbproxy: Fix ip-sns VTY config Change-Id: Ia826ec4b5045360c1b37826f86f03bdccaf63360 Related: SYS#5354 Depends: Ida979f3b9daa5f7280a629441e4006a7635653b0 (libosmocore.git) --- M gbproxy/osmo-gbproxy.cfg 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index 53dc0f2..15f9f04 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -28,9 +28,9 @@ listen 127.0.0.1 23000 accept-ipaccess nse 101 - ip-sns 127.0.0.10 7777 + ip-sns-remote 127.0.0.10 7777 nse 102 - ip-sns 127.0.0.11 8888 + ip-sns-remote 127.0.0.11 8888 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22810 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: Ia826ec4b5045360c1b37826f86f03bdccaf63360 Gerrit-Change-Number: 22810 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 14:51:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 14:51:17 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: extend TLV parser In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 ) Change subject: gb_proxy: extend TLV parser ...................................................................... gb_proxy: extend TLV parser In BSSGP RIM the routing information IE is appearing twice (source and destination). The current one dimensional TLV parsing method would only give us access to the first routing information IE (destination), so lets increase the dimension to 2, so that we get also IEs that appear twice. Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 29 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 116530f..f773584 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -893,7 +893,7 @@ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg); uint8_t pdu_type = bgph->pdu_type; const char *pdut_name = osmo_tlv_prot_msg_name(&osmo_pdef_bssgp, bgph->pdu_type); - struct tlv_parsed tp; + struct tlv_parsed tp[2]; int data_len = msgb_bssgp_len(msg) - sizeof(*bgph); struct gbproxy_bvc *from_bvc = NULL; char log_pfx[32]; @@ -920,34 +920,34 @@ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } - rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, pdu_type, bgph->data, data_len, 0, 0, + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); return tx_status_from_tlvp(rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ - msgb_bcid(msg) = (void *)&tp; + msgb_bcid(msg) = (void *)tp; /* special case handling for some PDU types */ switch (pdu_type) { case BSSGP_PDUT_BVC_RESET: /* resolve or create gbproxy_bvc + handlei n BVC-FSM */ - return rx_bvc_reset_from_bss(nse, msg, &tp); + return rx_bvc_reset_from_bss(nse, msg, &tp[0]); case BSSGP_PDUT_BVC_RESET_ACK: - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; return osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_RESET_ACK, msg); case BSSGP_PDUT_BVC_BLOCK: - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; return osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_BLOCK, msg); case BSSGP_PDUT_BVC_UNBLOCK: - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; @@ -957,7 +957,7 @@ { struct gbproxy_sgsn *sgsn; - tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TLLI)); + tlli = osmo_load32be(TLVP_VAL(&tp[0], BSSGP_IE_TLLI)); sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); if (!sgsn) { LOGP(DGPRS, LOGL_ERROR, "Could not find any SGSN for TLLI, dropping message!\n"); @@ -971,7 +971,7 @@ #if 0 /* TODO: Validate the RAI for consistency with the RAI * we expect for any of the BVC within this BSS side NSE */ - memcpy(ra, TLVP_VAL(&tp, BSSGP_IE_ROUTEING_AREA), sizeof(from_bvc->ra)); + memcpy(ra, TLVP_VAL(&tp[0], BSSGP_IE_ROUTEING_AREA), sizeof(from_bvc->ra)); gsm48_parse_ra(&raid, from_bvc->ra); #endif break; @@ -991,8 +991,8 @@ case BSSGP_PDUT_LLC_DISCARD: case BSSGP_PDUT_FLUSH_LL_ACK: /* route based on BVCI + TLLI */ - ptp_bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); - tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TLLI)); + ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); + tlli = osmo_load32be(TLVP_VAL(&tp[0], BSSGP_IE_TLLI)); from_bvc = gbproxy_bvc_by_bvci(nse, ptp_bvci); if (!from_bvc) goto err_no_bvc; @@ -1003,8 +1003,8 @@ { /* Route according to IMSI<->NSE cache entry */ struct osmo_mobile_identity mi; - const uint8_t *mi_data = TLVP_VAL(&tp, BSSGP_IE_IMSI); - uint8_t mi_len = TLVP_LEN(&tp, BSSGP_IE_IMSI); + const uint8_t *mi_data = TLVP_VAL(&tp[0], BSSGP_IE_IMSI); + uint8_t mi_len = TLVP_LEN(&tp[0], BSSGP_IE_IMSI); osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); nse = gbproxy_nse_by_imsi(nse->cfg, mi.imsi); if (!nse) { @@ -1143,7 +1143,7 @@ const char *pdut_name = osmo_tlv_prot_msg_name(&osmo_pdef_bssgp, bgph->pdu_type); struct gbproxy_config *cfg = nse->cfg; struct gbproxy_bvc *sgsn_bvc; - struct tlv_parsed tp; + struct tlv_parsed tp[2]; int data_len; uint16_t bvci; char log_pfx[32]; @@ -1173,7 +1173,7 @@ data_len = msgb_bssgp_len(msg) - sizeof(*bgph); - rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, pdu_type, bgph->data, data_len, 0, 0, + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { rc = tx_status_from_tlvp(rc, msg); @@ -1181,30 +1181,30 @@ return rc; } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ - msgb_bcid(msg) = (void *)&tp; + msgb_bcid(msg) = (void *)tp; switch (pdu_type) { case BSSGP_PDUT_BVC_RESET: /* resolve or create ggbproxy_bvc + handle in BVC-FSM */ - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); - rc = rx_bvc_reset_from_sgsn(nse, msg, &tp, ns_bvci); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); + rc = rx_bvc_reset_from_sgsn(nse, msg, &tp[0], ns_bvci); break; case BSSGP_PDUT_BVC_RESET_ACK: - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; rc = osmo_fsm_inst_dispatch(sgsn_bvc->fi, BSSGP_BVCFSM_E_RX_RESET_ACK, msg); break; case BSSGP_PDUT_BVC_BLOCK_ACK: - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; rc = osmo_fsm_inst_dispatch(sgsn_bvc->fi, BSSGP_BVCFSM_E_RX_BLOCK_ACK, msg); break; case BSSGP_PDUT_BVC_UNBLOCK_ACK: - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; @@ -1212,7 +1212,7 @@ break; case BSSGP_PDUT_FLUSH_LL: /* simple case: BVCI IE is mandatory */ - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); if (!sgsn_bvc) goto err_no_bvc; @@ -1228,23 +1228,23 @@ { /* Cache the IMSI<->NSE to route PAGING REJECT */ struct osmo_mobile_identity mi; - const uint8_t *mi_data = TLVP_VAL(&tp, BSSGP_IE_IMSI); - uint8_t mi_len = TLVP_LEN(&tp, BSSGP_IE_IMSI); + const uint8_t *mi_data = TLVP_VAL(&tp[0], BSSGP_IE_IMSI); + uint8_t mi_len = TLVP_LEN(&tp[0], BSSGP_IE_IMSI); osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); gbproxy_imsi_cache_update(nse, mi.imsi); /* fall through */ } case BSSGP_PDUT_PAGING_CS: /* process the paging request (LAI/RAI lookup) */ - rc = gbprox_rx_paging(nse, msg, pdut_name, &tp, ns_bvci, paging_bc); + rc = gbprox_rx_paging(nse, msg, pdut_name, &tp[0], ns_bvci, paging_bc); break; case BSSGP_PDUT_STATUS: /* Some exception has occurred */ - cause = *TLVP_VAL(&tp, BSSGP_IE_CAUSE); + cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, bssgp_cause_str(cause)); - if (TLVP_PRES_LEN(&tp, BSSGP_IE_BVCI, 2)) { - bvci = ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + if (TLVP_PRES_LEN(&tp[0], BSSGP_IE_BVCI, 2)) { + bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%05u\n", bvci); sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); /* don't send STATUS in response to STATUS if !bvc */ @@ -1260,7 +1260,7 @@ case BSSGP_PDUT_RESUME_NACK: { struct gbproxy_nse *nse_peer; - uint32_t tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TLLI)); + uint32_t tlli = osmo_load32be(TLVP_VAL(&tp[0], BSSGP_IE_TLLI)); nse_peer = gbproxy_nse_by_tlli(cfg, tlli); if (!nse_peer) { -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieed7160e3005210a9cdeb5c4db28bc3ed031449c Gerrit-Change-Number: 22797 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:03:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:03:09 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 ) Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: daniel Gerrit-Comment-Date: Wed, 10 Feb 2021 15:03:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:03:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:03:24 +0000 Subject: Change in osmo-ci[master]: repo-install-test: add label for relevant nodes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22806 ) Change subject: repo-install-test: add label for relevant nodes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I276ab47f76a0f4db542ca99825ebb019236b4d27 Gerrit-Change-Number: 22806 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Feb 2021 15:03:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:03:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:03:27 +0000 Subject: Change in osmo-ci[master]: repo-install-test: add label for relevant nodes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22806 ) Change subject: repo-install-test: add label for relevant nodes ...................................................................... repo-install-test: add label for relevant nodes Add the slave axis again, so the jobs aren't stuck forever. I had assumed that without the axis, it would run on any node, but that's not how it works. Add a label for this job, with several nodes attached, like we do it for TTCN-3, master-builds, gerrit-verifications etc. Related: https://jenkins.osmocom.org/jenkins/label/repo-install-test/ Related: OS#4567 Fixes: fcf669 ("repo-install-test: run on all build slaves again") Change-Id: I276ab47f76a0f4db542ca99825ebb019236b4d27 --- M jobs/repo-install-test.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, approved diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 64b66cb..ad48f1b 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -40,6 +40,10 @@ default: 'master' axes: - axis: + type: slave + name: label + values: !!python/tuple [repo-install-test] + - axis: type: user-defined name: feed values: '{obj:feeds}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I276ab47f76a0f4db542ca99825ebb019236b4d27 Gerrit-Change-Number: 22806 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:04:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:04:22 +0000 Subject: Change in libosmocore[master]: cosmetic: Move comment one line below in append_gprs_cell_opt In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22798 ) Change subject: cosmetic: Move comment one line below in append_gprs_cell_opt ...................................................................... cosmetic: Move comment one line below in append_gprs_cell_opt Move it above the place where the bit is set, since the bit represents whether Extension Information is available, not whether R99 is available. Change-Id: Ice592acc50a24efd7fe4cf1a91f1d48fd74f38d8 --- M src/gsm/gsm48_rest_octets.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c index f45e818..1bab8e0 100644 --- a/src/gsm/gsm48_rest_octets.c +++ b/src/gsm/gsm48_rest_octets.c @@ -906,9 +906,8 @@ bitvec_set_bit(bv, 0); } else { /* extension information */ - - /* R99 extension: */ bitvec_set_bit(bv, 1); + /* R99 extension: */ if (!gco->ext_info.egprs_supported) { /* 6bit length of extension */ bitvec_set_uint(bv, (1 + 5)-1, 6); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ice592acc50a24efd7fe4cf1a91f1d48fd74f38d8 Gerrit-Change-Number: 22798 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:04:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:04:59 +0000 Subject: Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22747 ) Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 15:04:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:06:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:06:21 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 15:06:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:06:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:06:50 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 15:06:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:06:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:06:54 +0000 Subject: Change in osmo-bts[master]: oml: reuse the given msgb in oml_fom_ack_nack() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22763 ) Change subject: oml: reuse the given msgb in oml_fom_ack_nack() ...................................................................... oml: reuse the given msgb in oml_fom_ack_nack() This would allow to compose ACK/NACK messages with additional IEs not present in the original message. Also, this change basically eliminates unnecessary msgb_copy() / free(). Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Related: OS#3791 --- M src/common/oml.c 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index 9886fe4..d395d8f 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -424,23 +424,15 @@ return oml_mo_fom_ack_nack(mo, NM_MT_OPSTART, nack_cause); } -/* Send an ACK or NACK response for 'msg' to BSC, deriving message - * type, obj class, obj inst from 'msg' and copying all attributes - * contained in 'msg'. ACK is sent if cause == 0; NACK otherwise */ -int oml_fom_ack_nack(struct msgb *old_msg, uint8_t cause) +/* Send an ACK or NACK response to BSC for the given OML message, + * reusing it. ACK is sent if cause == 0; NACK otherwise. */ +int oml_fom_ack_nack(struct msgb *msg, uint8_t cause) { - struct msgb *msg; struct abis_om_fom_hdr *foh; - msg = msgb_copy(old_msg, "OML_fom_ack_nack"); - if (!msg) - return -ENOMEM; - - /* remove any l2/l1 that may be present in copy */ + /* remove any l2/l1 that may be already present */ msgb_pull_to_l2(msg); - msg->trx = old_msg->trx; - foh = (struct abis_om_fom_hdr *) msg->l3h; /* alter message type */ @@ -459,7 +451,11 @@ } /* we cannot use oml_send_msg() as we already have the OML header */ - return abis_oml_sendmsg(msg); + if (abis_oml_sendmsg(msg) != 0) + LOGPFOH(DOML, LOGL_ERROR, foh, "Failed to send ACK/NACK\n"); + + /* msgb was reused, do not free() */ + return 1; } /* @@ -1537,6 +1533,10 @@ ret = -EINVAL; } + /* msgb was reused, do not free() */ + if (ret == 1) + return 0; + msgb_free(msg); return ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f61636e9a144017e2c46b1540d152c21529391 Gerrit-Change-Number: 22763 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:06:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:06:56 +0000 Subject: Change in osmo-bts[master]: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22765 ) Change subject: oml: ensure that IPA RSL Connect ACK/NACK contains all IEs ...................................................................... oml: ensure that IPA RSL Connect ACK/NACK contains all IEs All IEs in the BSC originated message are optional, so we assume default values for them. Let's reflect them all in the ACK/NACK. Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61 Related: OS#3791 --- M src/common/oml.c 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index d395d8f..c32260b 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -442,14 +442,15 @@ foh->msg_type += 2; /* nack */ /* add cause */ msgb_tv_put(msg, NM_ATT_NACK_CAUSES, cause); - /* update the length as we just made the message larger */ - struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg); - omh->length = msgb_l3len(msg); } else { LOGPFOH(DOML, LOGL_DEBUG, foh, "Sending FOM ACK.\n"); foh->msg_type++; /* ack */ } + /* ensure that the message length is up to date */ + struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg); + omh->length = msgb_l3len(msg); + /* we cannot use oml_send_msg() as we already have the OML header */ if (abis_oml_sendmsg(msg) != 0) LOGPFOH(DOML, LOGL_ERROR, foh, "Failed to send ACK/NACK\n"); @@ -1406,6 +1407,16 @@ trx->rsl_tei = stream_id; rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr); } + + /* The ACK/NACK is expected to contain all IEs */ + if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) /* TV32 */ + msgb_tv_fixed_put(msg, NM_ATT_IPACC_DST_IP, sizeof(in), + (const uint8_t *) &in); + if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) /* TV16 */ + msgb_tv16_put(msg, NM_ATT_IPACC_DST_IP_PORT, port); + if (!TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) /* TV */ + msgb_tv_put(msg, NM_ATT_IPACC_STREAM_ID, stream_id); + if (rc < 0) { LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc); return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61 Gerrit-Change-Number: 22765 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:07:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:07:46 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 15:07:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:07:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:07:48 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded ...................................................................... ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Closes: OS#4143 --- M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c 2 files changed, 51 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h index f1f3fcc..d89a1ae 100644 --- a/include/osmocom/ranap/ranap_msg_factory.h +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -13,6 +13,9 @@ struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len); /*! \brief generate RANAP SECURITY MODE COMMAND message */ +struct msgb *ranap_new_msg_sec_mod_cmd2(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status, + uint8_t uia_bitmask, uint8_t uea_bitmask); + struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status); /*! \brief generate RANAP SECURITY MODE COMPLETE message */ diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 2ae2dbf..121514c 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -202,18 +202,15 @@ return msg; } -static const enum RANAP_IntegrityProtectionAlgorithm ip_alg[2] = { - RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA1, - RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA2, -}; - -static const RANAP_EncryptionAlgorithm_t enc_alg[2] = { - RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorith_UEA1, - RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorithm_UEA2, -}; - -/*! \brief generate RANAP SECURITY MODE COMMAND message */ -struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status) +/*! \brief generate RANAP SECURITY MODE COMMAND message. + * \param[in] ik 128bit integrity protection key (mandatory) + * \param[in] ck 128bit ciphering key (optional) + * \param[in] status key status + * \param[in] uia_bitmask bit-mask of UIA algorithms; Bit0 = UIA0 .. Bit2 = UIA2 + * \param[in] uea_bitmask bit-mask of UEA algorithms; Bit0 = UEA0 .. Bit2 = UEA2; ck required + * \returns message buffer with encoded command message */ +struct msgb *ranap_new_msg_sec_mod_cmd2(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status, + uint8_t uia_bitmask, uint8_t uea_bitmask) { RANAP_SecurityModeCommandIEs_t ies; RANAP_SecurityModeCommand_t out; @@ -223,11 +220,26 @@ memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); - for (i = 0; i < ARRAY_SIZE(ip_alg); i++) { + for (i = 0; i < 8; i++) { + RANAP_IntegrityProtectionAlgorithm_t ialg; + if (!(uia_bitmask & (1 << i))) + continue; + switch (i) { + case 1: + ialg = RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA1; + break; + case 2: + ialg = RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA2; + break; + default: + LOGP(DRANAP, "Unsupported UIA algorithm UIA%d specified\n", i); + return NULL; + } + /* needs to be dynamically allocated, as * SET_OF_free() will call FREEMEM() on it */ RANAP_IntegrityProtectionAlgorithm_t *alg = CALLOC(1, sizeof(*alg)); - *alg = ip_alg[i]; + *alg = ialg; ASN_SEQUENCE_ADD(&ies.integrityProtectionInformation.permittedAlgorithms, alg); } @@ -235,11 +247,27 @@ if (ck) { ies.presenceMask = SECURITYMODECOMMANDIES_RANAP_ENCRYPTIONINFORMATION_PRESENT; - for (i = 0; i < ARRAY_SIZE(ip_alg); i++) { + for (i = 0; i < 8; i++) { + RANAP_EncryptionAlgorithm_t ealg; + if (!(uea_bitmask & (1 << i))) + continue; + switch (i) { + case 1: + ealg = RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorith_UEA1; + break; + case 2: + ealg = RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorithm_UEA2; + break; + default: + LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); + asn_set_empty(&ies.integrityProtectionInformation.permittedAlgorithms); + return NULL; + } + /* needs to be dynamically allocated, as * SET_OF_free() will call FREEMEM() on it */ RANAP_EncryptionAlgorithm_t *alg = CALLOC(1, sizeof(*alg)); - *alg = enc_alg[i]; + *alg = ealg; ASN_SEQUENCE_ADD(&ies.encryptionInformation.permittedAlgorithms, alg); } BIT_STRING_fromBuf(&ies.encryptionInformation.key, ck, 16*8); @@ -271,6 +299,10 @@ return msg; } +struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status) +{ + return ranap_new_msg_sec_mod_cmd2(ik, ck, status, 0x06, 0x06); +} /*! \brief generate RANAP SECURITY MODE COMPLETE message */ struct msgb *ranap_new_msg_sec_mod_compl( -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:23:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 15:23:58 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to bts.c References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Move bts_ident_key to bts.c The function is not really handover specific, and will be used in other places in subsequent patches. Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/handover.h M src/osmo-bsc/bts.c M src/osmo-bsc/handover_logic.c M tests/handover/Makefile.am M tests/handover/neighbor_ident_test.c 6 files changed, 154 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/22813/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9a226f5..e1dd403 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -658,3 +658,5 @@ enum gsm_bts_type_variant str2btsvariant(const char *arg); const char *btsvariant2str(enum gsm_bts_type_variant v); + +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index d22ac86..a71bb98 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -86,8 +86,6 @@ struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for, bool log_errors); -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); - void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn, struct msgb *ho_request_msg); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 628d301..76da136 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -758,6 +758,17 @@ return 0; } +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) +{ + static struct neighbor_ident_key key; + key = (struct neighbor_ident_key){ + .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, + .arfcn = bts->c0->arfcn, + .bsic = bts->bsic, + }; + return &key; +} + const struct rate_ctr_desc bts_ctr_description[] = { [BTS_CTR_CHREQ_TOTAL] = \ { "chreq:total", diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index ade330d..b0d175a 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -322,17 +322,6 @@ return -ENODEV; } -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) -{ - static struct neighbor_ident_key key; - key = (struct neighbor_ident_key){ - .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, - .arfcn = bts->c0->arfcn, - .bsic = bts->bsic, - }; - return &key; -} - static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 3951624..7ee4d10 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -123,10 +123,79 @@ $(NULL) neighbor_ident_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/a_reset.o \ + $(top_builddir)/src/osmo-bsc/abis_nm.o \ + $(top_builddir)/src/osmo-bsc/abis_nm_vty.o \ + $(top_builddir)/src/osmo-bsc/abis_om2000.o \ + $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \ + $(top_builddir)/src/osmo-bsc/abis_rsl.o \ + $(top_builddir)/src/osmo-bsc/acc.o \ + $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ + $(top_builddir)/src/osmo-bsc/assignment_fsm.o \ + $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \ + $(top_builddir)/src/osmo-bsc/bsc_init.o \ + $(top_builddir)/src/osmo-bsc/bsc_rf_ctrl.o \ + $(top_builddir)/src/osmo-bsc/bsc_rll.o \ + $(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \ + $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \ + $(top_builddir)/src/osmo-bsc/bsc_vty.o \ + $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_sm.o \ + $(top_builddir)/src/osmo-bsc/bts_trx.o \ + $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \ + $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ + $(top_builddir)/src/osmo-bsc/bts_unknown.o \ + $(top_builddir)/src/osmo-bsc/chan_alloc.o \ + $(top_builddir)/src/osmo-bsc/codec_pref.o \ + $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ + $(top_builddir)/src/osmo-bsc/gsm_data.o \ + $(top_builddir)/src/osmo-bsc/handover_cfg.o \ + $(top_builddir)/src/osmo-bsc/handover_decision.o \ + $(top_builddir)/src/osmo-bsc/handover_decision_2.o \ + $(top_builddir)/src/osmo-bsc/handover_fsm.o \ + $(top_builddir)/src/osmo-bsc/handover_logic.o \ + $(top_builddir)/src/osmo-bsc/handover_vty.o \ + $(top_builddir)/src/osmo-bsc/lchan_fsm.o \ + $(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \ + $(top_builddir)/src/osmo-bsc/lchan_select.o \ + $(top_builddir)/src/osmo-bsc/meas_feed.o \ + $(top_builddir)/src/osmo-bsc/meas_rep.o \ $(top_builddir)/src/osmo-bsc/neighbor_ident.o \ + $(top_builddir)/src/osmo-bsc/neighbor_ident_vty.o \ + $(top_builddir)/src/osmo-bsc/net_init.o \ + $(top_builddir)/src/osmo-bsc/nm_common_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_bts_sm_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_bts_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_bb_transc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_channel_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_gprs_cell_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_gprs_nse_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_gprs_nsvc_fsm.o \ + $(top_builddir)/src/osmo-bsc/nm_rcarrier_fsm.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \ + $(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \ + $(top_builddir)/src/osmo-bsc/paging.o \ + $(top_builddir)/src/osmo-bsc/pcu_sock.o \ + $(top_builddir)/src/osmo-bsc/penalty_timers.o \ + $(top_builddir)/src/osmo-bsc/system_information.o \ + $(top_builddir)/src/osmo-bsc/timeslot_fsm.o \ + $(top_builddir)/src/osmo-bsc/smscb.o \ + $(top_builddir)/src/osmo-bsc/cbch_scheduler.o \ + $(top_builddir)/src/osmo-bsc/cbsp_link.o \ + $(top_builddir)/src/osmo-bsc/lcs_loc_req.o \ + $(top_builddir)/src/osmo-bsc/lcs_ta_req.o \ + $(top_builddir)/src/osmo-bsc/lb.o \ + $(top_builddir)/src/osmo-bsc/bsc_sccp.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMONETIF_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ $(NULL) .PHONY: update_exp diff --git a/tests/handover/neighbor_ident_test.c b/tests/handover/neighbor_ident_test.c index 9acbea0..3a8f1c7 100644 --- a/tests/handover/neighbor_ident_test.c +++ b/tests/handover/neighbor_ident_test.c @@ -26,8 +26,34 @@ #include +#include + #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct gsm_network *bsc_gsmnet; + static struct neighbor_ident_list *nil; static const struct neighbor_ident_key *k(int from_bts, uint16_t arfcn, uint8_t bsic) @@ -268,3 +294,49 @@ return 0; } + +void rtp_socket_free() {} +void rtp_send_frame() {} +void rtp_socket_upstream() {} +void rtp_socket_create() {} +void rtp_socket_connect() {} +void rtp_socket_proxy() {} +void trau_mux_unmap() {} +void trau_mux_map_lchan() {} +void trau_recv_lchan() {} +void trau_send_frame() {} +int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } +int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } +void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} +int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) +{ return 0; } +int bsc_paging_start(struct bsc_paging_params *params) +{ return 0; } +void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} +void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {} +void bsc_cm_update(struct gsm_subscriber_connection *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len) {} +struct gsm0808_handover_required; +int bsc_tx_bssmap_ho_required(struct gsm_lchan *lchan, const struct gsm0808_cell_id_list2 *target_cells) +{ return 0; } +int bsc_tx_bssmap_ho_request_ack(struct gsm_subscriber_connection *conn, struct msgb *rr_ho_command) +{ return 0; } +int bsc_tx_bssmap_ho_detect(struct gsm_subscriber_connection *conn) { return 0; } +enum handover_result bsc_tx_bssmap_ho_complete(struct gsm_subscriber_connection *conn, + struct gsm_lchan *lchan) { return HO_RESULT_OK; } +void bsc_tx_bssmap_ho_failure(struct gsm_subscriber_connection *conn) {} +void osmo_bsc_sigtran_tx_reset(void) {} +void osmo_bsc_sigtran_tx_reset_ack(void) {} +void osmo_bsc_sigtran_reset(void) {} +void bssmap_reset_alloc(void) {} +void bssmap_reset_is_conn_ready(void) {} +const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep) +{ + return "fake-ep"; +} +const char *osmo_mgcpc_ep_ci_name(const struct osmo_mgcpc_ep_ci *ci) +{ + return "fake-ci"; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:23:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 15:23:59 +0000 Subject: Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22814 ) Change subject: Fix neigh resolution service on local neighbours ...................................................................... Fix neigh resolution service on local neighbours Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Related: SYS#4909 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/neighbor_ident.c M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/ctrl_test_runner.py 5 files changed, 110 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/22814/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index e1dd403..7d71991 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -660,3 +660,4 @@ const char *btsvariant2str(enum gsm_bts_type_variant v); struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); +int gsm_bts_get_cgi_ps(const struct gsm_bts *bts, struct osmo_cell_global_id_ps *cgi_ps); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 76da136..af22561 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -769,6 +769,19 @@ return &key; } +int gsm_bts_get_cgi_ps(const struct gsm_bts *bts, struct osmo_cell_global_id_ps *cgi_ps) +{ + if (bts->gprs.mode == BTS_GPRS_NONE) + return -ENOTSUP; + + cgi_ps->rai.lac.plmn = bts->network->plmn; + cgi_ps->rai.lac.lac = bts->location_area_code; + cgi_ps->rai.rac = bts->gprs.rac; + cgi_ps->cell_identity = bts->cell_identity; + + return 0; +} + const struct rate_ctr_desc bts_ctr_description[] = { [BTS_CTR_CHREQ_TOTAL] = \ { "chreq:total", diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c index 185cd0b..6f96033 100644 --- a/src/osmo-bsc/neighbor_ident.c +++ b/src/osmo-bsc/neighbor_ident.c @@ -273,7 +273,9 @@ char *tmp = NULL, *tok, *saveptr; struct neighbor_ident_key ni; unsigned lac, cell_id; - const struct osmo_cell_global_id_ps *cgi_ps; + struct osmo_cell_global_id_ps local_cgi_ps; + const struct osmo_cell_global_id_ps *cgi_ps = NULL; + struct gsm_bts_ref *neigh; if (!cmd->variable) goto fmt_err; @@ -324,10 +326,26 @@ if (!neighbor_ident_key_valid(&ni)) goto fmt_err; - tgt_cell_li = neighbor_ident_get(net->neighbor_bss_cells, &ni); - if (!tgt_cell_li || tgt_cell_li->id_discr != CELL_IDENT_WHOLE_GLOBAL_PS || tgt_cell_li->id_list_len < 1) - goto notfound_err; - cgi_ps = &tgt_cell_li->id_list[0].global_ps; + /* Is there a local BTS that matches the key? */ + llist_for_each_entry(neigh, &bts_found->local_neighbors, entry) { + struct gsm_bts *neigh_bts = neigh->bts; + struct neighbor_ident_key *neigh_bts_key = bts_ident_key(neigh_bts); + neigh_bts_key->from_bts = ni.from_bts; + if (!neighbor_ident_key_match(neigh_bts_key, &ni, true)) + continue; + if (gsm_bts_get_cgi_ps(neigh->bts, &local_cgi_ps) < 0) + continue; /* Not supporting GPRS */ + cgi_ps = &local_cgi_ps; + break; + } + + /* No local neighbor found, looking for remote neighbors */ + if (!cgi_ps) { + tgt_cell_li = neighbor_ident_get(net->neighbor_bss_cells, &ni); + if (!tgt_cell_li || tgt_cell_li->id_discr != CELL_IDENT_WHOLE_GLOBAL_PS || tgt_cell_li->id_list_len < 1) + goto notfound_err; + cgi_ps = &tgt_cell_li->id_list[0].global_ps; + } ctrl_cmd_reply_printf(cmd, "%s", osmo_cgi_ps_name(cgi_ps)); talloc_free(tmp); diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index f1e71b6..2fbc8f8 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -46,6 +46,8 @@ oml ipa stream-id 255 line 0 codec-support fr gprs mode gprs + gprs routing area 5 + ! remote neigh: neighbor cgi-ps 23 42 423 2 5 arfcn 23 bsic 32 trx 0 rf_locked 0 @@ -78,6 +80,63 @@ timeslot 7 phys_chan_config TCH/F hopping enabled 0 + bts 1 + type sysmobts + band DCS1800 + cell_identity 123 + location_area_code 1 + base_station_id_code 55 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-description attach 1 + channel-description bs-pa-mfrms 5 + channel-description bs-ag-blks-res 1 + early-classmark-sending forbidden + ipa unit-id 55 0 + oml ipa stream-id 255 line 0 + codec-support fr + gprs mode gprs + gprs routing area 6 + neighbor bts 0 + trx 0 + rf_locked 0 + arfcn 880 + nominal power 23 + ! to use full TRX power, set max_power_red 0 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + bts 0 + ! local neigh, refers to bts 1: + neighbor cgi-ps 1 1 1 6 123 msc 0 type normal allow-emergency allow diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index fb983c9..501b917 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -501,11 +501,24 @@ def ctrl_app(self): return (4248, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") - def testCtrlNeighborResolution(self): + def testCtrlNeighborResolutionLocalBtsNr(self): + r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci.1.123.871.63') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'neighbor_resolve_cgi_ps_from_lac_ci.1.123.871.63') + self.assertEqual(r['value'], '001-01-1-5-6969') + + def testCtrlNeighborResolutionLocalWithoutArfcnBsic(self): + r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci.1.6969.880.55') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'neighbor_resolve_cgi_ps_from_lac_ci.1.6969.880.55') + self.assertEqual(r['value'], '001-01-1-6-123') + + def testCtrlNeighborResolutionWrongSyntax(self): r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci') self.assertEqual(r['mtype'], 'ERROR') self.assertEqual(r['error'], 'The format is ,,,') + def testCtrlNeighborResolutionRemote(self): r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci.1.6969.23.32') self.assertEqual(r['mtype'], 'GET_REPLY') self.assertEqual(r['var'], 'neighbor_resolve_cgi_ps_from_lac_ci.1.6969.23.32') -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:49:24 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 15:49:24 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 to look at the new patch set (#3). Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... gb_proxy: add support for relaying BSSGP RIM messages BSSGP RIM messages are routed from a source to a destination cell by a RIM routing information IE. Add parsing for the routing information and support for relaying RIM messages to the destination cell/PCU. If the destination cell/PCU is not directly connected to osmo-gbproxy route the rim message to the first connected SGSN. Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 128 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/04/22804/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:57:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:57:33 +0000 Subject: Change in docker-playground[master]: redmine: Make changeset keywords work with OS# annotation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22815 ) Change subject: redmine: Make changeset keywords work with OS# annotation ...................................................................... redmine: Make changeset keywords work with OS# annotation In Osmocom we annotate osmocom issues as OS#1234 and not just as #1234, in order to distinguish them from redmine or coverity issues. Change-Id: I04a97434433a022f47a759a8219458e8772ae71e Related: OS#5005, OS#3291 --- M redmine/Dockerfile A redmine/commitlog-references-oshash.diff 2 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/22815/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 2dfb100..add01b3 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -11,3 +11,6 @@ # no longer needed after ruby-openid-2.9.2 is used #ADD hmac.diff /tmp/hmac.diff #RUN cd / && patch -p0 < /tmp/hmac.diff + +ADD commitlog-references-oshash.diff /tmp/commitlog-references-oshash.diff +RUN cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash.diff diff --git a/redmine/commitlog-references-oshash.diff b/redmine/commitlog-references-oshash.diff new file mode 100644 index 0000000..389ebe5 --- /dev/null +++ b/redmine/commitlog-references-oshash.diff @@ -0,0 +1,18 @@ +diff --git a/app/models/changeset.rb b/app/models/changeset.rb +index 4256f0589..b5ef7b298 100644 +--- a/app/models/changeset.rb ++++ b/app/models/changeset.rb +@@ -126,11 +126,11 @@ class Changeset < ActiveRecord::Base + + referenced_issues = [] + +- comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match| ++ comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(OS#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match| + action, refs = match[2].to_s.downcase, match[3] + next unless action.present? || ref_keywords_any + +- refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| ++ refs.scan(/OS#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| + issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2] + if issue && !issue_linked_to_same_commit?(issue) + referenced_issues << issue -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I04a97434433a022f47a759a8219458e8772ae71e Gerrit-Change-Number: 22815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:58:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:58:00 +0000 Subject: Change in docker-playground[master]: redmine: Make changeset keywords work with OS# annotation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22815 ) Change subject: redmine: Make changeset keywords work with OS# annotation ...................................................................... Patch Set 1: Verified+1 Code-Review+2 this has already been deployed and seems to be working. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I04a97434433a022f47a759a8219458e8772ae71e Gerrit-Change-Number: 22815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 15:58:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 15:58:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 15:58:02 +0000 Subject: Change in docker-playground[master]: redmine: Make changeset keywords work with OS# annotation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22815 ) Change subject: redmine: Make changeset keywords work with OS# annotation ...................................................................... redmine: Make changeset keywords work with OS# annotation In Osmocom we annotate osmocom issues as OS#1234 and not just as #1234, in order to distinguish them from redmine or coverity issues. Change-Id: I04a97434433a022f47a759a8219458e8772ae71e Related: OS#5005, OS#3291 --- M redmine/Dockerfile A redmine/commitlog-references-oshash.diff 2 files changed, 21 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 2dfb100..add01b3 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -11,3 +11,6 @@ # no longer needed after ruby-openid-2.9.2 is used #ADD hmac.diff /tmp/hmac.diff #RUN cd / && patch -p0 < /tmp/hmac.diff + +ADD commitlog-references-oshash.diff /tmp/commitlog-references-oshash.diff +RUN cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash.diff diff --git a/redmine/commitlog-references-oshash.diff b/redmine/commitlog-references-oshash.diff new file mode 100644 index 0000000..389ebe5 --- /dev/null +++ b/redmine/commitlog-references-oshash.diff @@ -0,0 +1,18 @@ +diff --git a/app/models/changeset.rb b/app/models/changeset.rb +index 4256f0589..b5ef7b298 100644 +--- a/app/models/changeset.rb ++++ b/app/models/changeset.rb +@@ -126,11 +126,11 @@ class Changeset < ActiveRecord::Base + + referenced_issues = [] + +- comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match| ++ comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(OS#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match| + action, refs = match[2].to_s.downcase, match[3] + next unless action.present? || ref_keywords_any + +- refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| ++ refs.scan(/OS#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m| + issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2] + if issue && !issue_linked_to_same_commit?(issue) + referenced_issues << issue -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I04a97434433a022f47a759a8219458e8772ae71e Gerrit-Change-Number: 22815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:02:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:02:43 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 16:02:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:02:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:02:45 +0000 Subject: Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging ...................................................................... xua: Implement SNM availability/unavailability messaging M3UA and SUA have one sub-protocol called [S]SNM, through which the SG informs the ASP about certain destinations (point codes) becoming available (DAVA) or unavailable (DUNA) in the SS7 network. This patch adds support for * generating DAVA/DUAN on a SGP when the AS FSM changes to/from AS-ACTIVE * receiving DAVA/DUNA on an ASP and informing other "SG role" AS/ASP * processing DAUD from ASP received by SG, generating relate DAVA/DUNA responses Related: OS#2623 Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 --- M src/Makefile.am M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_internal.h A src/xua_snm.c 6 files changed, 554 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 91084de..41d2a8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ sccp_user.c sccp_types.c xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ - osmo_ss7_vty.c sccp_vty.c ipa.c + xua_snm.c osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS) diff --git a/src/m3ua.c b/src/m3ua.c index bfb0c23..6639c28 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -677,6 +677,8 @@ return 0; } +static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua); + /*! \brief process M3UA message received from socket * \param[in] asp Application Server Process receiving \ref msg * \param[in] msg received message buffer @@ -737,10 +739,7 @@ rc = m3ua_rx_rkm(asp, xua); break; case M3UA_MSGC_SNM: - /* FIXME */ - LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA " - "Message Class %u\n", xua->hdr.msg_class); - err = m3ua_gen_error_msg(M3UA_ERR_UNSUPP_MSG_CLASS, msg); + rc = m3ua_rx_snm(asp, xua); break; default: LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unknown M3UA " @@ -760,3 +759,146 @@ return rc; } + +/*********************************************************************** + * SSNM msg generation + ***********************************************************************/ + +/* 3.4.1 Destination Unavailable (DUNA) */ +static struct xua_msg *m3ua_encode_duna(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_DUNA); + xua->hdr.version = M3UA_VERSION; + if (rctx) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_data(xua, M3UA_IEI_AFFECTED_PC, num_aff_pc * sizeof(*aff_pc), (const uint8_t *) aff_pc); + + if (info_string) { + xua_msg_add_data(xua, M3UA_IEI_INFO_STRING, + strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} + +/* 3.4.2 Destination Available (DAVA) */ +static struct xua_msg *m3ua_encode_dava(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = m3ua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + if (xua) + xua->hdr.msg_type = M3UA_SNM_DAVA; + return xua; +} + +#if 0 /* not used so far */ +/* 3.4.3 Destination Available (DAUD) */ +static struct xua_msg *m3ua_encode_daud(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = m3ua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + if (xua) + xua->hdr.msg_type = M3UA_SNM_DAUD; + return xua; +} +#endif + + +/* TODO: 3.4.5 Destination User Part Unavailable (DUPU) */ + +/*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] info_string optional information string (can be NULL). + * \param[in] available are aff_pc now available (true) or unavailable (false) */ +void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string, bool available) +{ + struct xua_msg *xua; + + if (available) + xua = m3ua_encode_dava(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + else + xua = m3ua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, info_string); + + m3ua_tx_xua_asp(asp, xua); +} + +/* received SNM message on ASP side */ +static int m3ua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + int rc; + + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + + /* report those up the stack so both other ASPs and local SCCP users can be notified */ + switch (xua->hdr.msg_type) { + case M3UA_SNM_DUNA: + xua_snm_rx_duna(asp, as, xua); + break; + case M3UA_SNM_DAVA: + xua_snm_rx_dava(asp, as, xua); + break; + case M3UA_SNM_DUPU: + case M3UA_SNM_SCON: + case M3UA_SNM_DRST: + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA SNM message type %u\n", + xua->hdr.msg_type); + /* silently ignore those to not confuse the sender */ + break; + default: + return M3UA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +/* received SNM message on SG side */ +static int m3ua_rx_snm_sg(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + switch (xua->hdr.msg_type) { + case M3UA_SNM_DAUD: /* Audit: ASP inquires about availability of Point Codes */ + xua_snm_rx_daud(asp, xua); + break; + default: + return M3UA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +static int m3ua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + /* SNM only permitted in ACTIVE state */ + if (asp->fi->state != XUA_ASP_S_ACTIVE) { + LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received M3UA SNM while ASP in state %s\n", + osmo_fsm_inst_state_name(asp->fi)); + return M3UA_ERR_UNEXPECTED_MSG; + } + + switch (asp->cfg.role) { + case OSMO_SS7_ASP_ROLE_SG: + return m3ua_rx_snm_sg(asp, xua); + case OSMO_SS7_ASP_ROLE_ASP: + return m3ua_rx_snm_asp(asp, xua); + default: + return M3UA_ERR_UNSUPP_MSG_CLASS; + } +} diff --git a/src/sua.c b/src/sua.c index 42d43e8..c9e880f 100644 --- a/src/sua.c +++ b/src/sua.c @@ -1,6 +1,6 @@ /* Minimal implementation of RFC 3868 - SCCP User Adaptation Layer */ -/* (C) 2015-2017 by Harald Welte +/* (C) 2015-2021 by Harald Welte * All Rights Reserved * * SPDX-License-Identifier: GPL-2.0+ @@ -661,6 +661,8 @@ return 0; } +static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua); + /*! \brief process SUA message received from socket * \param[in] asp Application Server Process receiving \ref msg * \param[in] msg received message buffer @@ -736,6 +738,8 @@ rc = sua_rx_mgmt(asp, xua); break; case SUA_MSGC_SNM: + rc = sua_rx_snm(asp, xua); + break; case SUA_MSGC_RKM: /* FIXME */ LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA " @@ -760,3 +764,151 @@ return rc; } + +/*********************************************************************** + * SSNM msg generation + ***********************************************************************/ + +/* 3.4.1 Destination Unavailable (DUNA) */ +static struct xua_msg *sua_encode_duna(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *ssn, const uint32_t *smi, const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_DUNA); + xua->hdr.version = SUA_VERSION; + if (rctx) + xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * 4, (const uint8_t *)rctx); + + xua_msg_add_data(xua, SUA_IEI_AFFECTED_PC, num_aff_pc * 4, (const uint8_t *) aff_pc); + + if (ssn) + xua_msg_add_u32(xua, SUA_IEI_SSN, *ssn); + + if (smi) + xua_msg_add_u32(xua, SUA_IEI_SSN, *smi); + + if (info_string) { + xua_msg_add_data(xua, SUA_IEI_INFO_STRING, + strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} + +/* 3.4.2 Destination Available (DAVA) */ +static struct xua_msg *sua_encode_dava(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *ssn, const uint32_t *smi, const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = sua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, ssn, smi, info_string); + if (xua) + xua->hdr.msg_type = SUA_SNM_DAVA; + return xua; +} + +#if 0 /* not used so far */ +/* 3.4.3 Destination Available (DAUD) */ +static struct xua_msg *sua_encode_daud(const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *ssn, const uint32_t *smi, const char *info_string) +{ + /* encoding is exactly identical to DUNA */ + struct xua_msg *xua = sua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, ssn, smi, info_string); + if (xua) + xua->hdr.msg_type = SUA_SNM_DAUD; + return xua; +} +#endif + + +/*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] + * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] aff_ssn affected SSN (optional) + * \param[in] smi subsystem multiplicity indicator (optional) + * \param[in] info_string optional information strng (can be NULL). + * \param[in] available are aff_pc now available (true) or unavailable (false) */ +void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, + const uint32_t *smi, const char *info_string, bool available) +{ + struct xua_msg *xua; + + if (available) + xua = sua_encode_dava(rctx, num_rctx, aff_pc, num_aff_pc, aff_ssn, smi, info_string); + else + xua = sua_encode_duna(rctx, num_rctx, aff_pc, num_aff_pc, aff_ssn, smi, info_string); + + sua_tx_xua_asp(asp, xua); +} + +/* received SNM message on ASP side */ +static int sua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct osmo_ss7_as *as = NULL; + struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); + int rc; + + rc = xua_find_as_for_asp(&as, asp, rctx_ie); + if (rc) + return rc; + + switch (xua->hdr.msg_type) { + case SUA_SNM_DUNA: + xua_snm_rx_duna(asp, as, xua); + break; + case SUA_SNM_DAVA: + xua_snm_rx_dava(asp, as, xua); + break; + case SUA_SNM_DUPU: + case SUA_SNM_SCON: + case SUA_SNM_DRST: + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA SNM message type %u\n", + xua->hdr.msg_type); + /* silently ignore those to not confuse the sender */ + break; + default: + return SUA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +/* received SNM message on SG side */ +static int sua_rx_snm_sg(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + switch (xua->hdr.msg_type) { + case SUA_SNM_DAUD: /* Audit: ASP inquires about availability of Point Codes */ + xua_snm_rx_daud(asp, xua); + break; + default: + return SUA_ERR_UNSUPP_MSG_TYPE; + } + + return 0; +} + +static int sua_rx_snm(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + /* SNM only permitted in ACTIVE state */ + if (asp->fi->state != XUA_ASP_S_ACTIVE) { + LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received M3UA SNM while ASP in state %s\n", + osmo_fsm_inst_state_name(asp->fi)); + return SUA_ERR_UNEXPECTED_MSG; + } + + switch (asp->cfg.role) { + case OSMO_SS7_ASP_ROLE_SG: + return sua_rx_snm_sg(asp, xua); + case OSMO_SS7_ASP_ROLE_ASP: + return sua_rx_snm_asp(asp, xua); + default: + return SUA_ERR_UNSUPP_MSG_CLASS; + } +} diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 731504b..7c791cf 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -75,6 +75,26 @@ return sent; } +/* determine which role (SG/ASP/IPSP) we operate in */ +static int get_local_role(struct osmo_ss7_as *as) +{ + unsigned int i; + + /* this is a bit tricky. "osmo_ss7_as" has no configuation of a role, + * only the ASPs have. As they all must be of the same role, let's simply + * find the first one and return its role */ + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + struct osmo_ss7_asp *asp = as->cfg.asps[i]; + + if (!asp) + continue; + + return asp->cfg.role; + } + /* we don't have any ASPs in this AS? Strange */ + return -1; +} + static struct osmo_ss7_asp *xua_as_select_asp_override(struct osmo_ss7_as *as) { struct osmo_ss7_asp *asp; @@ -318,6 +338,17 @@ /* TODO: ASP-Id of ASP triggering this state change */ as_notify_all_asp(xafp->as, &npar); + + /* only if we are the SG, we must start broadcasting availability information + * to everyone else */ + if (get_local_role(xafp->as) == OSMO_SS7_ASP_ROLE_SG) { + /* advertise availability of the routing key to others */ + uint32_t aff_pc = htonl(as->cfg.routing_key.pc); + if (old_state != XUA_AS_S_ACTIVE && fi->state == XUA_AS_S_ACTIVE) + xua_snm_pc_available(as, &aff_pc, 1, NULL, true); + else if (old_state == XUA_AS_S_ACTIVE && fi->state != XUA_AS_S_ACTIVE) + xua_snm_pc_available(as, &aff_pc, 1, NULL, false); + } }; static void xua_as_fsm_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/xua_internal.h b/src/xua_internal.h index 65adfb6..e76fddf 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -18,10 +18,19 @@ int sua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); int sua_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); +void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, + const uint32_t *smi, const char *info_string, bool available); struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua); int m3ua_hmdc_rx_from_l2(struct osmo_ss7_instance *inst, struct xua_msg *xua); int m3ua_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); +void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_string, bool available); +void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua); +void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); +void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); int m3ua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); struct msgb *m3ua_msgb_alloc(const char *name); @@ -59,6 +68,9 @@ enum osmo_xlm_prim_type prim_type, enum osmo_prim_operation op); +void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, + unsigned int num_aff_pc, const char *info_str, bool available); + extern struct osmo_fsm xua_default_lm_fsm; extern const struct value_string m3ua_rkm_reg_status_vals[]; extern const struct value_string m3ua_rkm_dereg_status_vals[]; diff --git a/src/xua_snm.c b/src/xua_snm.c new file mode 100644 index 0000000..c4dffbb --- /dev/null +++ b/src/xua_snm.c @@ -0,0 +1,211 @@ +/* M3UA/SUA [S]SNM Handling */ + +/* (C) 2021 by Harald Welte + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include + +#include +#include +#include + +#include "xua_internal.h" + +/* we can share this code between M3UA and SUA as the below conditions are true */ +osmo_static_assert(M3UA_SNM_DUNA == SUA_SNM_DUNA, _sa_duna); +osmo_static_assert(M3UA_SNM_DAVA == SUA_SNM_DAVA, _sa_dava); +osmo_static_assert(M3UA_SNM_DAUD == SUA_SNM_DAUD, _sa_dava); +osmo_static_assert(M3UA_IEI_AFFECTED_PC == SUA_IEI_AFFECTED_PC, _sa_aff_pc); +osmo_static_assert(M3UA_IEI_ROUTE_CTX == SUA_IEI_ROUTE_CTX, _sa_rctx); +osmo_static_assert(M3UA_IEI_INFO_STRING == SUA_IEI_INFO_STRING, _sa_inf_str); + +static const char *format_affected_pcs_c(void *ctx, const struct osmo_ss7_instance *s7i, + const struct xua_msg_part *ie_aff_pc) +{ + const uint32_t *aff_pc = (const uint32_t *) ie_aff_pc->dat; + unsigned int num_aff_pc = ie_aff_pc->len / sizeof(uint32_t); + char *out = talloc_strdup(ctx, ""); + int i; + + for (i = 0; i < num_aff_pc; i++) { + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + + /* append point code + mask */ + out = talloc_asprintf_append(out, "%s%s/%u, ", i == 0 ? "" : ", ", + osmo_ss7_pointcode_print(s7i, pc), mask); + } + return out; +} + +/* obtain all routing contexts (in network byte order) that exist within the given ASP */ +static unsigned int get_all_rctx_for_asp(uint32_t *rctx, unsigned int rctx_size, + struct osmo_ss7_asp *asp, struct osmo_ss7_as *excl_as) +{ + unsigned int count = 0; + struct osmo_ss7_as *as; + + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (as == excl_as) + continue; + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + if (as->cfg.routing_key.context == 0) + continue; + if (count >= rctx_size) + break; + rctx[count] = htonl(as->cfg.routing_key.context); + count++; + } + return count; +} + +static void xua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const char *info_str, bool available) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, NULL, NULL, info_str, available); + break; + default: + break; + } +} + +/* advertise availability of point codes (with masks) */ +void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, + unsigned int num_aff_pc, const char *info_str, bool available) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send DAVA/DUNA if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + xua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); + } +} + +/* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ +void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + struct osmo_ss7_instance *s7i = asp->inst; + unsigned int num_aff_pc; + unsigned int num_rctx; + const uint32_t *aff_pc; + uint32_t rctx[32]; + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + int i; + + OSMO_ASSERT(ie_aff_pc); + aff_pc = (const uint32_t *) ie_aff_pc->dat; + num_aff_pc = ie_aff_pc->len / sizeof(uint32_t); + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, NULL); + + LOGPASP(asp, log_ss, LOGL_INFO, "Rx DAUD(%s) for %s\n", info_str ? info_str : "", + format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); + + /* iterate over list of point codes, generate DAVA/DUPU */ + for (i = 0; i < num_aff_pc; i++) { + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + bool is_available = false; + + if (mask == 0) { + /* one single point code */ + + /* FIXME: don't just check for a route; but also check if the route is "active" */ + if (osmo_ss7_route_lookup(s7i, pc)) + is_available = true; + + xua_tx_snm_available(asp, rctx, num_rctx, &aff_pc[i], 1, "Response to DAUD", + is_available); + } else { + /* TODO: wildcard match */ + LOGPASP(asp, log_ss, LOGL_NOTICE, "DAUD with wildcard match not supported yet\n"); + } + } +} + +/* an incoming xUA DUNA was received from a remote SG */ +void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ + //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + + OSMO_ASSERT(ie_aff_pc); + + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + return; + + LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUNA(%s) for %s\n", info_str ? info_str : "", + format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); + + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, false); +} + +/* an incoming xUA DAVA was received from a remote SG */ +void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ + //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + + OSMO_ASSERT(ie_aff_pc); + + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + return; + + LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DAVA(%s) for %s\n", info_str ? info_str : "", + format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); + + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, true); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:04:07 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 16:04:07 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 ) Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... Patch Set 3: Code-Review+1 (7 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 939 PS1, Line 939: shoud > should Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 942 PS1, Line 942: LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, > Could you vary the log lines so they indicate which path is taken? [?] Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 946 PS1, Line 946: LOGP(DGPRS, LOGL_NOTICE, > I don't think we need this log at all and if we do it should be DEBUG. [?] Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 961 PS1, Line 961: LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, > "relaying RIM-PDU to SGSN(%05u/%s) "... [?] Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 1236 PS1, Line 1236: target GERAN > "target non-GERAN cells" Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 1243 PS1, Line 1243: /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in > When this is implemented it should be done as first step. [?] Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804/1/src/gb_proxy.c at 1256 PS1, Line 1256: LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, > "relaying RIM-PDU from SGSN(%05u/%s) " ... Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:04:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:53 +0000 Subject: Change in docker-playground[master]: ttcn3: remove /root/projects/git symlink References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22816 ) Change subject: ttcn3: remove /root/projects/git symlink ...................................................................... ttcn3: remove /root/projects/git symlink Remove leftover from old TTCN-3 build scripts, before refactoring ttcn3 Dockerfiles. This line has already been removed in 357ec806 from 2017 for ggsn-test. In osmo-ttcn3-hacks.git, this is only referenced in the obsolete bin/install.script (looks like we could remove that, together with the rest of the bin dir?). Related: OS#5017 Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 --- M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 16 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/16/22816/1 diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 9288469..8bdf87f 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index f927513..84928a7 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 29185c8..30704cf 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 2363f18..7b80504 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 9a92c4a..4e0c66f 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 0233035..78ff0ce 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 33183d0..9afef2e 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index ee7e5f0..db73c8e 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 76fd630..44424b3 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index b78fee2..2f3deff 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b1ea71f..3a2d14e 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index d9c3232..901200a 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index fcc2c02..9b1c540 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 9f1a6df..0828e08 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 1eb3b9d..3ffecb9 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index e6bb9d0..532da9f 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 Gerrit-Change-Number: 22816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:54 +0000 Subject: Change in docker-playground[master]: ttcn3: move initial clone to debian-stretch-titan References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22817 ) Change subject: ttcn3: move initial clone to debian-stretch-titan ...................................................................... ttcn3: move initial clone to debian-stretch-titan Clone the osmo-ttcn3-hacks and all dependency repositories less often by moving related commands to the shared debian-stretch-titan image. Remove the 'git checkout -f -B master origin/master' line, because the master branch is checked out by default. While at it, move the shared "git config" commands too, and move them before cloning the repositories, so they don't run again whenever the deps change (logic to invalidate the cache if deps change will be added in the next patch). Related: OS#5017 Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd --- M debian-stretch-titan/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 18 files changed, 7 insertions(+), 161 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/17/22817/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 74bc420..0f4f17e 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -48,3 +48,10 @@ dpkg -i ./libfftranscode0_0.3_${DPKG_ARCH}.deb ./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \ apt install --fix-broken && \ rm libfftranscode*.deb + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +# clone osmo-ttcn3-hacks and deps +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ + make -C /osmo-ttcn3-hacks deps diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 8bdf87f..c26247d 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 84928a7..dcf66d2 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 30704cf..48909aa 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 7b80504..3941895 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 4e0c66f..2acd103 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 7e88f28..1d53747 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 78ff0ce..20e1597 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 9afef2e..6580e92 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index db73c8e..bb04c10 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 44424b3..27a3e23 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2f3deff..c3606bb 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 3a2d14e..594dcb6 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 901200a..d906106 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 9b1c540..e3babb7 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 0828e08..5b3044c 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 3ffecb9..88a4dfc 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 532da9f..55ccf01 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd Gerrit-Change-Number: 22817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:55 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: update deps on change References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change ...................................................................... debian-stretch-titan: update deps on change After the initial clone of osmo-ttcn3-hacks and deps, let docker download deps/Makefile to invalidate the cache if the file changed. Run "git pull" and "make deps" afterwards, but only if the Makefile is different. The "if" saves time in the initial build of the image, it avoids the "git fetch" on every dependency repository during "make deps". Related: OS#5017 Change-Id: I56673312cfb23375d67900016aaac1931f677275 --- M debian-stretch-titan/Dockerfile 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/22818/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 0f4f17e..39ff76f 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -52,6 +52,12 @@ RUN git config --global user.email docker at dock.er && \ git config --global user.name "Dock Er" -# clone osmo-ttcn3-hacks and deps +# clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -C /osmo-ttcn3-hacks deps +ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make deps; \ + fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:55 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... ttcn3: move prepare code to shared script Move the git fetch/checkout code and make call to build the testsuite, to debian-stretch-titan/ttcn3-docker-prepare.sh. In the next patch, I will extend the script to update deps right before building too (e.g. because OSMO_TTCN3_BRANCH changed). Related: OS#5017 Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 --- M debian-stretch-titan/Dockerfile A debian-stretch-titan/ttcn3-docker-prepare.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 19 files changed, 47 insertions(+), 102 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/19/22819/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 39ff76f..daa0f8c 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -61,3 +61,5 @@ git pull && \ make deps; \ fi + +ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh new file mode 100755 index 0000000..d7363f5 --- /dev/null +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -0,0 +1,28 @@ +#!/bin/sh -e +if [ $# -lt 2 ]; then + echo + echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT ...]" + echo "arguments:" + echo " OSMO_TTCN3_BRANCH: as passed from docker" + echo " PROJECT: make target from osmo-ttcn3-hacks.git, e.g. 'msc'" + echo + exit 1 +fi + +set -x +OSMO_TTCN3_BRANCH=$1 +PROJECT=$2 + +cd /osmo-ttcn3-hacks + +git fetch +git checkout "$OSMO_TTCN3_BRANCH" + +if git symbolic-ref -q HEAD; then + git reset --hard origin/"$OSMO_TTCN3_BRANCH" +fi + +git rev-parse --abbrev-ref HEAD +git rev-parse HEAD + +make "$PROJECT" diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index c26247d..80d3384 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make bsc +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc VOLUME /data diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index dcf66d2..61f699d 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make bsc-nat +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat VOLUME /data diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 48909aa..685d99b 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make deps-update bts +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts VOLUME /data diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 3941895..dcee72d 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make fr fr-net +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net VOLUME /data diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 2acd103..c0a8841 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make gbproxy +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy VOLUME /data diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 1d53747..1ea2923 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make ggsn_tests +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_test VOLUME /data diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 20e1597..3d12234 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make deps-update hlr +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr VOLUME /data diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 6580e92..860a06a 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make mgw +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw VOLUME /data diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index bb04c10..93b3e0a 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make msc +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc VOLUME /data diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 27a3e23..4d0cf73 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sysinfo +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo VOLUME /data diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index c3606bb..6b2072c 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make pcu +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu VOLUME /data diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 594dcb6..b526206 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make deps-update remsim +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim VOLUME /data diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index d906106..b047ba7 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sccp +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp VOLUME /data diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index e3babb7..01bbce1 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sgsn +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn VOLUME /data diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 5b3044c..3e7b8f0 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sip +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip VOLUME /data diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 88a4dfc..0205547 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make smlc +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc VOLUME /data diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 55ccf01..183c545 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make stp +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp VOLUME /data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:56 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: run 'make deps' References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22820 ) Change subject: debian-stretch-titan: prepare: run 'make deps' ...................................................................... debian-stretch-titan: prepare: run 'make deps' Run 'make deps' in ttcn3-docker-prepare.sh, if needed. Related: OS#5017 Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 --- M debian-stretch-titan/ttcn3-docker-prepare.sh 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/20/22820/1 diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index d7363f5..2b3cbd7 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -25,4 +25,11 @@ git rev-parse --abbrev-ref HEAD git rev-parse HEAD +# Update deps if Makefile changed since last 'make deps' (e.g. because +# OSMO_TTCN3_BRANCH is different). The Dockerfile does the initial 'make deps' +# and downloads /tmp/deps-Makefile. +if ! diff -q /tmp/deps-Makefile deps/Makefile; then + make deps +fi + make "$PROJECT" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 Gerrit-Change-Number: 22820 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:56 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: start/stop links References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22821 ) Change subject: debian-stretch-titan: prepare: start/stop links ...................................................................... debian-stretch-titan: prepare: start/stop links Create symlinks to ttcn3-*-start.sh and ttcn3-*-stop.sh in the prepare.sh script instead of in each of the ttcn3 Dockerfiles. Related: OS#5017 Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada --- M debian-stretch-titan/ttcn3-docker-prepare.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 5 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/21/22821/1 diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index 2b3cbd7..a5cbc91 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -32,4 +32,9 @@ make deps fi +# Link start/stop scripts to / +for i in ttcn3-*-start.sh ttcn3-*-stop.sh; do + ln -sv "/osmo-ttcn3-hacks/$i" "/$i" +done + make "$PROJECT" diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 80d3384..c56f3a5 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BSC_Tests.cfg /data/BSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 61f699d..405c0a6 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 685d99b..4aa3825 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BTS_Tests.cfg /data/BTS_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index dcee72d..1f0e6e1 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / - COPY FR_Tests.cfg /data/FR_Tests.cfg COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg COPY pipework /usr/bin/pipework diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index c0a8841..661ca07 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / - COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg COPY pipework /usr/bin/pipework COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 1ea2923..6c675b7 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 3d12234..b180567 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY HLR_Tests.cfg /data/HLR_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 860a06a..b05fa21 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY MGCP_Test.cfg /data/MGCP_Test.cfg CMD cd /data && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 93b3e0a..06c07ca 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY MSC_Tests.cfg /data/MSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 6b2072c..2c7d52f 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY PCU_Tests.cfg /data/PCU_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b526206..c826d7c 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index b047ba7..3fc4ca3 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 01bbce1..2cc9778 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 3e7b8f0..4d138ce 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SIP_Tests.cfg /data/SIP_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 0205547..d2a081f 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 183c545..0ae2c5e 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY STP_Tests.cfg /data/STP_Tests.cfg CMD cd /data && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada Gerrit-Change-Number: 22821 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:57 +0000 Subject: Change in docker-playground[master]: ttcn3: move shared run code to script References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22822 ) Change subject: ttcn3: move shared run code to script ...................................................................... ttcn3: move shared run code to script While I'm at it with tidying up the Dockerfiles, create a ttcn3-docker-run.sh with shared run code. Related: OS#5017 Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 --- M debian-stretch-titan/Dockerfile A debian-stretch-titan/ttcn3-docker-run.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 39 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/22822/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index daa0f8c..512b4ac 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -63,3 +63,4 @@ fi ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare +ADD ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-stretch-titan/ttcn3-docker-run.sh new file mode 100755 index 0000000..0cda8a5 --- /dev/null +++ b/debian-stretch-titan/ttcn3-docker-run.sh @@ -0,0 +1,23 @@ +#!/bin/sh +if [ $# -lt 2 ]; then + echo + echo "usage: ttcn3-docker-run SUBDIR SUITE" + echo "arguments:" + echo " SUBDIR: directory in osmo-ttcn3-hacks, e.g. 'msc'" + echo " SUITE: name of the testsuite, e.g. 'MSC_Tests'" + echo + exit 1 +fi + +set -x +SUBDIR=$1 +SUITE=$2 + +cd /data + +/osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE" +exit_code=$? + +/osmo-ttcn3-hacks/log_merge.sh "$SUITE" --rm + +exit $exit_code diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index c56f3a5..10b7267 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -9,8 +9,4 @@ COPY BSC_Tests.cfg /data/BSC_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run bsc BSC_Tests diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 405c0a6..d970482 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -9,8 +9,4 @@ COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh BSCNAT_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run bsc-nat BSCNAT_Tests diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 4aa3825..7abf1a9 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -9,8 +9,4 @@ COPY BTS_Tests.cfg /data/BTS_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run bts BTS_Tests diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 6c675b7..559857c 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -9,8 +9,4 @@ COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run ggsn_tests GGSN_Tests diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index b180567..36761a7 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -9,8 +9,4 @@ COPY HLR_Tests.cfg /data/HLR_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run hlr HLR_Tests diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index b05fa21..bd74f79 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -9,8 +9,4 @@ COPY MGCP_Test.cfg /data/MGCP_Test.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm; \ - exit $exit_code +CMD ttcn3-docker-run mgw MGCP_Test diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 06c07ca..8ce9828 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -9,8 +9,4 @@ COPY MSC_Tests.cfg /data/MSC_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run msc MSC_Tests diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 4d0cf73..026a465 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -9,8 +9,4 @@ COPY Test.cfg /data/Test.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh Test --rm; \ - exit $exit_code +CMD ttcn3-docker-run sysinfo Test diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2c7d52f..2a35db3 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -9,8 +9,4 @@ COPY PCU_Tests.cfg /data/PCU_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/pcu/PCU_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh PCU_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run pcu PCU_Tests diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index c826d7c..0391d0a 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -9,8 +9,4 @@ COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/remsim/REMSIM_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh REMSIM_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run remsim REMSIM_Tests diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 3fc4ca3..a818d8b 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -9,8 +9,4 @@ COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sccp/SCCP_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SCCP_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run sccp SCCP_Tests diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 2cc9778..2a2e66e 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -9,8 +9,4 @@ COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run sgsn SGSN_Tests diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 4d138ce..bce215a 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -9,8 +9,4 @@ COPY SIP_Tests.cfg /data/SIP_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sip/SIP_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run sip SIP_Tests diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index d2a081f..21d77a4 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -9,8 +9,4 @@ COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/smlc/SMLC_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SMLC_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run smlc SMLC_Tests diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 0ae2c5e..073753b 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -9,8 +9,4 @@ COPY STP_Tests.cfg /data/STP_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/stp/STP_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh STP_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run stp STP_Tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 Gerrit-Change-Number: 22822 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:18:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:18:57 +0000 Subject: Change in docker-playground[master]: ttcn3-{fr, gbproxy}-test: use ttcn3-docker-run too References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22823 ) Change subject: ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too ...................................................................... ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too Move the shared pipework script to the base image, and call it in ttcn3-docker-run.sh if WAIT_FOR_NETDEV is set. Use ttcn3-docker-run.sh as entrypoint in both Dockerfiles and remove the custom entrypoint scripts (which are the same as ttcn3-docker-run.sh now). Related: OS#5017 Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 --- M debian-stretch-titan/Dockerfile R debian-stretch-titan/pipework M debian-stretch-titan/ttcn3-docker-run.sh M ttcn3-fr-test/Dockerfile D ttcn3-fr-test/docker-entrypoint.sh M ttcn3-gbproxy-test/Dockerfile D ttcn3-gbproxy-test/docker-entrypoint.sh D ttcn3-gbproxy-test/pipework 8 files changed, 7 insertions(+), 524 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/22823/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 512b4ac..6a70d6c 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -64,3 +64,4 @@ ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare ADD ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run +ADD pipework /usr/local/bin/pipework diff --git a/ttcn3-fr-test/pipework b/debian-stretch-titan/pipework similarity index 100% rename from ttcn3-fr-test/pipework rename to debian-stretch-titan/pipework diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-stretch-titan/ttcn3-docker-run.sh index 0cda8a5..da3d314 100755 --- a/debian-stretch-titan/ttcn3-docker-run.sh +++ b/debian-stretch-titan/ttcn3-docker-run.sh @@ -13,6 +13,10 @@ SUBDIR=$1 SUITE=$2 +if [ -n "$WAIT_FOR_NETDEV" ]; then + pipework --wait -i "$WAIT_FOR_NETDEV" +fi + cd /data /osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE" diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 1f0e6e1..ae355d7 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -9,7 +9,5 @@ COPY FR_Tests.cfg /data/FR_Tests.cfg COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg -COPY pipework /usr/bin/pipework -COPY docker-entrypoint.sh /docker-entrypoint.sh -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["ttcn3-docker-run"] diff --git a/ttcn3-fr-test/docker-entrypoint.sh b/ttcn3-fr-test/docker-entrypoint.sh deleted file mode 100755 index 132c73c..0000000 --- a/ttcn3-fr-test/docker-entrypoint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -eou pipefail - -SUBDIR=$1 -SUITE=$2 - -if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then - /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} -fi - -cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/$SUBDIR/$SUITE; \ -exit_code=$? - -/osmo-ttcn3-hacks/log_merge.sh $SUITE --rm - -exit $exit_code diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 661ca07..aee22ff 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -8,7 +8,5 @@ VOLUME /data COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg -COPY pipework /usr/bin/pipework -COPY docker-entrypoint.sh /docker-entrypoint.sh -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["ttcn3-docker-run", "gbproxy", "GBProxy_Tests"] diff --git a/ttcn3-gbproxy-test/docker-entrypoint.sh b/ttcn3-gbproxy-test/docker-entrypoint.sh deleted file mode 100755 index cfdd898..0000000 --- a/ttcn3-gbproxy-test/docker-entrypoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eou pipefail - -if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then - /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} -fi - -cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/gbproxy/GBProxy_Tests; \ -exit_code=$? - -/osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm - -exit $exit_code diff --git a/ttcn3-gbproxy-test/pipework b/ttcn3-gbproxy-test/pipework deleted file mode 100755 index 97ce66b..0000000 --- a/ttcn3-gbproxy-test/pipework +++ /dev/null @@ -1,489 +0,0 @@ -#!/bin/sh -# This code should (try to) follow Google's Shell Style Guide -# (https://google.github.io/styleguide/shell.xml) -set -e - -case "$1" in - --wait) - WAIT=1 - ;; - --direct-phys) - DIRECT_PHYS=1 - shift - ;; -esac - -IFNAME=$1 - -# default value set further down if not set here -CONTAINER_IFNAME= -if [ "$2" = "-i" ]; then - CONTAINER_IFNAME=$3 - shift 2 -fi - -if [ "$2" = "-l" ]; then - LOCAL_IFNAME=$3 - shift 2 -fi - -#inet or inet6 -FAMILY_FLAG="-4" -if [ "$2" = "-a" ]; then - FAMILY_FLAG="-$3" - shift 2 -fi - -GUESTNAME=$2 -IPADDR=$3 -MACADDR=$4 - -case "$MACADDR" in - *@*) - VLAN="${MACADDR#*@}" - VLAN="${VLAN%%@*}" - MACADDR="${MACADDR%%@*}" - ;; - *) - VLAN= - ;; -esac - -# did they ask to generate a custom MACADDR? -# generate the unique string -case "$MACADDR" in - U:*) - macunique="${MACADDR#*:}" - # now generate a 48-bit hash string from $macunique - MACADDR=$(echo $macunique|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/') - ;; -esac - - -[ "$IPADDR" ] || [ "$WAIT" ] || { - echo "Syntax:" - echo "pipework [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" - echo "pipework [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" - echo "pipework mac: [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" - echo "pipework mac: [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" - echo "pipework route " - echo "pipework rule " - echo "pipework tc " - echo "pipework --wait [-i containerinterface]" - exit 1 -} - -# Succeed if the given utility is installed. Fail otherwise. -# For explanations about `which` vs `type` vs `command`, see: -# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212 -# (Thanks to @chenhanxiao for pointing this out!) -installed () { - command -v "$1" >/dev/null 2>&1 -} - -# Google Styleguide says error messages should go to standard error. -warn () { - echo "$@" >&2 -} -die () { - status="$1" - shift - warn "$@" - exit "$status" -} - -if echo $IFNAME | grep -q '^mac:'; then - mac_address=$(echo $IFNAME | cut -c5-) - ifmatch= - for iftest in /sys/class/net/*; do - if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then - ifmatch="$(basename $iftest)" - break - fi - done - - if [ -z "$ifmatch" ]; then - die 1 "Mac address $mac_address specified for interface but no host interface matched." - else - IFNAME=$ifmatch - fi -fi - -# First step: determine type of first argument (bridge, physical interface...), -# Unless "--wait" is set (then skip the whole section) -if [ -z "$WAIT" ]; then - if [ -d "/sys/class/net/$IFNAME" ] - then - if [ -d "/sys/class/net/$IFNAME/bridge" ]; then - IFTYPE=bridge - BRTYPE=linux - elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then - IFTYPE=bridge - BRTYPE=openvswitch - elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 - IFTYPE=ipoib - # The IPoIB kernel module is fussy, set device name to ib0 if not overridden - CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} - PKEY=$VLAN - else IFTYPE=phys - fi - else - case "$IFNAME" in - br*) - IFTYPE=bridge - BRTYPE=linux - ;; - ovs*) - if ! installed ovs-vsctl; then - die 1 "Need OVS installed on the system to create an ovs bridge" - fi - IFTYPE=bridge - BRTYPE=openvswitch - ;; - route*) - IFTYPE=route - ;; - rule*) - IFTYPE=rule - ;; - tc*) - IFTYPE=tc - ;; - dummy*) - IFTYPE=dummy - ;; - *) die 1 "I do not know how to setup interface $IFNAME." ;; - esac - fi -fi - -# Set the default container interface name to eth1 if not already set -CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} - -[ "$WAIT" ] && { - while true; do - # This first method works even without `ip` or `ifconfig` installed, - # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. - grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break - # This method hopefully works on those older kernels. - ip link ls dev "$CONTAINER_IFNAME" && break - sleep 1 - done > /dev/null 2>&1 - exit 0 -} - -[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { - die 1 "VLAN configuration currently unsupported for Linux bridge." -} - -[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { - die 1 "MACADDR configuration unsupported for IPoIB interfaces." -} - -# Second step: find the guest (for now, we only support LXC containers) -while read _ mnt fstype options _; do - [ "$fstype" != "cgroup" ] && continue - echo "$options" | grep -qw devices || continue - CGROUPMNT=$mnt -done < /proc/mounts - -[ "$CGROUPMNT" ] || { - die 1 "Could not locate cgroup mount point." -} - -# Try to find a cgroup matching exactly the provided name. -M=$(find "$CGROUPMNT" -name "$GUESTNAME") -N=$(echo "$M" | wc -l) -if [ -z "$M" ] ; then - N=0 -fi -case "$N" in - 0) - # If we didn't find anything, try to lookup the container with Docker. - if installed docker; then - RETRIES=3 - while [ "$RETRIES" -gt 0 ]; do - DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") - DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") - DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") - - [ "$DOCKERPID" != 0 ] && break - sleep 1 - RETRIES=$((RETRIES - 1)) - done - - [ "$DOCKERPID" = 0 ] && { - die 1 "Docker inspect returned invalid PID 0" - } - - [ "$DOCKERPID" = "" ] && { - die 1 "Container $GUESTNAME not found, and unknown to Docker." - } - else - die 1 "Container $GUESTNAME not found, and Docker not installed." - fi - ;; - 1) true ;; - 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. - echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." - ;; - *) die 1 "Found more than one container matching $GUESTNAME." ;; -esac - -# only check IPADDR if we are not in a route mode -[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { - case "$IPADDR" in - # Let's check first if the user asked for DHCP allocation. - dhcp|dhcp:*) - # Use Docker-specific strategy to run the DHCP client - # from the busybox image, in the network namespace of - # the container. - if ! [ "$DOCKERPID" ]; then - warn "You asked for a Docker-specific DHCP method." - warn "However, $GUESTNAME doesn't seem to be a Docker container." - warn "Try to replace 'dhcp' with another option?" - die 1 "Aborting." - fi - DHCP_CLIENT=${IPADDR%%:*} - ;; - udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) - DHCP_CLIENT=${IPADDR%%:*} - # did they ask for the client to remain? - DHCP_FOREGROUND= - [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { - DHCP_FOREGROUND=true - } - DHCP_CLIENT=${DHCP_CLIENT%-f} - if ! installed "$DHCP_CLIENT"; then - die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." - fi - ;; - # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. - */*@*) - GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" - IPADDR="${IPADDR%%@*}" - ;; - # No gateway? We need at least a subnet, anyway! - */*) : ;; - # ... No? Then stop right here. - *) - warn "The IP address should include a netmask." - die 1 "Maybe you meant $IPADDR/24 ?" - ;; - esac -} - -# If a DHCP method was specified, extract the DHCP options. -if [ "$DHCP_CLIENT" ]; then - case "$IPADDR" in - *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; - esac -fi - -if [ "$DOCKERPID" ]; then - NSPID=$DOCKERPID -else - NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") - [ "$NSPID" ] || { - # it is an alternative way to get the pid - NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') - [ "$NSPID" ] || { - die 1 "Could not find a process inside container $GUESTNAME." - } - } -fi - -# Check if an incompatible VLAN device already exists -[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { - ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { - die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" - } -} - -[ ! -d /var/run/netns ] && mkdir -p /var/run/netns -rm -f "/var/run/netns/$NSPID" -ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" - -# Check if we need to create a bridge. -[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { - [ "$BRTYPE" = linux ] && { - (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") - ip link set "$IFNAME" up - } - [ "$BRTYPE" = openvswitch ] && { - ovs-vsctl add-br "$IFNAME" - } -} - -[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') - -# If it's a bridge, we need to create a veth pair -[ "$IFTYPE" = bridge ] && { - if [ -z "$LOCAL_IFNAME" ]; then - LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" - fi - GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" - # Does the link already exist? - if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then - # link exists, is it in use? - if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then - echo "Link $LOCAL_IFNAME exists and is up" - exit 1 - fi - # delete the link so we can re-add it afterwards - ip link del "$LOCAL_IFNAME" - fi - ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" - case "$BRTYPE" in - linux) - (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") - ;; - openvswitch) - if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then - ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ - -- set Interface "$LOCAL_IFNAME" \ - external-ids:pipework.interface="$LOCAL_IFNAME" \ - external-ids:pipework.bridge="$IFNAME" \ - ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ - ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ - ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ - ${VLAN:+external-ids:pipework.vlan="$VLAN"} - fi - ;; - esac - ip link set "$LOCAL_IFNAME" up -} - -# If it's a physical interface, create a macvlan subinterface -[ "$IFTYPE" = phys ] && { - [ "$VLAN" ] && { - [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { - ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" - } - ip link set "$IFNAME" up - IFNAME=$IFNAME.$VLAN - } - - if [ ! -z "$DIRECT_PHYS" ]; then - GUEST_IFNAME=$IFNAME - else - GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME - ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge - fi - - ip link set "$IFNAME" up -} - -# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB -# equivalent of a macvlan device) -# -# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an -# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of -# InfiniBand, without an intermediate Ethernet layer. -[ "$IFTYPE" = ipoib ] && { - GUEST_IFNAME="${IFNAME}.${NSPID}" - - # If a partition key is provided, use it - [ "$PKEY" ] && { - GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" - PKEY="pkey 0x$PKEY" - } - - ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY - ip link set "$IFNAME" up -} - -# If its a dummy interface, create a dummy interface. -[ "$IFTYPE" = dummy ] && { - GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME - ip link add dev "$GUEST_IFNAME" type dummy -} - -# If the `route` command was specified ... -if [ "$IFTYPE" = route ]; then - # ... discard the first two arguments and pass the rest to the route command. - shift 2 - ip netns exec "$NSPID" ip route "$@" -elif [ "$IFTYPE" = rule ] ; then - shift 2 - ip netns exec "$NSPID" ip rule "$@" -elif [ "$IFTYPE" = tc ] ; then - shift 2 - ip netns exec "$NSPID" tc "$@" -else - # Otherwise, run normally. - ip link set "$GUEST_IFNAME" netns "$NSPID" - ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" - [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" - - # When using any of the DHCP methods, we start a DHCP client in the - # network namespace of the container. With the 'dhcp' method, the - # client used is taken from the Docker busybox image (therefore - # requiring no specific client installed on the host). Other methods - # use a locally installed client. - case "$DHCP_CLIENT" in - dhcp) - docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ - busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ - $DHCP_OPTIONS \ - >/dev/null - ;; - udhcpc) - DHCP_Q="-q" - [ "$DHCP_FOREGROUND" ] && { - DHCP_OPTIONS="$DHCP_OPTIONS -f" - } - ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ - -x "hostname:$GUESTNAME" \ - -p "/var/run/udhcpc.$GUESTNAME.pid" \ - $DHCP_OPTIONS - [ ! "$DHCP_FOREGROUND" ] && { - rm "/var/run/udhcpc.$GUESTNAME.pid" - } - ;; - dhclient) - ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ - -pf "/var/run/dhclient.$GUESTNAME.pid" \ - -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ - $DHCP_OPTIONS - # kill dhclient after get ip address to prevent device be used after container close - [ ! "$DHCP_FOREGROUND" ] && { - kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" - rm "/var/run/dhclient.$GUESTNAME.pid" - } - ;; - dhcpcd) - ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" - ;; - "") - if installed ipcalc; then - eval $(ipcalc -b $IPADDR) - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" - else - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" - fi - - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true - } - ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" - } - ;; - esac - - # Give our ARP neighbors a nudge about the new interface - if installed arping; then - IPADDR=$(echo "$IPADDR" | cut -d/ -f1) - ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true - else - echo "Warning: arping not found; interface may not be immediately reachable" - fi -fi -# Remove NSPID to avoid `ip netns` catch it. -rm -f "/var/run/netns/$NSPID" - -# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 Gerrit-Change-Number: 22823 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:19:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 16:19:55 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 to look at the new patch set (#4). Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... gb_proxy: add support for relaying BSSGP RIM messages BSSGP RIM messages are routed from a source to a destination cell by a RIM routing information IE. Add parsing for the routing information and support for relaying RIM messages to the destination cell/PCU. If the destination cell/PCU is not directly connected to osmo-gbproxy route the rim message to the first connected SGSN. Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 128 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/04/22804/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:26:44 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 10 Feb 2021 16:26:44 +0000 Subject: Change in docker-playground[master]: ttcn3: remove /root/projects/git symlink In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22816 ) Change subject: ttcn3: remove /root/projects/git symlink ...................................................................... Patch Set 1: Verified-1 Please let me merge this patchset, after I've done some more testing. A smoke test with running ttcn3-mgw-test didn't show any breakage. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 Gerrit-Change-Number: 22816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Feb 2021 16:26:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:36:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:36:17 +0000 Subject: Change in docker-playground[master]: ttcn3: remove /root/projects/git symlink In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22816 ) Change subject: ttcn3: remove /root/projects/git symlink ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 Gerrit-Change-Number: 22816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 10 Feb 2021 16:36:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:36:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:36:43 +0000 Subject: Change in docker-playground[master]: ttcn3: move initial clone to debian-stretch-titan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22817 ) Change subject: ttcn3: move initial clone to debian-stretch-titan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd Gerrit-Change-Number: 22817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:36:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:37:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:37:18 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: update deps on change In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change ...................................................................... Patch Set 1: Code-Review+1 ah, elgant solution to use the Makefile itself as trigger. I didn't think of that when I wrote the issue. great! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:37:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:38:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:38:00 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:38:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:38:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:38:26 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: run 'make deps' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22820 ) Change subject: debian-stretch-titan: prepare: run 'make deps' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 Gerrit-Change-Number: 22820 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:38:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:38:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:38:48 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: start/stop links In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22821 ) Change subject: debian-stretch-titan: prepare: start/stop links ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada Gerrit-Change-Number: 22821 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:38:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:39:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:39:17 +0000 Subject: Change in docker-playground[master]: ttcn3: move shared run code to script In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22822 ) Change subject: ttcn3: move shared run code to script ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 Gerrit-Change-Number: 22822 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:39:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:39:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:39:43 +0000 Subject: Change in docker-playground[master]: ttcn3-{fr, gbproxy}-test: use ttcn3-docker-run too In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22823 ) Change subject: ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 Gerrit-Change-Number: 22823 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:40:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:40:52 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy_vty: Fix NRI VTY help MSC->SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22807 ) Change subject: gbproxy_vty: Fix NRI VTY help MSC->SGSN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I33a60578c7dc28ec50b98c9b67b5cdb0d821d3d1 Gerrit-Change-Number: 22807 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:41:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:41:08 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808 ) Change subject: gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d Gerrit-Change-Number: 22808 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:41:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:41:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:41:16 +0000 Subject: Change in osmo-gbproxy[master]: Various comment/whitespace changes In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22809 ) Change subject: Various comment/whitespace changes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0eeef3ec16c249d65e9358889d21cc4984b7b51f Gerrit-Change-Number: 22809 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:41:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:41:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:41:18 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy_vty: Fix NRI VTY help MSC->SGSN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22807 ) Change subject: gbproxy_vty: Fix NRI VTY help MSC->SGSN ...................................................................... gbproxy_vty: Fix NRI VTY help MSC->SGSN Change-Id: I33a60578c7dc28ec50b98c9b67b5cdb0d821d3d1 --- M src/gb_proxy_vty.c 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index 9dbde58..9240d2d 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -276,7 +276,7 @@ DEFUN_ATTR(cfg_sgsn_nri_add, cfg_sgsn_nri_add_cmd, "nri add <0-32767> [<0-32767>]", - NRI_STR "Add NRI value or range to the NRI mapping for this MSC\n" + NRI_STR "Add NRI value or range to the NRI mapping for this SGSN\n" NRI_FIRST_LAST_STR, CMD_ATTR_IMMEDIATE) { @@ -318,7 +318,7 @@ DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd, "nri del <0-32767> [<0-32767>]", - NRI_STR "Remove NRI value or range from the NRI mapping for this MSC\n" + NRI_STR "Remove NRI value or range from the NRI mapping for this SGSN\n" NRI_FIRST_LAST_STR, CMD_ATTR_IMMEDIATE) { @@ -348,10 +348,10 @@ DEFUN_ATTR(cfg_sgsn_no_allow_attach, cfg_sgsn_no_allow_attach_cmd, "no allow-attach", NO_STR - "Do not assign new subscribers to this MSC." - " Useful if an MSC in an MSC pool is configured to off-load subscribers." - " The MSC will still be operational for already IMSI-Attached subscribers," - " but the NAS node selection function will skip this MSC for new subscribers\n", + "Do not assign new subscribers to this SGSN." + " Useful if an SGSN in an SGSN pool is configured to off-load subscribers." + " The SGSN will still be operational for already IMSI-Attached subscribers," + " but the NAS node selection function will skip this SGSN for new subscribers\n", CMD_ATTR_IMMEDIATE) { struct gbproxy_sgsn *sgsn = vty->index; @@ -442,7 +442,7 @@ DEFUN_ATTR(cfg_gbproxy_nri_null_del, cfg_gbproxy_nri_null_del_cmd, "nri null del <0-32767> [<0-32767>]", - NRI_STR NULL_NRI_STR "Remove NRI value or range from the NRI mapping for this MSC\n" + NRI_STR NULL_NRI_STR "Remove NULL-NRI value (or range)\n" NRI_FIRST_LAST_STR, CMD_ATTR_IMMEDIATE) { -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I33a60578c7dc28ec50b98c9b67b5cdb0d821d3d1 Gerrit-Change-Number: 22807 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:41:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:41:19 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808 ) Change subject: gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc ...................................................................... gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc The MSC-pooling chapter in OsmoBSC mentions that overlapping NRI ranges will warn if configured though the VTY interface, but fail when started with such a config. The manual for OsmoGbProxy promises a similar behaviour, this patch implements it. Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d --- M src/gb_proxy_vty.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index 9240d2d..f069e88 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -283,6 +283,7 @@ struct gbproxy_sgsn *sgsn = vty->index; struct gbproxy_sgsn *other_sgsn; bool before; + bool overlaps = false; int rc; const char *message; struct osmo_nri_range add_range; @@ -307,13 +308,17 @@ if (osmo_nri_range_overlaps_ranges(&add_range, other_sgsn->pool.nri_ranges)) { uint16_t nsei = sgsn->nse->nsei; uint16_t other_nsei = other_sgsn->nse->nsei; + overlaps = true; NRI_WARN(sgsn, "NRI range [%d..%d] overlaps between NSE %05d and NSE %05d." " For overlaps, NSE %05d has higher priority than NSE %05d", add_range.first, add_range.last, nsei, other_nsei, before ? other_nsei : nsei, before ? nsei : other_nsei); } } - return CMD_SUCCESS; + if (overlaps) + return CMD_WARNING; + else + return CMD_SUCCESS; } DEFUN_ATTR(cfg_sgsn_nri_del, cfg_sgsn_nri_del_cmd, -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id3815ed8d1736ea3ba1e498b2bc3cf30b772551d Gerrit-Change-Number: 22808 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:41:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:41:20 +0000 Subject: Change in osmo-gbproxy[master]: Various comment/whitespace changes In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22809 ) Change subject: Various comment/whitespace changes ...................................................................... Various comment/whitespace changes Change-Id: I0eeef3ec16c249d65e9358889d21cc4984b7b51f --- M src/gb_proxy.c M src/gb_proxy_peer.c 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb_proxy.c b/src/gb_proxy.c index f773584..2d8b5e4 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -461,7 +461,6 @@ } else if (TLVP_PRESENT(&tp, BSSGP_IE_IMSI)) { /* FIXME: Use the IMSI as selector? */ rc = gbprox_bss2sgsn_tlli(bss_bvc->cell, msg, NULL, false); - /* rc = gbprox_bss2sgsn_hashed(bss_bvc->cell, msg, NULL); */ } else LOGPBVC(bss_bvc, LOGL_ERROR, "Rx RADIO-STATUS without any of the conditional IEs\n"); break; @@ -1392,7 +1391,7 @@ uint8_t cause = BSSGP_CAUSE_OML_INTERV; bvc = gbproxy_bvc_by_bvci(sgsn_nse, 0); if (bvc) - osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); + osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); } break; case GPRS_NS2_AFF_CAUSE_FAILURE: diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 9ea00a9..27d73b8 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -93,8 +93,7 @@ /* We leave allocating the bvc->fi to the caller, as the FSM details depend * on the type of BVC (SIG/PTP) and role (SGSN/BSS) */ - - return bvc; + return bvc; } void gbproxy_bvc_free(struct gbproxy_bvc *bvc) @@ -711,7 +710,7 @@ return NULL; } -/*! Seleect a pseudo-random SGSN for a given TLLI, ignoring any SGSN that is not accepting connections +/*! Select a pseudo-random SGSN for a given TLLI, ignoring any SGSN that is not accepting connections * \param[in] cfg The gbproxy configuration * \param[in] sgsn_avoid If not NULL then avoid this SGSN when selecting a new one. Use for load redistribution * \param[in] tlli The tlli to choose an SGSN for. The same tlli will map to the same SGSN as long as no SGSN is -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0eeef3ec16c249d65e9358889d21cc4984b7b51f Gerrit-Change-Number: 22809 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:42:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:42:17 +0000 Subject: Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22814 ) Change subject: Fix neigh resolution service on local neighbours ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:42:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:43:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:43:02 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to bts.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22813/1/tests/handover/Makefile.am File tests/handover/Makefile.am: https://gerrit.osmocom.org/c/osmo-bsc/+/22813/1/tests/handover/Makefile.am at a125 PS1, Line 125: neighbor_ident_test_LDADD = \ it's really ugly that you need to pull in all of this, and add all of the stubs below now. Wouldn't really call that an improvement :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:43:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:43:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:43:25 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 ) Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 16:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:43:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 16:43:33 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: add support for relaying BSSGP RIM messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 ) Change subject: gb_proxy: add support for relaying BSSGP RIM messages ...................................................................... gb_proxy: add support for relaying BSSGP RIM messages BSSGP RIM messages are routed from a source to a destination cell by a RIM routing information IE. Add parsing for the routing information and support for relaying RIM messages to the destination cell/PCU. If the destination cell/PCU is not directly connected to osmo-gbproxy route the rim message to the first connected SGSN. Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 128 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 2d8b5e4..4147d86 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -886,6 +887,79 @@ return 0; } +/* Receive an incoming RIM message from a BSS-side NS-VC */ +static int gbprox_rx_rim_from_bss(struct tlv_parsed *tp, struct gbproxy_nse *nse, struct msgb *msg, char *log_pfx, + const char *pdut_name) +{ + struct gbproxy_sgsn *sgsn; + struct gbproxy_cell *dest_cell; + struct gbproxy_cell *src_cell; + struct bssgp_rim_routing_info dest_ri; + struct bssgp_rim_routing_info src_ri; + int rc; + + rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + + /* Since gbproxy is 2G only we do not expect to get RIM messages only from GERAN cells. */ + if (src_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { + LOGP(DGPRS, LOGL_ERROR, "%s %s source RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&src_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* Lookup source cell to make sure that the source RIM routing information actually belongs + * to a valid cell that we know */ + src_cell = gbproxy_cell_by_cellid(nse->cfg, &src_ri.geran.raid, src_ri.geran.cid); + if (!src_cell) { + LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for source RIM routing info (%s)\n", log_pfx, + pdut_name, bssgp_rim_ri_name(&src_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* TODO: Use bssgp_bvc_get_features_negotiated(src_cell->bss_bvc->fi) to check if the the BSS sided BVC actually + * did negotiate RIM support. If not we should respond with a BSSGP STATUS message. The cause code should be + * BSSGP_CAUSE_PDU_INCOMP_FEAT. */ + + /* If Destination is known by gbproxy, route directly */ + if (dest_ri.discr == BSSGP_RIM_ROUTING_INFO_GERAN) { + dest_cell = gbproxy_cell_by_cellid(nse->cfg, &dest_ri.geran.raid, dest_ri.geran.cid); + if (dest_cell) { + /* TODO: Also check if dest_cell->bss_bvc is RIM-capable (see also above). If not we should + * respond with a BSSGP STATUS message as well because it also would make no sense to try + * routing the RIM message to the next RIM-capable SGSN. */ + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, + dest_cell->bss_bvc->nse->nsei, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); + } + } + + /* Otherwise pass on to a RIM-capable SGSN */ + /* TODO: We need to extend gbproxy_select_sgsn() so that it selects a RIM-capable SGSN, at the moment we just + * get any SGSN and just assume that it is RIM-capable. */ + sgsn = gbproxy_select_sgsn(nse->cfg, NULL); + if (!sgsn) { + LOGP(DGPRS, LOGL_NOTICE, + "%s %s cannot route RIM message (%s to %s) since no RIM capable SGSN is found!\n", log_pfx, + pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, + sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + + return gbprox_relay2nse(msg, sgsn->nse, 0); +} + /* Receive an incoming signalling message from a BSS-side NS-VC */ static int gbprox_rx_sig_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -984,8 +1058,7 @@ case BSSGP_PDUT_RAN_INFO_ACK: case BSSGP_PDUT_RAN_INFO_ERROR: case BSSGP_PDUT_RAN_INFO_APP_ERROR: - /* FIXME: route based in RIM Routing IE */ - rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); + rc = gbprox_rx_rim_from_bss(tp, nse, msg, log_pfx, pdut_name); break; case BSSGP_PDUT_LLC_DISCARD: case BSSGP_PDUT_FLUSH_LL_ACK: @@ -1134,6 +1207,58 @@ return 0; } +/* Receive an incoming RIM message from the SGSN-side NS-VC */ +static int gbprox_rx_rim_from_sgsn(struct tlv_parsed *tp, struct gbproxy_nse *nse, struct msgb *msg, char *log_pfx, + const char *pdut_name) +{ + struct gbproxy_sgsn *sgsn; + struct gbproxy_cell *dest_cell; + struct bssgp_rim_routing_info dest_ri; + struct bssgp_rim_routing_info src_ri; + int rc; + + /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in + gbprox_rx_rim_from_bss() */ + + rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), + TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); + if (rc < 0) { + LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + } + + /* Since gbproxy is 2G only we do not expect to get RIM messages that target non-GERAN cells. */ + if (dest_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { + LOGP(DGPRS, LOGL_ERROR, "%s %s destination RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, + bssgp_rim_ri_name(&dest_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* Lookup destination cell */ + dest_cell = gbproxy_cell_by_cellid(nse->cfg, &dest_ri.geran.raid, dest_ri.geran.cid); + if (!dest_cell) { + LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for destination RIM routing info (%s)\n", log_pfx, + pdut_name, bssgp_rim_ri_name(&dest_ri)); + return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + } + + /* TODO: Check if the BVC of the destination cell actually did negotiate RIM support, see also comments + * in gbprox_rx_rim_from_bss() */ + sgsn = gbproxy_sgsn_by_nsei(nse->cfg, nse->nsei); + OSMO_ASSERT(sgsn); + + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, + sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + + return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); +} + /* Receive an incoming signalling message from the SGSN-side NS-VC */ static int gbprox_rx_sig_from_sgsn(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -1286,9 +1411,7 @@ case BSSGP_PDUT_RAN_INFO_ACK: case BSSGP_PDUT_RAN_INFO_ERROR: case BSSGP_PDUT_RAN_INFO_APP_ERROR: - /* FIXME: route based in RIM Routing IE */ - rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg); - break; + rc = gbprox_rx_rim_from_sgsn(tp, nse, msg, log_pfx, pdut_name); default: LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idd1ea46832e044f0ade15af32250f90517d848d8 Gerrit-Change-Number: 22804 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 16:57:21 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 16:57:21 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: fix wrong usage of bssgp_rim_ri_name() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 ) Change subject: gb_proxy: fix wrong usage of bssgp_rim_ri_name() ...................................................................... gb_proxy: fix wrong usage of bssgp_rim_ri_name() In some logging statements the function bssgp_rim_ri_name() is used twice. This is wrong since _name() functions use an internal buffer, which can not be used twice in the same logging statement, so for the affected log statements the function bssgp_rim_ri_name_buf() must be used. Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/24/22824/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 4147d86..43d819d 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -897,6 +897,8 @@ struct bssgp_rim_routing_info dest_ri; struct bssgp_rim_routing_info src_ri; int rc; + char ri_src_str[64]; + char ri_dest_str[64]; rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); @@ -938,8 +940,10 @@ /* TODO: Also check if dest_cell->bss_bvc is RIM-capable (see also above). If not we should * respond with a BSSGP STATUS message as well because it also would make no sense to try * routing the RIM message to the next RIM-capable SGSN. */ - LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, - dest_cell->bss_bvc->nse->nsei, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n", + log_pfx, pdut_name, dest_cell->bss_bvc->nse->nsei, + bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri), + bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri)); return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); } } @@ -954,8 +958,10 @@ pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } - LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, - sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", + log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name, + bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri), + bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri)); return gbprox_relay2nse(msg, sgsn->nse, 0); } @@ -1216,6 +1222,8 @@ struct bssgp_rim_routing_info dest_ri; struct bssgp_rim_routing_info src_ri; int rc; + char ri_src_str[64]; + char ri_dest_str[64]; /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in gbprox_rx_rim_from_bss() */ @@ -1253,8 +1261,10 @@ sgsn = gbproxy_sgsn_by_nsei(nse->cfg, nse->nsei); OSMO_ASSERT(sgsn); - LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, - sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", + log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name, + bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri), + bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri)); return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 Gerrit-Change-Number: 22824 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 17:05:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 17:05:28 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to bts.c In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22813/1/tests/handover/Makefile.am File tests/handover/Makefile.am: https://gerrit.osmocom.org/c/osmo-bsc/+/22813/1/tests/handover/Makefile.am at a125 PS1, Line 125: neighbor_ident_test_LDADD = \ > it's really ugly that you need to pull in all of this, and add all of the stubs below now. [?] Well I'd say that's totally irrelevant, a different problem with regards to the change in code. Thiss mess needs to be fixed by this proposal: """ we really need to do some libbsc.a target bundle in osmo-bsc.git/src/, each time that some stuff changes there I need to add around 20 lines of .o objects in some makefile.am... """ I can work on that later but not right now since I have more high-prio stuff to do atm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 17:05:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 17:06:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 17:06:52 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to bts.c In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Patch Set 1: So, what I meant is: In the end, to me it doesn't make sense to decide to put code in the incorrect file just because then on our build foo adding lots of *.o we have to put more churn (which should be fixed as expressed in my prev comment). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 17:06:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 17:34:37 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 17:34:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 ) Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... GBProxy_Tests: fix TC_rim_info_pcu2pcu The testcase TC_rim_info_pcu2pcu calls a function f_TC_rim_info_pcu2pcu() which uses the templates from Osmocom_Gb_Types.ttcn not as intended. This eventually lets the altstep in f_rim_pcu2pcu() run into timeout since the templates never match. Change-Id: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Related: SYS#5103 --- M gbproxy/GBProxy_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/22825/1 diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 0f3b4cb..af9646c 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -3122,22 +3122,34 @@ { var BssgpCellId cell_id_src := g_pcu[src_pcu_idx].cfg.bvc[src_bvc_idx].cell_id; var BssgpCellId cell_id_dst := g_pcu[dst_pcu_idx].cfg.bvc[dst_bvc_idx].cell_id; - var template (value) RIM_Routing_Information ri_pcu_src; - var template (value) RIM_Routing_Information ri_pcu_dst; - var template (value) RAN_Information_RIM_Container cont; + var template (value) RIM_Routing_Information ri_pcu_src_tx; + var template (value) RIM_Routing_Information ri_pcu_dst_tx; + var template RIM_Routing_Information ri_pcu_src_rx; + var template RIM_Routing_Information ri_pcu_dst_rx; + var template (value) RAN_Information_RIM_Container cont_tx; + var template RAN_Information_RIM_Container cont_rx; log("Testing RIM PCU2PCU from PCU[", src_pcu_idx, "][", src_bvc_idx, "] to PCU[", dst_pcu_idx, "][", dst_bvc_idx, "]"); - ri_pcu_src := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + ri_pcu_src_tx := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, t_RIM_Routing_Address_cid(cell_id_src)); - ri_pcu_dst := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + ri_pcu_dst_tx := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, t_RIM_Routing_Address_cid(cell_id_dst)); - cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), - ts_RIM_Sequence_Number(0), - ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_STOP)); - f_rim_pcu2pcu(ts_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst, src := ri_pcu_src, cont := cont), - tr_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst, src := ri_pcu_src, cont := cont), + ri_pcu_src_rx := tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + t_RIM_Routing_Address_cid(cell_id_src)); + ri_pcu_dst_rx := tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + t_RIM_Routing_Address_cid(cell_id_dst)); + + cont_tx := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), + ts_RIM_Sequence_Number(0), + ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_STOP)); + cont_rx := tr_RAN_Information_RIM_Container(tr_RIM_Application_Identity(RIM_APP_ID_NACC), + tr_RIM_Sequence_Number(0), + tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_STOP)); + + f_rim_pcu2pcu(ts_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst_tx, src := ri_pcu_src_tx, cont := cont_tx), + tr_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst_rx, src := ri_pcu_src_rx, cont := cont_rx), src_pcu_idx, dst_pcu_idx); } testcase TC_rim_info_pcu2pcu() runs on GlobalTest_CT -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 17:38:34 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 17:38:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 ) Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825/1//COMMIT_MSG at 10 PS1, Line 10: which uses the templates from Osmocom_Gb_Types.ttcn not as intended "[...] which doesn't use the templates [...] as intended." https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825/1//COMMIT_MSG at 11 PS1, Line 11: into timeout into a timeout -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 17:38:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:12:06 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 10 Feb 2021 18:12:06 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: fix wrong usage of bssgp_rim_ri_name() In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 ) Change subject: gb_proxy: fix wrong usage of bssgp_rim_ri_name() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 Gerrit-Change-Number: 22824 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 18:12:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:21:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 18:21:12 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Move code filling struct to helper function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22826 ) Change subject: nacc_fsm: Move code filling struct to helper function ...................................................................... nacc_fsm: Move code filling struct to helper function Same filler will be needed in different places since that message can arrive at different points of time (different states). It also helps supporting newer key types in the future. Change-Id: Idfd4db8408f767b1847b04c88047a1c4996e543e --- M src/nacc_fsm.c 1 file changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/26/22826/1 diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 6a92f83..f9dea98 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -268,6 +268,22 @@ return 0; } +static int fill_neigh_key_from_bts_pkt_cell_chg_not(struct neigh_cache_entry_key *neigh_key, + const struct gprs_rlcmac_bts *bts, + const Packet_Cell_Change_Notification_t *notif) +{ + switch (notif->Target_Cell.UnionType) { + case 0: /* GSM */ + neigh_key->local_lac = bts->cgi_ps.rai.lac.lac; + neigh_key->local_ci = bts->cgi_ps.cell_identity; + neigh_key->tgt_arfcn = notif->Target_Cell.u.Target_Cell_GSM_Notif.ARFCN; + neigh_key->tgt_bsic = notif->Target_Cell.u.Target_Cell_GSM_Notif.BSIC; + return 0; + default: + return -ENOTSUP; + } +} + #define SI_HDR_LEN 2 static void bts_fill_si_cache_value(const struct gprs_rlcmac_bts *bts, struct si_cache_value *val) { @@ -303,19 +319,12 @@ switch (event) { case NACC_EV_RX_CELL_CHG_NOTIFICATION: notif = (Packet_Cell_Change_Notification_t *)data; - switch (notif->Target_Cell.UnionType) { - case 0: /* GSM */ - ctx->neigh_key.local_lac = bts->cgi_ps.rai.lac.lac; - ctx->neigh_key.local_ci = bts->cgi_ps.cell_identity; - ctx->neigh_key.tgt_arfcn = notif->Target_Cell.u.Target_Cell_GSM_Notif.ARFCN; - ctx->neigh_key.tgt_bsic = notif->Target_Cell.u.Target_Cell_GSM_Notif.BSIC; - nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); - break; - default: + if (fill_neigh_key_from_bts_pkt_cell_chg_not(&ctx->neigh_key, bts, notif) < 0) { LOGPFSML(fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", notif->Target_Cell.UnionType); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); - return; + } else { + nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); } break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idfd4db8408f767b1847b04c88047a1c4996e543e Gerrit-Change-Number: 22826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:31:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 18:31:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans ...................................................................... pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans Tests verify dup retrans triggered by MS timer are ignored if the target cell is still the same (and hence no logic/behavior change is required, current process can proceed onwards). Related: SYS#4909 Change-Id: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 --- M pcu/PCU_Tests.ttcn 1 file changed, 219 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/22829/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 0b887db..f7687f5 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -57,6 +57,7 @@ import from StatsD_Checker all; import from IPA_Emulation all; +import from Osmocom_CTRL_Types all; import from Osmocom_CTRL_Adapter all; import from Osmocom_CTRL_Functions all; @@ -3611,6 +3612,55 @@ return; } +private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) +runs on RAW_PCU_Test_CT { + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), + info_ind.lac), + info_ind.rac), + info_ind.cell_id)); + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ + 423), + 2), + 5)); + var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); + var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); + var template (value) RAN_Information_RIM_Container res_cont := + ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), + ts_RIM_Sequence_Number(2), + ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), + ts_RIM_Protocol_Version_Number(1), + tsu_ApplContainer_or_ApplErrContainer_NACC(tsu_ApplContainer_NACC(dst, false, 3, si_default)), + omit); + RIM.send(ts_PDU_BSSGP_RAN_INFORMATION(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + res_cont)); +} + +altstep as_outbound_nacc_rim_resolve(PCUIF_info_ind info_ind, boolean do_answer := true, boolean do_repeat := false) +runs on RAW_PCU_Test_CT { + /* RIM procedure: */ + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), + info_ind.lac), + info_ind.rac), + info_ind.cell_id)); + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ + 423), + 2), + 5)); + var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); + var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); + [] RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + tr_RAN_Information_Request_RIM_Container)) { + if (do_answer) { + f_outbound_nacc_rim_tx_resp(info_ind); + } + if (do_repeat) { + repeat; + } + } +} + /* Start NACC from MS side */ private function f_outbound_nacc_success(inout GprsMS ms, PCUIF_info_ind info_ind, boolean exp_rac_ci_query := true, boolean exp_si_query := true, @@ -3639,29 +3689,7 @@ if (exp_si_query == true) { /* RIM procedure: */ - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */ - info_ind.lac), - info_ind.rac), - info_ind.cell_id)); - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ - 423), - 2), - 5)); - var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); - var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); - var template (value) RAN_Information_RIM_Container res_cont; - res_cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), - ts_RIM_Sequence_Number(2), - ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), - ts_RIM_Protocol_Version_Number(1), - tsu_ApplContainer_or_ApplErrContainer_NACC(tsu_ApplContainer_NACC(dst, false, 3, si_default)), - omit); - RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), - tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), - tr_RAN_Information_Request_RIM_Container)); - RIM.send(ts_PDU_BSSGP_RAN_INFORMATION(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), - ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), - res_cont)); + as_outbound_nacc_rim_resolve(info_ind); } /* Announce SI back to MS, continue NACC procedure */ @@ -4119,6 +4147,172 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notify twice (duplicate msg) while waiting for CTRL resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl; + /* Before receiving CTRL response, MS retransmits Pkt cell Chg Notif */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + IPA_CTRL.send(ts_CtrlMsgGetRepl(rx_ctrl.cmd.id, valueof(ctrl_var), valueof("023-43-423-2-5"))); + timer T := 2.0; + T.start; + alt { + [] as_outbound_nacc_rim_resolve(info_ind, do_repeat := true); + [] IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl { + setverdict(fail, "Received unexpected CTRL resolution after duplicate Pkt Cell Change Notification:", rx_ctrl); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(pass); + } + } + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + +/* Test MS sending Pkt Cell Change Notify twice (duplicate msg) while waiting for SI resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup2() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + as_outbound_nacc_rim_resolve(info_ind, do_answer := false); + /* Before receiving RIM response, MS retransmits Pkt cell Chg Notif */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + f_outbound_nacc_rim_tx_resp(info_ind); + timer T := 1.0; + T.start; + alt { + [] RIM.receive { + setverdict(fail, "Received unexpected RIM message"); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(pass); + } + } + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -4346,6 +4540,8 @@ execute( TC_nacc_outbound_rac_ci_resolve_timeout() ); execute( TC_nacc_outbound_rac_ci_resolve_fail_parse_response() ); execute( TC_nacc_outbound_si_resolve_timeout() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup2() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 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: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 Gerrit-Change-Number: 22829 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:52:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 18:52:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 ) Change subject: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates ...................................................................... SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates Change-Id: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 --- M library/SCCP_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/22830/1 diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index b0e6df7..ff4d745 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -143,7 +143,7 @@ calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), data := { - paramLength := lengthof(data), + paramLength := ?, data := data } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 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: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 Gerrit-Change-Number: 22830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:52:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 18:52:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add Tests for SCMG SST procedure References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 ) Change subject: sccp: Add Tests for SCMG SST procedure ...................................................................... sccp: Add Tests for SCMG SST procedure The SST procedure can be used by any SCCP node to test the availability of a remote SSN. If the specified remote SSN is available at the specified PC, a SCMG SSA is returned. If not, there's a timeout. Test for SSN=1 (SCMG), another non-SCMG SSN that exists, and for one SSN that doesn't exist. Change-Id: If3f5f3144c0ed83d0bda5953522a9d73287c8ba2 --- M deps/Makefile M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 3 files changed, 185 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/22831/1 diff --git a/deps/Makefile b/deps/Makefile index c5fd338..c9cc53d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -44,7 +44,6 @@ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolEmulations.M3UA \ - titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.GRE \ titan.ProtocolModules.M2PA \ titan.ProtocolModules.ROSE \ @@ -65,6 +64,7 @@ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ titan.TestPorts.UDPasp \ + titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.BSSGP_v13.0.0 OSMOGIT_REPOS= titan.ProtocolModules.MAP \ @@ -80,7 +80,7 @@ # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= R.7.A-10-g2ca1566 +titan.ProtocolEmulations.SCCP_commit= R.7.A-11-gd4b7a6d titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= master diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index ff4d745..9936dd0 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -215,5 +215,90 @@ } } +private function f_pc_int2bit(template (present) integer pc) +return template SCMG_param_AffectedPointCode { + if (istemplatekind(pc, "?")) { + return ?; + } else { + return int2bit(valueof(pc), 16); + } +} + +template (value) PDU_SCMG_message ts_SCMG_SSA(template (value) integer ssn, + integer pc, + template (value) BIT2 smi := '00'B) := { + messageType := sSAallowed, + affectedSSN := ssn, + affectedPC := int2bit(valueof(pc), 16), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCMG_SSA(template (present) integer ssn := ?, + template (present) integer pc := ?, + template (present) BIT2 smi := ?) := { + messageType := sSAallowed, + affectedSSN := ssn, + affectedPC := f_pc_int2bit(pc), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} + +template (value) PDU_SCMG_message ts_SCMG_SSP(template (value) integer ssn, + integer pc, + template (value) BIT2 smi := '00'B) := { + messageType := sSPprohib, + affectedSSN := ssn, + affectedPC := int2bit(valueof(pc), 16), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCMG_SSP(template (present) integer ssn := ?, + template (present) integer pc := ?, + template (present) BIT2 smi := ?) := { + messageType := sSPprohib, + affectedSSN := ssn, + affectedPC := f_pc_int2bit(pc), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} + +template (value) PDU_SCMG_message ts_SCMG_SST(template (value) integer ssn, + integer pc, + template (value) BIT2 smi := '00'B) := { + messageType := sSTstaTest, + affectedSSN := ssn, + affectedPC := int2bit(valueof(pc), 16), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCMG_SST(template (present) integer ssn := ?, + template (present) integer pc := ?, + template (present) BIT2 smi := ?) := { + messageType := sSTstaTest, + affectedSSN := ssn, + affectedPC := f_pc_int2bit(pc), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} + + } diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 7d44eb4..356fbb2 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -310,11 +310,109 @@ } } +function f_scmg_xceive(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) PDU_SCMG_message tx, + template (omit) PDU_SCMG_message rx_exp) runs on SCCP_Test_RAW_CT +{ + var boolean exp_something := true; + timer T := 5.0; + + if (istemplatekind(rx_exp, "omit")) { + exp_something := false; + } + + MTP3.clear; + f_send_sccp(ts_SCCP_UDT(calling, called, enc_PDU_SCMG_message(valueof(tx)))); + T.start; + alt { + [exp_something] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_UDT(called, calling, decmatch rx_exp))) { + setverdict(pass); + } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_UDT(called, calling, ?))) { + setverdict(fail, "Received unexpected SCCP waiting for ", rx_exp); + } + [] MTP3.receive { + setverdict(fail, "Received unexpected waiting for ", rx_exp); + } + [exp_something] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_exp); + } + [not exp_something] T.timeout { + setverdict(pass); + } + } + +} + +/* Test is SST(SSN=1) returns SSA */ +testcase TC_scmg_sst_ssn1() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var template (value) PDU_SCMG_message tx; + var template (present) PDU_SCMG_message rx_exp; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + tx := ts_SCMG_SST(1, mp_sccp_cfg[0].peer_pc); + rx_exp := ts_SCMG_SSA(1, mp_sccp_cfg[0].peer_pc); + f_scmg_xceive(calling, called, tx, rx_exp); +} + +/* Test is SST(SSN=valid) returns SSA */ +testcase TC_scmg_sst_ssn_valid() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var template (value) PDU_SCMG_message tx; + var template (present) PDU_SCMG_message rx_exp; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + tx := ts_SCMG_SST(mp_sccp_cfg[0].peer_ssn, mp_sccp_cfg[0].peer_pc); + rx_exp := ts_SCMG_SSA(mp_sccp_cfg[0].peer_ssn, mp_sccp_cfg[0].peer_pc); + f_scmg_xceive(calling, called, tx, rx_exp); +} + + +/* Test is SST(SSN=invalid) returns nothing */ +testcase TC_scmg_sst_ssn_invalid() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var template (value) PDU_SCMG_message tx; + var template (omit) PDU_SCMG_message rx_exp; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + tx := ts_SCMG_SST(123, mp_sccp_cfg[0].peer_pc); + rx_exp := omit; + f_scmg_xceive(calling, called, tx, rx_exp); +} + + + control { execute( TC_cr_cc() ); execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); execute( TC_it_avoids_tiar() ); + + execute( TC_scmg_sst_ssn1() ); + execute( TC_scmg_sst_ssn_valid() ); + execute( TC_scmg_sst_ssn_invalid() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 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: If3f5f3144c0ed83d0bda5953522a9d73287c8ba2 Gerrit-Change-Number: 22831 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:52:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 18:52:55 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22800 to look at the new patch set (#2). Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... gsm: Introduce API osmo_gsm48_rest_octets_si13_decode Related: SYS#5358 Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb --- M include/osmocom/gsm/gsm48_rest_octets.h M src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 3 files changed, 110 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22800/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:59:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 18:59:52 +0000 Subject: Change in libosmo-sccp[master]: xua: introduce xua_msg_get_u32p() helper References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 ) Change subject: xua: introduce xua_msg_get_u32p() helper ...................................................................... xua: introduce xua_msg_get_u32p() helper Change-Id: Id7780074b82bc668ae148456750b1a01799decd1 --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/32/22832/1 diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index 329ba96..11bce6f 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -91,6 +91,7 @@ int xua_msg_add_u32(struct xua_msg *xua, uint16_t iei, uint32_t val); uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part); uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei); +const uint32_t *xua_msg_get_u32p(const struct xua_msg *xua, uint16_t iei, uint32_t *out); const char *xua_msg_part_get_str(const struct xua_msg_part *part); const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei); void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt); diff --git a/src/xua_msg.c b/src/xua_msg.c index 42c580d..1df9abd 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -297,6 +297,16 @@ return xua_msg_part_get_u32(part); } +/* get a U32 IE in host-byte-order, returning whether it exists (!= NULL) or not (== NULL) */ +const uint32_t *xua_msg_get_u32p(const struct xua_msg *xua, uint16_t iei, uint32_t *out) +{ + struct xua_msg_part *part = xua_msg_find_tag(xua, iei); + if (!part) + return NULL; + *out = xua_msg_part_get_u32(part); + return out; +} + const char *xua_msg_part_get_str(const struct xua_msg_part *part) { static char __thread buf[256]; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id7780074b82bc668ae148456750b1a01799decd1 Gerrit-Change-Number: 22832 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:59:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 18:59:53 +0000 Subject: Change in libosmo-sccp[master]: sua: per-ssn DUNA/DAVA notification References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 ) Change subject: sua: per-ssn DUNA/DAVA notification ...................................................................... sua: per-ssn DUNA/DAVA notification Unlike M3UA, in SUA a DUNA/DAVA message can contain not just the point code that became available / unavailable, but it can also include a SSN. In that case, it is just the SSN that became available/unavailable, and not the entire point code. Hence, a N-STATE.ind and not a N-PCSTATE.ind must be delivered to the SCCP user. Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf --- M src/sccp_internal.h M src/sccp_scmg.c M src/xua_snm.c 3 files changed, 120 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/33/22833/1 diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 6bd2af9..a95b07d 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -137,6 +137,8 @@ const struct osmo_scu_state_param *state); /* SCCP Management (SCMG) */ +void sccp_scmg_rx_ssn_allowed(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi); +void sccp_scmg_rx_ssn_prohibited(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi); void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); int sccp_scmg_init(struct osmo_sccp_instance *inst); diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 0e3905d..ed16fe7 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -36,6 +36,45 @@ #include "xua_internal.h" #include "sccp_internal.h" +/* ITU-T Q.714 5.3.3 Subsystem allowed */ +void sccp_scmg_rx_ssn_allowed(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi) +{ + struct osmo_scu_state_param state; + /* 1) Instruct the translation function to update the translation tables */ + /* 2) Mark as "allowed" the status of that subsystem. */ + /* 3) Initiate a local broadcast of "User-in-service" information for the allowed subsystem */ + state = (struct osmo_scu_state_param) { + .affected_pc = dpc, + .affected_ssn = ssn, + .user_in_service = true, + .ssn_multiplicity_ind = smi, + }; + sccp_lbcs_local_bcast_state(inst, &state); + /* 4) Discontinue the subsystem status test if such a test was in progress */ + /* 5) Initiate a broadcast of Subsystem-Allowed messages to concerned signalling points. */ +} + +/* ITU-T Q.714 5.3.2 Subsystem prohibited */ +void sccp_scmg_rx_ssn_prohibited(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi) +{ + struct osmo_scu_state_param state; + /* 1) instruct the translation function to update the translation tables */ + /* 2) mark as "prohibited" the status of that subsystem */ + /* 3) initiate a local broadcast of "User-out-of-service" information */ + state = (struct osmo_scu_state_param) { + .affected_pc = dpc, + .affected_ssn = ssn, + .user_in_service = false, + .ssn_multiplicity_ind = smi, + }; + sccp_lbcs_local_bcast_state(inst, &state); + + /* 4) initiate the subsystem status test procedure if the prohibited subsystem is not local */ + /* 5) initiate a broadcast of Subsystem-Prohibited messages to concerned SP */ + /* 6) cancel "ignore subsystem status test" and the associated timer if in progress and if + * the newly prohibited subsystem resides at the local node. */ +} + /*! brief MTP -> SNM (MTP-PAUSE.ind) - inability to providing MTP service Q.714 5.2.2 */ void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc) { diff --git a/src/xua_snm.c b/src/xua_snm.c index e3efc8e..2a383c7 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -162,6 +162,53 @@ } } +/* generate SS-PROHIBITED / SS-ALLOWED towards local SCCP users */ +static void sua_snm_ssn_available_to_sccp(struct osmo_sccp_instance *sccp, uint32_t aff_pc, + uint32_t aff_ssn, uint32_t smi, bool available) +{ + if (available) + sccp_scmg_rx_ssn_allowed(sccp, aff_pc, aff_ssn, smi); + else + sccp_scmg_rx_ssn_prohibited(sccp, aff_pc, aff_ssn, smi); +} + +/* advertise availability of a single subsystem */ +static void sua_snm_ssn_available(struct osmo_ss7_as *as, uint32_t aff_pc, uint32_t aff_ssn, + const uint32_t *smi, const char *info_str, bool available) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + uint32_t _smi = smi ? *smi : 0; /* 0 == reserved/unknown in SUA */ + + if (s7i->sccp) + sua_snm_ssn_available_to_sccp(s7i->sccp, aff_pc, aff_ssn, _smi, available); + + /* inform remote SUA ASPs via DUNA/DAVA */ + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send DAVA/DUNA if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + /* DUNA/DAVA for SSN only exists in SUA */ + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_SUA) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + sua_tx_snm_available(asp, rctx, num_rctx, &aff_pc, 1, &aff_ssn, smi, info_str, available); + } +} + + /* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -211,6 +258,7 @@ void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) { struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + struct xua_msg_part *ie_ssn = xua_msg_find_tag(xua, SUA_IEI_SSN); const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); @@ -224,13 +272,28 @@ LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUNA(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); - xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, false); + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA && ie_ssn) { + /* when the SSN is included, DUNA corresponds to the SCCP N-STATE primitive */ + uint32_t ssn = xua_msg_part_get_u32(ie_ssn); + const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; + uint32_t pc, smi; + /* The Affected Point Code can only contain one point code when SSN is present */ + if (ie_aff_pc->len/sizeof(uint32_t) != 1) + return; + pc = ntohl(aff_pc[0]) & 0xffffff; + sua_snm_ssn_available(as, pc, ssn, xua_msg_get_u32p(xua, SUA_IEI_SMI, &smi), info_str, false); + } else { + /* when the SSN is not included, DUNA corresponds to the SCCP N-PCSTATE primitive */ + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, + ie_aff_pc->len / sizeof(uint32_t), info_str, false); + } } /* an incoming xUA DAVA was received from a remote SG */ void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) { struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + struct xua_msg_part *ie_ssn = xua_msg_find_tag(xua, SUA_IEI_SSN); const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); @@ -244,5 +307,19 @@ LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DAVA(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); - xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, true); + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA && ie_ssn) { + /* when the SSN is included, DAVA corresponds to the SCCP N-STATE primitive */ + uint32_t ssn = xua_msg_part_get_u32(ie_ssn); + const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; + uint32_t pc, smi; + /* The Affected Point Code can only contain one point code when SSN is present */ + if (ie_aff_pc->len/sizeof(uint32_t) != 1) + return; + pc = ntohl(aff_pc[0]) & 0xffffff; + sua_snm_ssn_available(as, pc, ssn, xua_msg_get_u32p(xua, SUA_IEI_SMI, &smi), info_str, true); + } else { + /* when the SSN is not included, DAVA corresponds to the SCCP N-PCSTATE primitive */ + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, + ie_aff_pc->len / sizeof(uint32_t), info_str, true); + } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf Gerrit-Change-Number: 22833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:59:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 18:59:53 +0000 Subject: Change in libosmo-sccp[master]: sccp: more SCMG handling: SSA and SSP message handling References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 ) Change subject: sccp: more SCMG handling: SSA and SSP message handling ...................................................................... sccp: more SCMG handling: SSA and SSP message handling When a SSP (Subsystem Prohibited) or SSA (Subsystem Available) SCMG message is received, we must generate the respective primitives towards the SCCP user. Change-Id: I149166a25113f5d3e3536f9297bf89ff3139b9e3 --- M src/sccp_scmg.c 1 file changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/34/22834/1 diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index ed16fe7..49e09ca 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -167,6 +167,33 @@ } +/* Subsystem Allowed received */ +static int scmg_rx_ssa(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *ssa) +{ + /* Q.714 5.3.3 */ + if (ssa->affected_ssn == SCCP_SSN_MANAGEMENT) + return 0; + + /* if the SSN is not marked as prohibited, ignore */ + + /* Q.714 5.3.2.2 a) */ + sccp_scmg_rx_ssn_allowed(scu->inst, ssa->affected_pc, ssa->affected_ssn, ssa->smi); + + /* If the remote SCCP, at which the subsystem reported in the SSA message resides, is marked + * inaccessible, then the message is treated as an implicit indication of SCCP restart */ + return 0; +} + +/* Subsystem Prohibited received */ +static int scmg_rx_ssp(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *ssp) +{ + /* Q.714 5.3.2.2 a) */ + sccp_scmg_rx_ssn_prohibited(scu->inst, ssp->affected_pc, ssp->affected_ssn, ssp->smi); + return 0; +} + /* Subsystem Test received */ static int scmg_rx_sst(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *sst) @@ -191,10 +218,12 @@ const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *scmg) { switch (scmg->msg_type) { + case SCCP_SCMG_MSGT_SSA: + return scmg_rx_ssa(scu, calling_addr, called_addr, scmg); + case SCCP_SCMG_MSGT_SSP: + return scmg_rx_ssp(scu, calling_addr, called_addr, scmg); case SCCP_SCMG_MSGT_SST: return scmg_rx_sst(scu, calling_addr, called_addr, scmg); - case SCCP_SCMG_MSGT_SSP: - case SCCP_SCMG_MSGT_SSA: case SCCP_SCMG_MSGT_SOR: case SCCP_SCMG_MSGT_SOG: case SCCP_SCMG_MSGT_SSC: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I149166a25113f5d3e3536f9297bf89ff3139b9e3 Gerrit-Change-Number: 22834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 18:59:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 10 Feb 2021 18:59:54 +0000 Subject: Change in libosmo-sccp[master]: xua_snm: Implement handling of DUPU messages References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 ) Change subject: xua_snm: Implement handling of DUPU messages ...................................................................... xua_snm: Implement handling of DUPU messages A DUPU message in SUA and M3UA indicates the unavailability of a (MTP-level) user, i.e. the entire SCCP, ISUP, ... is not available. If we receive a DUPU (destination user part unavailable) message in ASP role, then we must * distribute it to any other ASPs for which we operate in SG mode * pass it as MTP-STATUS.ind to SCCP, which can then generates N-PCSTATE.ind to the SCCP User Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 --- M include/osmocom/sigtran/protocol/mtp.h M src/m3ua.c M src/osmo_ss7.c M src/sccp_internal.h M src/sccp_scmg.c M src/sua.c M src/xua_internal.h M src/xua_snm.c 8 files changed, 222 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/35/22835/1 diff --git a/include/osmocom/sigtran/protocol/mtp.h b/include/osmocom/sigtran/protocol/mtp.h index 8b990c0..2f0c7ac 100644 --- a/include/osmocom/sigtran/protocol/mtp.h +++ b/include/osmocom/sigtran/protocol/mtp.h @@ -22,3 +22,18 @@ }; extern const struct value_string mtp_si_vals[]; + + +/* Chapter 15.17.5 of Q.705 */ +enum mtp_unavail_cause { + MTP_UNAVAIL_C_UNKNOWN = 0x0, + MTP_UNAVAIL_C_UNEQUIP_REM_USER = 0x1, + MTP_UNAVAIL_C_INACC_REM_USER = 0x2, + /* reserved */ +}; + +extern const struct value_string mtp_unavail_cause_vals[]; + +static inline const char *mtp_unavail_cause_str(enum mtp_unavail_cause cs) { + return get_value_string(mtp_unavail_cause_vals, cs); +} diff --git a/src/m3ua.c b/src/m3ua.c index 6639c28..77326e0 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -812,8 +812,29 @@ } #endif +/* 3.4.5 Destination User Part Unavailable (DUPU) */ +static struct xua_msg *m3ua_encode_dupu(const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + uint32_t user_cause = (user << 16) | cause; -/* TODO: 3.4.5 Destination User Part Unavailable (DUPU) */ + xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_DUNA); + xua->hdr.version = M3UA_VERSION; + if (rctx) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_u32(xua, M3UA_IEI_AFFECTED_PC, dpc); + xua_msg_add_u32(xua, M3UA_IEI_USER_CAUSE, user_cause); + + if (info_string) { + xua_msg_add_data(xua, M3UA_IEI_INFO_STRING, + strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} /*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] * \param[in] asp ASP through which to transmit message. Must be ACTIVE. @@ -837,6 +858,21 @@ m3ua_tx_xua_asp(asp, xua); } +/*! Transmit SSNM DUPU message indicating user unavailability. + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] dpc affected point code + * \param[in] user the user (SI) that is unavailable + * \param[in] cause the cause of the user unavailability + * \param[in] info_string optional information string (can be NULL). */ +void m3ua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) +{ + struct xua_msg *xua = m3ua_encode_dupu(rctx, num_rctx, dpc, user, cause, info_str); + m3ua_tx_xua_asp(asp, xua); +} + /* received SNM message on ASP side */ static int m3ua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -857,6 +893,8 @@ xua_snm_rx_dava(asp, as, xua); break; case M3UA_SNM_DUPU: + xua_snm_rx_dupu(asp, as, xua); + break; case M3UA_SNM_SCON: case M3UA_SNM_DRST: LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA SNM message type %u\n", diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index e549708..a801cc9 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -59,6 +59,13 @@ static int32_t next_rctx = 1; static int32_t next_l_rk_id = 1; +const struct value_string mtp_unavail_cause_vals[] = { + { MTP_UNAVAIL_C_UNKNOWN, "unknown" }, + { MTP_UNAVAIL_C_UNEQUIP_REM_USER, "unequipped-remote-user" }, + { MTP_UNAVAIL_C_INACC_REM_USER, "inaccessible-remote-user" }, + { 0, NULL } +}; + struct value_string osmo_ss7_as_traffic_mode_vals[] = { { OSMO_SS7_AS_TMOD_BCAST, "broadcast" }, { OSMO_SS7_AS_TMOD_LOADSHARE, "loadshare" }, diff --git a/src/sccp_internal.h b/src/sccp_internal.h index a95b07d..23b3ef3 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -4,6 +4,7 @@ #include #include #include +#include #define SCCP_STR "Signalling Connection Control Part\n" @@ -141,4 +142,5 @@ void sccp_scmg_rx_ssn_prohibited(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi); void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); +void sccp_scmg_rx_mtp_status(struct osmo_sccp_instance *inst, uint32_t dpc, enum mtp_unavail_cause cause); int sccp_scmg_init(struct osmo_sccp_instance *inst); diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 49e09ca..a5d6226 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -122,6 +122,39 @@ * [this would require us to track SSNs at each PC, which we don't] */ } +void sccp_scmg_rx_mtp_status(struct osmo_sccp_instance *inst, uint32_t dpc, enum mtp_unavail_cause cause) +{ + struct osmo_scu_pcstate_param pcstate; + /* 1) Informs the translation function to update the translation tables. */ + /* 2) In the case where the SCCP has received an MTP-STATUS indication primitive relating to + Mark the status of the SCCP and each SSN for the relevant destination to "prohibited" + and initiates a subsystem status test with SSN = 1. If the cause in the MTP-STATUS + indication primitive indicates "unequipped user", then no subsystem status test is + initiated. */ + /* 3) Discontinues all subsystem status tests (including SSN = 1) if an MTP-STATUS + indication primitive is received with a cause of "unequipped SCCP". The SCCP + discontinues all subsystem status tests, except for SSN = 1, if an MTP-STATUS + indication primitive is received with a cause of either "unknown" or "inaccessible" */ + switch (cause) { + case MTP_UNAVAIL_C_UNKNOWN: + case MTP_UNAVAIL_C_UNEQUIP_REM_USER: + case MTP_UNAVAIL_C_INACC_REM_USER: + break; + } + + /* 4) local broadcast of "user-out-of-service" for each SSN at that dest + * [this would require us to track SSNs at each PC, which we don't] */ + + /* 6) local broadcast of "remote SCCP unavailable" */ + pcstate = (struct osmo_scu_pcstate_param) { + .affected_pc = dpc, + .restricted_importance_level = 0, + .sp_status = OSMO_SCCP_SP_S_ACCESSIBLE, + .remote_sccp_status = OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN, + }; + sccp_lbcs_local_bcast_pcstate(inst, &pcstate); +} + const struct value_string sccp_scmg_msgt_names[] = { { SCCP_SCMG_MSGT_SSA, "SSA (Subsystem Allowed)" }, { SCCP_SCMG_MSGT_SSP, "SSP (Subsystem Prohibited)" }, diff --git a/src/sua.c b/src/sua.c index c9e880f..2ff5a9a 100644 --- a/src/sua.c +++ b/src/sua.c @@ -823,6 +823,28 @@ } #endif +/* 3.4.5 Destination User Part Unavailable (DUPU) */ +static struct xua_msg *sua_encode_dupu(const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + uint32_t user_cause = (user << 16) | cause; + + xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_DUNA); + xua->hdr.version = SUA_VERSION; + if (rctx) + xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_u32(xua, SUA_IEI_AFFECTED_PC, dpc); + xua_msg_add_u32(xua, SUA_IEI_USER_CAUSE, user_cause); + + if (info_string) { + xua_msg_add_data(xua, SUA_IEI_INFO_STRING, strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} /*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. @@ -848,6 +870,21 @@ sua_tx_xua_asp(asp, xua); } +/*! Transmit SSNM DUPU message indicating user unavailability. + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] dpc affected point code + * \param[in] user the user (SI) that is unavailable + * \param[in] cause the cause of the user unavailability + * \param[in] info_string optional information string (can be NULL). */ +void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) +{ + struct xua_msg *xua = sua_encode_dupu(rctx, num_rctx, dpc, user, cause, info_str); + sua_tx_xua_asp(asp, xua); +} + /* received SNM message on ASP side */ static int sua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -867,6 +904,8 @@ xua_snm_rx_dava(asp, as, xua); break; case SUA_SNM_DUPU: + xua_snm_rx_dupu(asp, as, xua); + break; case SUA_SNM_SCON: case SUA_SNM_DRST: LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA SNM message type %u\n", diff --git a/src/xua_internal.h b/src/xua_internal.h index e76fddf..4c6bb29 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -21,6 +21,8 @@ void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, const uint32_t *smi, const char *info_string, bool available); +void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua); int m3ua_hmdc_rx_from_l2(struct osmo_ss7_instance *inst, struct xua_msg *xua); @@ -28,9 +30,12 @@ void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_string, bool available); +void m3ua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua); void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); +void xua_snm_rx_dupu(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); int m3ua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); struct msgb *m3ua_msgb_alloc(const char *name); diff --git a/src/xua_snm.c b/src/xua_snm.c index 2a383c7..0c14964 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "xua_internal.h" #include "sccp_internal.h" @@ -99,6 +100,22 @@ } } +static void xua_tx_upu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_dupu(asp, rctx, num_rctx, dpc, user, cause, info_str); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_dupu(asp, rctx, num_rctx, dpc, user, cause, info_str); + break; + default: + break; + } +} + + /* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, const uint32_t *aff_pc, unsigned int num_aff_pc, @@ -208,6 +225,37 @@ } } +static void xua_snm_upu(struct osmo_ss7_as *as, uint32_t dpc, uint16_t user, uint16_t cause, + const char *info_str) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + + /* Translate to MTP-STATUS.ind towards SCCP (will create N-PCSTATE.ind to SCU) */ + if (s7i->sccp && user == MTP_SI_SCCP) + sccp_scmg_rx_mtp_status(s7i->sccp, dpc, cause); + + /* inform remote ASPs via DUPU */ + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send DAVA/DUNA if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + + xua_tx_upu(asp, rctx, num_rctx, dpc, user, cause, info_str); + } +} /* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) @@ -323,3 +371,37 @@ ie_aff_pc->len / sizeof(uint32_t), info_str, true); } } + +/* an incoming SUA/M3UA DUPU was received from a remote SG */ +void xua_snm_rx_dupu(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + uint32_t aff_pc = xua_msg_get_u32(xua, SUA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, SUA_IEI_INFO_STRING); + /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ + //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + uint32_t cause_user; + uint16_t cause, user; + + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + return; + + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + cause_user = xua_msg_get_u32(xua, M3UA_IEI_USER_CAUSE); + break; + case OSMO_SS7_ASP_PROT_SUA: + cause_user = xua_msg_get_u32(xua, SUA_IEI_USER_CAUSE); + break; + default: + return; + } + + cause = cause_user >> 16; + user = cause_user & 0xffff; + LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUPU(%s) for %s User %s, cause %u\n", + info_str ? info_str : "", osmo_ss7_pointcode_print(asp->inst, aff_pc), + get_value_string(mtp_si_vals, user), cause); + + xua_snm_upu(as, aff_pc, user, cause, info_str); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 Gerrit-Change-Number: 22835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 19:10:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 19:10:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 to look at the new patch set (#2). Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... GBProxy_Tests: fix TC_rim_info_pcu2pcu The testcase TC_rim_info_pcu2pcu calls a function f_TC_rim_info_pcu2pcu() which doesn't use the templates from Osmocom_Gb_Types.ttcn as intended. This eventually lets the altstep in f_rim_pcu2pcu() run into a timeout since the templates never match. Change-Id: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Related: SYS#5103 --- M gbproxy/GBProxy_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/22825/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 19:30:30 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 10 Feb 2021 19:30:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 ) Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825/1//COMMIT_MSG at 10 PS1, Line 10: which uses the templates from Osmocom_Gb_Types.ttcn not as intended > "[...] which doesn't use the templates [...] as intended. [?] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825/1//COMMIT_MSG at 11 PS1, Line 11: into timeout > into a timeout Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 10 Feb 2021 19:30:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:01:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:01:33 +0000 Subject: Change in libosmo-sccp[master]: xua: introduce xua_msg_get_u32p() helper In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 ) Change subject: xua: introduce xua_msg_get_u32p() helper ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id7780074b82bc668ae148456750b1a01799decd1 Gerrit-Change-Number: 22832 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:01:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:17:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:17:46 +0000 Subject: Change in libosmo-sccp[master]: sua: per-ssn DUNA/DAVA notification In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 ) Change subject: sua: per-ssn DUNA/DAVA notification ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c at 278 PS1, Line 278: const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; is this pointer properly aligned? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf Gerrit-Change-Number: 22833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:17:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:20:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:20:30 +0000 Subject: Change in libosmo-sccp[master]: sccp: more SCMG handling: SSA and SSP message handling In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 ) Change subject: sccp: more SCMG handling: SSA and SSP message handling ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I149166a25113f5d3e3536f9297bf89ff3139b9e3 Gerrit-Change-Number: 22834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:20:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:29:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:29:59 +0000 Subject: Change in libosmo-sccp[master]: xua_snm: Implement handling of DUPU messages In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 ) Change subject: xua_snm: Implement handling of DUPU messages ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22835/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22835/1/src/xua_snm.c at 233 PS1, Line 233: uint32_t rctx[32]; Is 32 the mac amount of routing contexts? I see this repeated over a nd over, may make sense to have a define with it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 Gerrit-Change-Number: 22835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:29:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:31:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:31:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 ) Change subject: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates ...................................................................... Patch Set 1: Can you explain better? I don't see why Length shouldn't be lengthof(data) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 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: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 Gerrit-Change-Number: 22830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:31:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:36:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:36:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add Tests for SCMG SST procedure In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 ) Change subject: sccp: Add Tests for SCMG SST procedure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 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: If3f5f3144c0ed83d0bda5953522a9d73287c8ba2 Gerrit-Change-Number: 22831 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:36:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:38:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:38:31 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: fix wrong usage of bssgp_rim_ri_name() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 ) Change subject: gb_proxy: fix wrong usage of bssgp_rim_ri_name() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 Gerrit-Change-Number: 22824 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:38:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:41:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:41:21 +0000 Subject: Change in docker-playground[master]: ttcn3: move initial clone to debian-stretch-titan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22817 ) Change subject: ttcn3: move initial clone to debian-stretch-titan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd Gerrit-Change-Number: 22817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:41:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:43:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:43:22 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: update deps on change In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:43:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:47:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:47:08 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:47:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:48:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:48:16 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: run 'make deps' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22820 ) Change subject: debian-stretch-titan: prepare: run 'make deps' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 Gerrit-Change-Number: 22820 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:48:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:49:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:49:04 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: start/stop links In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22821 ) Change subject: debian-stretch-titan: prepare: start/stop links ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada Gerrit-Change-Number: 22821 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:49:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:50:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:50:59 +0000 Subject: Change in docker-playground[master]: ttcn3: move shared run code to script In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22822 ) Change subject: ttcn3: move shared run code to script ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 Gerrit-Change-Number: 22822 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 10 22:53:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 10 Feb 2021 22:53:11 +0000 Subject: Change in docker-playground[master]: ttcn3-{fr, gbproxy}-test: use ttcn3-docker-run too In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22823 ) Change subject: ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 Gerrit-Change-Number: 22823 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 10 Feb 2021 22:53:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 00:17:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 00:17:17 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... Patch Set 2: Code-Review+1 (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22800/2/src/gsm/gsm48_rest_octets.c File src/gsm/gsm48_rest_octets.c: https://gerrit.osmocom.org/c/libosmocore/+/22800/2/src/gsm/gsm48_rest_octets.c at 757 PS2, Line 757: static unsigned int decode_t3192_tbl[8] = {500, 1000, 1500, 0, 80, 120, 160, 200}; const https://gerrit.osmocom.org/c/libosmocore/+/22800/2/src/gsm/gsm48_rest_octets.c at 764 PS2, Line 764: static unsigned int decode_drx_timer_tbl[8] = {0, 1, 2, 4, 8, 16, 32, 64}; const https://gerrit.osmocom.org/c/libosmocore/+/22800/2/src/gsm/gsm48_rest_octets.c at 789 PS2, Line 789: bitvec_get_uint I would be careful here, as this function may return a negative in case of error. It's not critical for most of the information fields, but length fields are special. We may end up past the buffer boundaries of something goes wrong. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 00:17:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 00:19:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 00:19:23 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... Patch Set 2: -Code-Review And the unit test(s) of course. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 00:19:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Feb 11 01:54:00 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 01:54:00 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60248e5513529_1d02aba9dfd45f8265177@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 279s] [COMPILING apps/dfu/main.c] [ 280s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 280s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 280s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 280s] Memory region Used Size Region Size %age Used [ 280s] rom: 16580 B 16 KB 101.20% [ 280s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 280s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 280s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 280s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 280s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 280s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 280s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 280s] collect2: error: ld returned 1 exit status [ 280s] % [ 280s] make[2]: *** [Makefile:234: flash] Error 1 [ 280s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 280s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 280s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 280s] dh_auto_build: error: make -j1 returned exit code 2 [ 280s] make: *** [debian/rules:16: build] Error 25 [ 280s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 280s] ### VM INTERACTION START ### [ 283s] [ 242.241007] sysrq: Power Off [ 283s] [ 242.248584] reboot: Power down [ 283s] ### VM INTERACTION END ### [ 283s] [ 283s] lamb03 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 11 01:53:48 UTC 2021. [ 283s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 01:59:43 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 01:59:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_8.0/i586 In-Reply-To: References: Message-ID: <60248f9e413ff_1d02aba9dfd45f826627a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_8.0/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 252s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 252s] ^ [ 253s] cc1: some warnings being treated as errors [ 253s] Makefile:645: recipe for target 'ranap_msg_factory.lo' failed [ 253s] make[5]: *** [ranap_msg_factory.lo] Error 1 [ 253s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 253s] Makefile:660: recipe for target 'all-recursive' failed [ 253s] make[4]: *** [all-recursive] Error 1 [ 253s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 253s] Makefile:465: recipe for target 'all' failed [ 253s] make[3]: *** [all] Error 2 [ 253s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 253s] Makefile:457: recipe for target 'all-recursive' failed [ 253s] make[2]: *** [all-recursive] Error 1 [ 253s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 253s] Makefile:378: recipe for target 'all' failed [ 253s] make[1]: *** [all] Error 2 [ 253s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 253s] dh_auto_build: make -j1 returned exit code 2 [ 253s] debian/rules:9: recipe for target 'build' failed [ 253s] make: *** [build] Error 2 [ 253s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 253s] ### VM INTERACTION START ### [ 254s] Powering off. [ 254s] [ 239.441698] reboot: Power down [ 254s] ### VM INTERACTION END ### [ 254s] [ 254s] build71 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 01:59:35 UTC 2021. [ 254s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:06:00 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:06:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60249124e6caf_1d02aba9dfd45f8267165@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 849s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 849s] ^~~~ [ 849s] cc1: some warnings being treated as errors [ 849s] Makefile:656: recipe for target 'ranap_msg_factory.lo' failed [ 849s] make[5]: *** [ranap_msg_factory.lo] Error 1 [ 849s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 849s] Makefile:671: recipe for target 'all-recursive' failed [ 849s] make[4]: *** [all-recursive] Error 1 [ 849s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 849s] Makefile:477: recipe for target 'all' failed [ 849s] make[3]: *** [all] Error 2 [ 849s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 849s] Makefile:468: recipe for target 'all-recursive' failed [ 849s] make[2]: *** [all-recursive] Error 1 [ 849s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 849s] Makefile:390: recipe for target 'all' failed [ 849s] make[1]: *** [all] Error 2 [ 849s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 849s] dh_auto_build: make -j1 returned exit code 2 [ 849s] debian/rules:9: recipe for target 'build' failed [ 849s] make: *** [build] Error 2 [ 849s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 849s] ### VM INTERACTION START ### [ 852s] [ 797.456675] sysrq: Power Off [ 852s] [ 797.480021] reboot: Power down [ 852s] ### VM INTERACTION END ### [ 852s] [ 852s] cloud126 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:05:56 UTC 2021. [ 852s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:06:50 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:06:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <6024914529324_1d02aba9dfd45f826737c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 127s] + exit 0 [ 127s] ... checking for files with abuild user/group [ 127s] ... running 00-check-install-rpms [ 127s] ... installing all built rpms [ 127s] Preparing packages... [ 127s] libosmo-ranap3-0.6.0.42.e3f7-lp151.1.1.x86_64 [ 127s] libosmo-sabp0-0.6.0.42.e3f7-lp151.1.1.x86_64 [ 127s] libosmo-sabp-devel-0.6.0.42.e3f7-lp151.1.1.x86_64 [ 127s] libosmo-ranap-devel-0.6.0.42.e3f7-lp151.1.1.x86_64 [ 127s] osmo-iuh-0.6.0.42.e3f7-lp151.1.1.x86_64 [ 127s] ... running 50-check-binary-kernel-log [ 127s] ... running 50-check-core-files [ 127s] ... checking for core files [ 127s] ... running 50-check-debuginfo [ 127s] ... testing for empty debuginfo packages [ 127s] ... running 50-check-filelist [ 127s] ... checking filelist [ 128s] ... running 50-check-gcc-output [ 128s] ... testing for serious compiler warnings [ 128s] (using /usr/lib/build/checks-data/check_gcc_output) [ 128s] (using //.build.log) [ 128s] E: osmo-iuh 64bit-portability-issue ranap_msg_factory.c:235, 262 [ 128s] ### VM INTERACTION START ### [ 131s] [ 120.471802] sysrq: SysRq : Power Off [ 131s] [ 120.478762] reboot: Power down [ 131s] ### VM INTERACTION END ### [ 131s] [ 131s] sheep85 failed "build osmo-iuh.spec" at Thu Feb 11 02:06:41 UTC 2021. [ 131s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:14:00 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:14:00 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602493052c7bb_1d02aba9dfd45f8269068@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 168s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 168s] [COMPILING libboard/qmod/source/card_pres.c] [ 168s] [COMPILING libboard/qmod/source/wwan_led.c] [ 168s] [COMPILING libboard/qmod/source/i2c.c] [ 168s] [COMPILING libboard/qmod/source/board_qmod.c] [ 168s] [COMPILING apps/dfu/main.c] [ 169s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 169s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 169s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 169s] Memory region Used Size Region Size %age Used [ 169s] rom: 16588 B 16 KB 101.25% [ 169s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 169s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 169s] collect2: error: ld returned 1 exit status [ 169s] % [ 169s] make[2]: *** [Makefile:234: flash] Error 1 [ 169s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 169s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 169s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 169s] dh_auto_build: error: make -j1 returned exit code 2 [ 169s] make: *** [debian/rules:16: build] Error 25 [ 169s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 169s] ### VM INTERACTION START ### [ 172s] [ 156.176104] sysrq: Power Off [ 172s] [ 156.183007] reboot: Power down [ 172s] ### VM INTERACTION END ### [ 172s] [ 172s] lamb60 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 11 02:13:45 UTC 2021. [ 172s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:15:25 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:15:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_10/i586 In-Reply-To: References: Message-ID: <602493413c909_1d02aba9dfd45f82693a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_10/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 911s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 911s] ^ [ 911s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 911s] int line, int cont, const char *format, ...) [ 911s] ~~~~~~~~~~~~^~~~~~ [ 911s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 911s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 911s] ^~~~ [ 911s] cc1: some warnings being treated as errors [ 911s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 911s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 911s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 911s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 911s] make[3]: *** [Makefile:490: all] Error 2 [ 911s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 911s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 911s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 911s] make[1]: *** [Makefile:390: all] Error 2 [ 911s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 911s] dh_auto_build: make -j1 returned exit code 2 [ 911s] make: *** [debian/rules:9: build] Error 2 [ 911s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 911s] ### VM INTERACTION START ### [ 914s] [ 838.101787] sysrq: Power Off [ 914s] [ 838.115723] reboot: Power down [ 914s] ### VM INTERACTION END ### [ 914s] [ 914s] cloud117 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:15:08 UTC 2021. [ 914s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:20:33 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:20:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in CentOS_8/aarch64 In-Reply-To: References: Message-ID: <60249489c46f4_1d02aba9dfd45f8270639@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/CentOS_8/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in CentOS_8/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 373s] /usr/include/libosmocore/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 373s] int line, int cont, const char *format, ...) [ 373s] ~~~~~~~~~~~~^~~~~~ [ 373s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 373s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 373s] ^~~~ [ 373s] cc1: some warnings being treated as errors [ 373s] make[4]: *** [Makefile:674: ranap_msg_factory.lo] Error 1 [ 373s] make[4]: *** Waiting for unfinished jobs.... [ 385s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7/src' [ 385s] make[3]: *** [Makefile:689: all-recursive] Error 1 [ 385s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7/src' [ 385s] make[2]: *** [Makefile:489: all] Error 2 [ 385s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7/src' [ 385s] make[1]: *** [Makefile:467: all-recursive] Error 1 [ 385s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7' [ 385s] make: *** [Makefile:389: all] Error 2 [ 385s] error: Bad exit status from /var/tmp/rpm-tmp.clzRpe (%build) [ 385s] [ 385s] [ 385s] RPM build errors: [ 385s] Bad exit status from /var/tmp/rpm-tmp.clzRpe (%build) [ 385s] ### VM INTERACTION START ### [ 386s] Powering off. [ 386s] [ 363.341389] reboot: Power down [ 386s] ### VM INTERACTION END ### [ 386s] [ 386s] obs-arm-9 failed "build osmo-iuh.spec" at Thu Feb 11 02:20:18 UTC 2021. [ 386s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:20:50 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:20:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in CentOS_8/x86_64 In-Reply-To: References: Message-ID: <6024948b7cb30_1d02aba9dfd45f827099a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/CentOS_8/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in CentOS_8/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 192s] ../include/osmocom/sabp/SABP_MessageStructure.h:27:23: warning: 'struct MemberA' declared inside parameter list will not be visible outside of this definition or declaration [ 192s] A_SEQUENCE_OF(struct MemberA { [ 192s] ^~~~~~~ [ 192s] /usr/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' [ 192s] void (*free)(type *); \ [ 192s] ^~~~ [ 192s] ../include/osmocom/sabp/SABP_MessageStructure.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' [ 192s] A_SEQUENCE_OF(struct MemberA { [ 192s] ^~~~~~~~~~~~~ [ 197s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7/src' [ 197s] make[3]: *** [Makefile:689: all-recursive] Error 1 [ 197s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7/src' [ 197s] make[2]: *** [Makefile:489: all] Error 2 [ 197s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7/src' [ 197s] make[1]: *** [Makefile:467: all-recursive] Error 1 [ 197s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-iuh-0.6.0.42.e3f7' [ 197s] make: *** [Makefile:389: all] Error 2 [ 197s] error: Bad exit status from /var/tmp/rpm-tmp.b1pOEU (%build) [ 197s] [ 197s] [ 197s] RPM build errors: [ 197s] Bad exit status from /var/tmp/rpm-tmp.b1pOEU (%build) [ 197s] ### VM INTERACTION START ### [ 198s] Powering off. [ 198s] [ 178.485488] reboot: Power down [ 198s] ### VM INTERACTION END ### [ 199s] [ 199s] lamb03 failed "build osmo-iuh.spec" at Thu Feb 11 02:20:35 UTC 2021. [ 199s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:25:07 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:25:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <60249596d5bf7_1d02aba9dfd45f82717b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 312s] + exit 0 [ 313s] ... checking for files with abuild user/group [ 313s] ... running 00-check-install-rpms [ 313s] ... installing all built rpms [ 313s] Preparing packages... [ 313s] libosmo-ranap3-0.6.0.42.e3f7-lp151.1.1.aarch64 [ 313s] libosmo-sabp0-0.6.0.42.e3f7-lp151.1.1.aarch64 [ 313s] libosmo-sabp-devel-0.6.0.42.e3f7-lp151.1.1.aarch64 [ 313s] osmo-iuh-0.6.0.42.e3f7-lp151.1.1.aarch64 [ 313s] libosmo-ranap-devel-0.6.0.42.e3f7-lp151.1.1.aarch64 [ 313s] ... running 50-check-binary-kernel-log [ 313s] ... running 50-check-core-files [ 313s] ... checking for core files [ 313s] ... running 50-check-debuginfo [ 313s] ... testing for empty debuginfo packages [ 313s] ... running 50-check-filelist [ 313s] ... checking filelist [ 314s] ... running 50-check-gcc-output [ 314s] ... testing for serious compiler warnings [ 314s] (using /usr/lib/build/checks-data/check_gcc_output) [ 314s] (using //.build.log) [ 314s] E: osmo-iuh 64bit-portability-issue ranap_msg_factory.c:235, 262 [ 314s] ### VM INTERACTION START ### [ 317s] [ 302.248661] sysrq: SysRq : Power Off [ 317s] [ 302.250597] reboot: Power down [ 317s] ### VM INTERACTION END ### [ 317s] [ 317s] obs-arm-8 failed "build osmo-iuh.spec" at Thu Feb 11 02:24:57 UTC 2021. [ 317s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:26:33 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:26:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <602495f154af9_1d02aba9dfd45f8272185@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 365s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 365s] ^ [ 365s] cc1: some warnings being treated as errors [ 365s] Makefile:645: recipe for target 'ranap_msg_factory.lo' failed [ 365s] make[5]: *** [ranap_msg_factory.lo] Error 1 [ 365s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 365s] Makefile:660: recipe for target 'all-recursive' failed [ 365s] make[4]: *** [all-recursive] Error 1 [ 365s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 365s] Makefile:465: recipe for target 'all' failed [ 365s] make[3]: *** [all] Error 2 [ 365s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 365s] Makefile:457: recipe for target 'all-recursive' failed [ 365s] make[2]: *** [all-recursive] Error 1 [ 365s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 365s] Makefile:378: recipe for target 'all' failed [ 365s] make[1]: *** [all] Error 2 [ 365s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 365s] dh_auto_build: make -j1 returned exit code 2 [ 365s] debian/rules:9: recipe for target 'build' failed [ 365s] make: *** [build] Error 2 [ 365s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 365s] ### VM INTERACTION START ### [ 366s] Powering off. [ 366s] [ 350.164556] reboot: Power down [ 366s] ### VM INTERACTION END ### [ 366s] [ 366s] lamb26 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:26:32 UTC 2021. [ 366s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:42:34 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:42:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <602499afc5b25_1d02aba9dfd45f82737f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 804s] | | [ 804s] | int [ 804s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 804s] 361 | int line, int cont, const char *format, ...) [ 804s] | ~~~~~~~~~~~~^~~~~~ [ 804s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 804s] 262 | LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 804s] | ^~~~ [ 804s] cc1: some warnings being treated as errors [ 804s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 804s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 804s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 804s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 804s] make[3]: *** [Makefile:490: all] Error 2 [ 804s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 804s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 804s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 804s] make[1]: *** [Makefile:392: all] Error 2 [ 804s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 804s] dh_auto_build: error: make -j1 returned exit code 2 [ 804s] make: *** [debian/rules:9: build] Error 25 [ 804s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 804s] ### VM INTERACTION START ### [ 805s] Powering off. [ 805s] [ 774.302826] reboot: Power down [ 805s] ### VM INTERACTION END ### [ 805s] [ 805s] lamb55 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:42:30 UTC 2021. [ 805s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:47:27 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:47:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <60249ac7d473b_1d02aba9dfd45f82744e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 807s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 807s] ^~~~ [ 807s] cc1: some warnings being treated as errors [ 807s] Makefile:656: recipe for target 'ranap_msg_factory.lo' failed [ 807s] make[5]: *** [ranap_msg_factory.lo] Error 1 [ 807s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 807s] Makefile:671: recipe for target 'all-recursive' failed [ 807s] make[4]: *** [all-recursive] Error 1 [ 807s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 807s] Makefile:477: recipe for target 'all' failed [ 807s] make[3]: *** [all] Error 2 [ 807s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 807s] Makefile:468: recipe for target 'all-recursive' failed [ 807s] make[2]: *** [all-recursive] Error 1 [ 807s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 807s] Makefile:390: recipe for target 'all' failed [ 807s] make[1]: *** [all] Error 2 [ 807s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 807s] dh_auto_build: make -j1 returned exit code 2 [ 807s] debian/rules:9: recipe for target 'build' failed [ 807s] make: *** [build] Error 2 [ 807s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 807s] ### VM INTERACTION START ### [ 810s] [ 769.774399] sysrq: Power Off [ 810s] [ 769.788776] reboot: Power down [ 810s] ### VM INTERACTION END ### [ 810s] [ 810s] lamb52 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:47:18 UTC 2021. [ 810s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:49:08 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:49:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60249b374482e_1d02aba9dfd45f827489c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 443s] | | [ 443s] | int [ 443s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 443s] 361 | int line, int cont, const char *format, ...) [ 443s] | ~~~~~~~~~~~~^~~~~~ [ 443s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 443s] 262 | LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 443s] | ^~~~ [ 444s] cc1: some warnings being treated as errors [ 444s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 444s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 444s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 444s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 444s] make[3]: *** [Makefile:490: all] Error 2 [ 444s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 444s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 444s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 444s] make[1]: *** [Makefile:390: all] Error 2 [ 444s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 444s] dh_auto_build: error: make -j1 returned exit code 2 [ 444s] make: *** [debian/rules:9: build] Error 25 [ 444s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 444s] ### VM INTERACTION START ### [ 445s] Powering off. [ 445s] [ 429.121904] reboot: Power down [ 445s] ### VM INTERACTION END ### [ 445s] [ 445s] hci-cnode2-m0 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:48:58 UTC 2021. [ 445s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:50:33 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:50:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <60249b935d863_1d02aba9dfd45f82750c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 661s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 661s] ^ [ 661s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 661s] int line, int cont, const char *format, ...) [ 661s] ~~~~~~~~~~~~^~~~~~ [ 661s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 661s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 661s] ^~~~ [ 661s] cc1: some warnings being treated as errors [ 661s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 661s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 661s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 661s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 661s] make[3]: *** [Makefile:490: all] Error 2 [ 661s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 661s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 661s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 661s] make[1]: *** [Makefile:390: all] Error 2 [ 661s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 661s] dh_auto_build: make -j1 returned exit code 2 [ 661s] make: *** [debian/rules:9: build] Error 2 [ 661s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 661s] ### VM INTERACTION START ### [ 664s] [ 645.244678] sysrq: Power Off [ 664s] [ 645.250520] reboot: Power down [ 664s] ### VM INTERACTION END ### [ 664s] [ 664s] lamb53 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:50:15 UTC 2021. [ 664s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:52:17 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:52:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <60249bee9ea61_1d02aba9dfd45f827547a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 991s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 991s] ^~~~ [ 991s] cc1: some warnings being treated as errors [ 991s] Makefile:656: recipe for target 'ranap_msg_factory.lo' failed [ 991s] make[5]: *** [ranap_msg_factory.lo] Error 1 [ 991s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 991s] Makefile:671: recipe for target 'all-recursive' failed [ 991s] make[4]: *** [all-recursive] Error 1 [ 991s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 991s] Makefile:477: recipe for target 'all' failed [ 991s] make[3]: *** [all] Error 2 [ 991s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 991s] Makefile:468: recipe for target 'all-recursive' failed [ 991s] make[2]: *** [all-recursive] Error 1 [ 991s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 991s] Makefile:390: recipe for target 'all' failed [ 991s] make[1]: *** [all] Error 2 [ 991s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 991s] dh_auto_build: make -j1 returned exit code 2 [ 991s] debian/rules:9: recipe for target 'build' failed [ 991s] make: *** [build] Error 2 [ 991s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 992s] ### VM INTERACTION START ### [ 995s] [ 975.616906] sysrq: Power Off [ 995s] [ 975.623782] reboot: Power down [ 995s] ### VM INTERACTION END ### [ 995s] [ 995s] lamb02 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:52:07 UTC 2021. [ 995s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:56:16 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:56:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <60249cdeb728a_1d02aba9dfd45f8276218@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 619s] | | [ 619s] | int [ 619s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 619s] 361 | int line, int cont, const char *format, ...) [ 619s] | ~~~~~~~~~~~~^~~~~~ [ 619s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 619s] 262 | LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 619s] | ^~~~ [ 620s] cc1: some warnings being treated as errors [ 620s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 620s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 620s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 620s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 620s] make[3]: *** [Makefile:490: all] Error 2 [ 620s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 620s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 620s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 620s] make[1]: *** [Makefile:390: all] Error 2 [ 620s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 620s] dh_auto_build: make -j1 returned exit code 2 [ 620s] make: *** [debian/rules:9: build] Error 255 [ 620s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 620s] ### VM INTERACTION START ### [ 623s] [ 603.717545] sysrq: Power Off [ 623s] [ 603.725081] reboot: Power down [ 623s] ### VM INTERACTION END ### [ 623s] [ 623s] lamb14 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:56:14 UTC 2021. [ 623s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:56:33 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:56:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_10/x86_64 In-Reply-To: References: Message-ID: <60249cf941c7b_1d02aba9dfd45f8276386@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 637s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 637s] ^ [ 637s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 637s] int line, int cont, const char *format, ...) [ 637s] ~~~~~~~~~~~~^~~~~~ [ 637s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 637s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 637s] ^~~~ [ 637s] cc1: some warnings being treated as errors [ 637s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 637s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 637s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 637s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 637s] make[3]: *** [Makefile:490: all] Error 2 [ 637s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 637s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 637s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 637s] make[1]: *** [Makefile:390: all] Error 2 [ 637s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 637s] dh_auto_build: make -j1 returned exit code 2 [ 637s] make: *** [debian/rules:9: build] Error 2 [ 637s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 637s] ### VM INTERACTION START ### [ 640s] [ 614.502959] sysrq: Power Off [ 640s] [ 614.529436] reboot: Power down [ 640s] ### VM INTERACTION END ### [ 640s] [ 640s] lamb22 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:56:29 UTC 2021. [ 640s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 02:57:07 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 02:57:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60249d158aaa8_1d02aba9dfd45f82765b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 846s] | | [ 846s] | int [ 846s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 846s] 361 | int line, int cont, const char *format, ...) [ 846s] | ~~~~~~~~~~~~^~~~~~ [ 846s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 846s] 262 | LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 846s] | ^~~~ [ 846s] cc1: some warnings being treated as errors [ 846s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 846s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 846s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 846s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 846s] make[3]: *** [Makefile:490: all] Error 2 [ 846s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 846s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 846s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 846s] make[1]: *** [Makefile:392: all] Error 2 [ 846s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 846s] dh_auto_build: error: make -j1 returned exit code 2 [ 846s] make: *** [debian/rules:9: build] Error 25 [ 846s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 847s] ### VM INTERACTION START ### [ 848s] Powering off. [ 848s] [ 820.867272] reboot: Power down [ 848s] ### VM INTERACTION END ### [ 848s] [ 848s] lamb52 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 02:56:57 UTC 2021. [ 848s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 03:01:42 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 03:01:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60249e2865791_1d02aba9dfd45f827708d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1068s] | | [ 1068s] | int [ 1068s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 1068s] 361 | int line, int cont, const char *format, ...) [ 1068s] | ~~~~~~~~~~~~^~~~~~ [ 1068s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 1068s] 262 | LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 1068s] | ^~~~ [ 1068s] cc1: some warnings being treated as errors [ 1068s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 1068s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 1068s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 1068s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 1068s] make[3]: *** [Makefile:490: all] Error 2 [ 1068s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1068s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 1068s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1068s] make[1]: *** [Makefile:390: all] Error 2 [ 1068s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1068s] dh_auto_build: error: make -j1 returned exit code 2 [ 1068s] make: *** [debian/rules:9: build] Error 25 [ 1068s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1068s] ### VM INTERACTION START ### [ 1071s] [ 1001.954663] sysrq: Power Off [ 1071s] [ 1001.998676] reboot: Power down [ 1072s] ### VM INTERACTION END ### [ 1072s] [ 1072s] cloud115 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 03:01:25 UTC 2021. [ 1072s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 03:09:59 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 03:09:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <6024a025ac0a5_1d02aba9dfd45f827781b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1270s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 1270s] ^~~~ [ 1270s] cc1: some warnings being treated as errors [ 1270s] Makefile:656: recipe for target 'ranap_msg_factory.lo' failed [ 1270s] make[5]: *** [ranap_msg_factory.lo] Error 1 [ 1270s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 1270s] Makefile:671: recipe for target 'all-recursive' failed [ 1270s] make[4]: *** [all-recursive] Error 1 [ 1270s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 1270s] Makefile:477: recipe for target 'all' failed [ 1270s] make[3]: *** [all] Error 2 [ 1270s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1270s] Makefile:468: recipe for target 'all-recursive' failed [ 1270s] make[2]: *** [all-recursive] Error 1 [ 1270s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1270s] Makefile:390: recipe for target 'all' failed [ 1270s] make[1]: *** [all] Error 2 [ 1270s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1270s] dh_auto_build: make -j1 returned exit code 2 [ 1270s] debian/rules:9: recipe for target 'build' failed [ 1270s] make: *** [build] Error 2 [ 1270s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 1270s] ### VM INTERACTION START ### [ 1274s] [ 1255.480224] sysrq: Power Off [ 1274s] [ 1255.481791] reboot: Power down [ 1274s] ### VM INTERACTION END ### [ 1274s] [ 1274s] obs-arm-9 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 03:09:56 UTC 2021. [ 1274s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 03:39:42 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 03:39:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_10/aarch64 In-Reply-To: References: Message-ID: <6024a70dcc941_1d02aba9dfd45f8282421@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_10/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 2440s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 2440s] ^ [ 2440s] /usr/include/osmocom/core/logging.h:361:37: note: expected 'const char *' but argument is of type 'int' [ 2440s] int line, int cont, const char *format, ...) [ 2440s] ~~~~~~~~~~~~^~~~~~ [ 2440s] ranap_msg_factory.c:262:5: error: format not a string literal and no format arguments [-Werror=format-security] [ 2441s] LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); [ 2441s] ^~~~ [ 2441s] cc1: some warnings being treated as errors [ 2441s] make[5]: *** [Makefile:675: ranap_msg_factory.lo] Error 1 [ 2441s] make[5]: Leaving directory '/usr/src/packages/BUILD/src' [ 2441s] make[4]: *** [Makefile:690: all-recursive] Error 1 [ 2441s] make[4]: Leaving directory '/usr/src/packages/BUILD/src' [ 2441s] make[3]: *** [Makefile:490: all] Error 2 [ 2441s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 2441s] make[2]: *** [Makefile:468: all-recursive] Error 1 [ 2441s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 2441s] make[1]: *** [Makefile:390: all] Error 2 [ 2441s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 2441s] dh_auto_build: make -j1 returned exit code 2 [ 2441s] make: *** [debian/rules:9: build] Error 2 [ 2441s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 2441s] ### VM INTERACTION START ### [ 2444s] [ 2390.768699] sysrq: Power Off [ 2444s] [ 2390.776471] reboot: Power down [ 2444s] ### VM INTERACTION END ### [ 2444s] [ 2444s] obs-arm-1 failed "build osmo-iuh_0.6.0.42.e3f7.dsc" at Thu Feb 11 03:39:29 UTC 2021. [ 2444s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 05:58:59 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 05:58:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <6024c7bed4b8e_1d02aba9dfd45f8302259@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1082s] + exit 0 [ 1083s] ... checking for files with abuild user/group [ 1083s] ... running 00-check-install-rpms [ 1083s] ... installing all built rpms [ 1083s] Preparing packages... [ 1083s] libosmo-ranap3-0.6.0.42.e3f7-lp151.1.1.armv7hl [ 1083s] libosmo-sabp0-0.6.0.42.e3f7-lp151.1.1.armv7hl [ 1084s] libosmo-sabp-devel-0.6.0.42.e3f7-lp151.1.1.armv7hl [ 1084s] libosmo-ranap-devel-0.6.0.42.e3f7-lp151.1.1.armv7hl [ 1084s] osmo-iuh-0.6.0.42.e3f7-lp151.1.1.armv7hl [ 1084s] ... running 50-check-binary-kernel-log [ 1084s] ... running 50-check-core-files [ 1084s] ... checking for core files [ 1084s] ... running 50-check-debuginfo [ 1084s] ... testing for empty debuginfo packages [ 1084s] ... running 50-check-filelist [ 1084s] ... checking filelist [ 1085s] ... running 50-check-gcc-output [ 1085s] ... testing for serious compiler warnings [ 1085s] (using /usr/lib/build/checks-data/check_gcc_output) [ 1085s] (using //.build.log) [ 1085s] E: osmo-iuh 64bit-portability-issue ranap_msg_factory.c:235, 262 [ 1085s] ### VM INTERACTION START ### [ 1088s] [ 1055.570797] sysrq: SysRq : Power Off [ 1088s] [ 1055.589259] reboot: Power down [ 1090s] ### VM INTERACTION END ### [ 1090s] [ 1090s] obs-arm-5 failed "build osmo-iuh.spec" at Thu Feb 11 05:58:41 UTC 2021. [ 1090s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Feb 11 06:04:49 2021 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Thu, 11 Feb 2021 06:04:49 +0000 Subject: Change in pysim[master]: utils.py: Fix for parsing MNC References: Message-ID: herlesupreeth has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/22836 ) Change subject: utils.py: Fix for parsing MNC ...................................................................... utils.py: Fix for parsing MNC This commit fixes the incorrect parsing of MNC from PLMN. Previously its was parsing PLMN string 130062 as MCC 310 MNC 260, whereas it should be MCC 310 MNC 026. (The SIM was programmed with MCC 310 and MNC 026) Change-Id: I799469206f87e930d8888367890babcb8ebe23a9 --- M pySim/utils.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/22836/1 diff --git a/pySim/utils.py b/pySim/utils.py index 3838eff..c150184 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -137,9 +137,9 @@ def dec_mnc_from_plmn(plmn): ia = h2i(plmn) - digit1 = ia[2] & 0x0F # 3rd byte, LSB - digit2 = (ia[2] & 0xF0) >> 4 # 3rd byte, MSB - digit3 = (ia[1] & 0xF0) >> 4 # 2nd byte, MSB + digit1 = (ia[1] & 0xF0) >>4 # 2nd byte, MSB + digit2 = ia[2] & 0x0F # 3rd byte, LSB + digit3 = (ia[2] & 0xF0) >> 4 # 3nd byte, MSB if digit3 == 0xF and digit2 == 0xF and digit1 == 0xF: return 0xFFF # 4095 return derive_mnc(digit1, digit2, digit3) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I799469206f87e930d8888367890babcb8ebe23a9 Gerrit-Change-Number: 22836 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 09:15:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 09:15:44 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Fix LOGP statements References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22837 ) Change subject: ranap_msg_factory: Fix LOGP statements ...................................................................... ranap_msg_factory: Fix LOGP statements The related compiler warnings were overlooked as due to the asn1c-generated code there always are tons of warnings printed compiling this project :( Change-Id: I40b1265ba696501cc72e674f3ef4146c47aacf1b --- M src/ranap_msg_factory.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/37/22837/1 diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 121514c..f93a2ab 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -232,7 +232,7 @@ ialg = RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA2; break; default: - LOGP(DRANAP, "Unsupported UIA algorithm UIA%d specified\n", i); + LOGP(DRANAP, LOGL_ERROR, "Unsupported UIA algorithm UIA%d specified\n", i); return NULL; } @@ -259,7 +259,7 @@ ealg = RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorithm_UEA2; break; default: - LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); + LOGP(DRANAP, LOGL_ERROR, "Unsupported UEA algorithm UEA%d specified\n", i); asn_set_empty(&ies.integrityProtectionInformation.permittedAlgorithms); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I40b1265ba696501cc72e674f3ef4146c47aacf1b Gerrit-Change-Number: 22837 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 09:17:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 09:17:45 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Fix LOGP statements In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22837 ) Change subject: ranap_msg_factory: Fix LOGP statements ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I40b1265ba696501cc72e674f3ef4146c47aacf1b Gerrit-Change-Number: 22837 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 09:17:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 09:23:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 09:23:01 +0000 Subject: Change in osmo-iuh[master]: ranap_msg_factory: Fix LOGP statements In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22837 ) Change subject: ranap_msg_factory: Fix LOGP statements ...................................................................... ranap_msg_factory: Fix LOGP statements The related compiler warnings were overlooked as due to the asn1c-generated code there always are tons of warnings printed compiling this project :( Change-Id: I40b1265ba696501cc72e674f3ef4146c47aacf1b --- M src/ranap_msg_factory.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 121514c..f93a2ab 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -232,7 +232,7 @@ ialg = RANAP_IntegrityProtectionAlgorithm_standard_UMTS_integrity_algorithm_UIA2; break; default: - LOGP(DRANAP, "Unsupported UIA algorithm UIA%d specified\n", i); + LOGP(DRANAP, LOGL_ERROR, "Unsupported UIA algorithm UIA%d specified\n", i); return NULL; } @@ -259,7 +259,7 @@ ealg = RANAP_EncryptionAlgorithm_standard_UMTS_encryption_algorithm_UEA2; break; default: - LOGP(DRANAP, "Unsupported UEA algorithm UEA%d specified\n", i); + LOGP(DRANAP, LOGL_ERROR, "Unsupported UEA algorithm UEA%d specified\n", i); asn_set_empty(&ies.integrityProtectionInformation.permittedAlgorithms); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I40b1265ba696501cc72e674f3ef4146c47aacf1b Gerrit-Change-Number: 22837 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Feb 11 09:40:42 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 09:40:42 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6024fbadccae4_1d02aba9dfd45f83756f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 286s] [COMPILING apps/dfu/main.c] [ 286s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 286s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 286s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 286s] Memory region Used Size Region Size %age Used [ 286s] rom: 16580 B 16 KB 101.20% [ 287s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 287s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 287s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 287s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 287s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 287s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 287s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 287s] collect2: error: ld returned 1 exit status [ 287s] % [ 287s] make[2]: *** [Makefile:234: flash] Error 1 [ 287s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 287s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 287s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 287s] dh_auto_build: error: make -j1 returned exit code 2 [ 287s] make: *** [debian/rules:16: build] Error 25 [ 287s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 287s] ### VM INTERACTION START ### [ 290s] [ 270.488483] sysrq: Power Off [ 290s] [ 270.514530] reboot: Power down [ 290s] ### VM INTERACTION END ### [ 290s] [ 290s] lamb56 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 11 09:40:28 UTC 2021. [ 290s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 11 09:43:33 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 11 Feb 2021 09:43:33 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6024fc5f83f80_1d02aba9dfd45f837704b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 124s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 124s] [COMPILING libboard/qmod/source/card_pres.c] [ 124s] [COMPILING libboard/qmod/source/wwan_led.c] [ 124s] [COMPILING libboard/qmod/source/i2c.c] [ 124s] [COMPILING libboard/qmod/source/board_qmod.c] [ 124s] [COMPILING apps/dfu/main.c] [ 124s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 124s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 124s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 125s] Memory region Used Size Region Size %age Used [ 125s] rom: 16588 B 16 KB 101.25% [ 125s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 125s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 125s] collect2: error: ld returned 1 exit status [ 125s] % [ 125s] make[2]: *** [Makefile:234: flash] Error 1 [ 125s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 125s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 125s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 125s] dh_auto_build: error: make -j1 returned exit code 2 [ 125s] make: *** [debian/rules:16: build] Error 25 [ 125s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 125s] ### VM INTERACTION START ### [ 128s] [ 113.549381] sysrq: Power Off [ 128s] [ 113.552816] reboot: Power down [ 128s] ### VM INTERACTION END ### [ 128s] [ 128s] sheep86 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 11 09:43:19 UTC 2021. [ 128s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Feb 11 10:57:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 10:57:21 +0000 Subject: Change in libosmocore[master]: README.md: Use https everywhere References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22838 ) Change subject: README.md: Use https everywhere ...................................................................... README.md: Use https everywhere Change-Id: I06d28ea1f5decffbd89f8439fae948e022bf3fe3 --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/22838/1 diff --git a/README.md b/README.md index 07c1a2a..97573bc 100644 --- a/README.md +++ b/README.md @@ -43,14 +43,14 @@ git clone git://git.osmocom.org/libosmocore.git -There is a cgit interface at +There is a cgit interface at Documentation ------------- Doxygen-generated API documentation is generated during the build process, but also available online for each of the sub-libraries at - + Mailing List ------------ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06d28ea1f5decffbd89f8439fae948e022bf3fe3 Gerrit-Change-Number: 22838 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 10:57:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 10:57:49 +0000 Subject: Change in libosmocore[master]: README.md: Use https everywhere In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22838 ) Change subject: README.md: Use https everywhere ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06d28ea1f5decffbd89f8439fae948e022bf3fe3 Gerrit-Change-Number: 22838 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 10:57:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:00:51 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 11:00:51 +0000 Subject: Change in libosmocore[master]: README.md: Use https everywhere In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22838 ) Change subject: README.md: Use https everywhere ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06d28ea1f5decffbd89f8439fae948e022bf3fe3 Gerrit-Change-Number: 22838 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 11:00:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:01:37 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 11:01:37 +0000 Subject: Change in libosmocore[master]: README.md: Use https everywhere In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22838 ) Change subject: README.md: Use https everywhere ...................................................................... README.md: Use https everywhere Change-Id: I06d28ea1f5decffbd89f8439fae948e022bf3fe3 --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Verified Jenkins Builder: Verified diff --git a/README.md b/README.md index 07c1a2a..97573bc 100644 --- a/README.md +++ b/README.md @@ -43,14 +43,14 @@ git clone git://git.osmocom.org/libosmocore.git -There is a cgit interface at +There is a cgit interface at Documentation ------------- Doxygen-generated API documentation is generated during the build process, but also available online for each of the sub-libraries at - + Mailing List ------------ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06d28ea1f5decffbd89f8439fae948e022bf3fe3 Gerrit-Change-Number: 22838 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:07:27 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 11:07:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 ) Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 11:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:07:48 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 11:07:48 +0000 Subject: Change in osmo-gbproxy[master]: gb_proxy: fix wrong usage of bssgp_rim_ri_name() In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 ) Change subject: gb_proxy: fix wrong usage of bssgp_rim_ri_name() ...................................................................... gb_proxy: fix wrong usage of bssgp_rim_ri_name() In some logging statements the function bssgp_rim_ri_name() is used twice. This is wrong since _name() functions use an internal buffer, which can not be used twice in the same logging statement, so for the affected log statements the function bssgp_rim_ri_name_buf() must be used. Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 Related: SYS#5103 --- M src/gb_proxy.c 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 4147d86..43d819d 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -897,6 +897,8 @@ struct bssgp_rim_routing_info dest_ri; struct bssgp_rim_routing_info src_ri; int rc; + char ri_src_str[64]; + char ri_dest_str[64]; rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); @@ -938,8 +940,10 @@ /* TODO: Also check if dest_cell->bss_bvc is RIM-capable (see also above). If not we should * respond with a BSSGP STATUS message as well because it also would make no sense to try * routing the RIM message to the next RIM-capable SGSN. */ - LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, - dest_cell->bss_bvc->nse->nsei, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to peer (nsei=%u) RIM-PDU: src=%s, dest=%s\n", + log_pfx, pdut_name, dest_cell->bss_bvc->nse->nsei, + bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri), + bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri)); return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); } } @@ -954,8 +958,10 @@ pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } - LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, - sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", + log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name, + bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri), + bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri)); return gbprox_relay2nse(msg, sgsn->nse, 0); } @@ -1216,6 +1222,8 @@ struct bssgp_rim_routing_info dest_ri; struct bssgp_rim_routing_info src_ri; int rc; + char ri_src_str[64]; + char ri_dest_str[64]; /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in gbprox_rx_rim_from_bss() */ @@ -1253,8 +1261,10 @@ sgsn = gbproxy_sgsn_by_nsei(nse->cfg, nse->nsei); OSMO_ASSERT(sgsn); - LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, - sgsn->nse->nsei, sgsn->name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); + LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying from SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", + log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name, + bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &src_ri), + bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &dest_ri)); return gbprox_relay2peer(msg, dest_cell->bss_bvc, 0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8b6254a269770ddc141325d67d143f2a8130c519 Gerrit-Change-Number: 22824 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:11:36 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 11:11:36 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore -> osmo-gbproxy References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore -> osmo-gbproxy ...................................................................... jobs/master-builds: libosmocore -> osmo-gbproxy Add missing trigger. Related: OS#4992 Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/39/22839/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index e6a8239..4bb3706 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -142,6 +142,7 @@ # [...] trigger: > master-libosmo-abis, + master-osmo-gbproxy, master-osmo-ggsn, master-osmo-gmr, master-osmo-pcap, -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:15:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 11:15:16 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore -> osmo-gbproxy In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore -> osmo-gbproxy ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml at 154 PS1, Line 154: xgoldmon aren't we missing other ones here? like osmo-bts, osmo-trx, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:15:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:16:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 11:16:26 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore -> osmo-gbproxy In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore -> osmo-gbproxy ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml at 154 PS1, Line 154: xgoldmon > aren't we missing other ones here? like osmo-bts, osmo-trx, etc. See the "optimized" comment above, libraries that depend on libosmo-abis get triggered by the master-libosmo-abis job and so on. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:16:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:19:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 11:19:42 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore -> osmo-gbproxy In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore -> osmo-gbproxy ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml at 154 PS1, Line 154: xgoldmon > See the "optimized" comment above, libraries that depend on libosmo-abis get triggered by the master [?] ack, but still osmo-trx is missing afaict :) (only uses libosmocore). -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:19:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:20:33 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 11:20:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 ) Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 11:20:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:20:37 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 11:20:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GBProxy_Tests: fix TC_rim_info_pcu2pcu In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 ) Change subject: GBProxy_Tests: fix TC_rim_info_pcu2pcu ...................................................................... GBProxy_Tests: fix TC_rim_info_pcu2pcu The testcase TC_rim_info_pcu2pcu calls a function f_TC_rim_info_pcu2pcu() which doesn't use the templates from Osmocom_Gb_Types.ttcn as intended. This eventually lets the altstep in f_rim_pcu2pcu() run into a timeout since the templates never match. Change-Id: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Related: SYS#5103 --- M gbproxy/GBProxy_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 0f3b4cb..af9646c 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -3122,22 +3122,34 @@ { var BssgpCellId cell_id_src := g_pcu[src_pcu_idx].cfg.bvc[src_bvc_idx].cell_id; var BssgpCellId cell_id_dst := g_pcu[dst_pcu_idx].cfg.bvc[dst_bvc_idx].cell_id; - var template (value) RIM_Routing_Information ri_pcu_src; - var template (value) RIM_Routing_Information ri_pcu_dst; - var template (value) RAN_Information_RIM_Container cont; + var template (value) RIM_Routing_Information ri_pcu_src_tx; + var template (value) RIM_Routing_Information ri_pcu_dst_tx; + var template RIM_Routing_Information ri_pcu_src_rx; + var template RIM_Routing_Information ri_pcu_dst_rx; + var template (value) RAN_Information_RIM_Container cont_tx; + var template RAN_Information_RIM_Container cont_rx; log("Testing RIM PCU2PCU from PCU[", src_pcu_idx, "][", src_bvc_idx, "] to PCU[", dst_pcu_idx, "][", dst_bvc_idx, "]"); - ri_pcu_src := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + ri_pcu_src_tx := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, t_RIM_Routing_Address_cid(cell_id_src)); - ri_pcu_dst := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + ri_pcu_dst_tx := ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, t_RIM_Routing_Address_cid(cell_id_dst)); - cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), - ts_RIM_Sequence_Number(0), - ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_STOP)); - f_rim_pcu2pcu(ts_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst, src := ri_pcu_src, cont := cont), - tr_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst, src := ri_pcu_src, cont := cont), + ri_pcu_src_rx := tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + t_RIM_Routing_Address_cid(cell_id_src)); + ri_pcu_dst_rx := tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, + t_RIM_Routing_Address_cid(cell_id_dst)); + + cont_tx := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), + ts_RIM_Sequence_Number(0), + ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_STOP)); + cont_rx := tr_RAN_Information_RIM_Container(tr_RIM_Application_Identity(RIM_APP_ID_NACC), + tr_RIM_Sequence_Number(0), + tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_STOP)); + + f_rim_pcu2pcu(ts_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst_tx, src := ri_pcu_src_tx, cont := cont_tx), + tr_PDU_BSSGP_RAN_INFORMATION(dst := ri_pcu_dst_rx, src := ri_pcu_src_rx, cont := cont_rx), src_pcu_idx, dst_pcu_idx); } testcase TC_rim_info_pcu2pcu() runs on GlobalTest_CT -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22825 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: I281dc53bb5dd7be86edc9db185618252ff1b9a21 Gerrit-Change-Number: 22825 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:29:08 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 11:29:08 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore: add triggers In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 to look at the new patch set (#2). Change subject: jobs/master-builds: libosmocore: add triggers ...................................................................... jobs/master-builds: libosmocore: add triggers Add missing triggers for osmo-gbproxy, osmo-trx. Related: OS#4992 Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 --- M jobs/master-builds.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/39/22839/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:29:35 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 11:29:35 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore: add triggers In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore: add triggers ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/22839/1/jobs/master-builds.yml at 154 PS1, Line 154: xgoldmon > ack, but still osmo-trx is missing afaict :) (only uses libosmocore). Right. I've added osmo-trx too. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:29:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:35:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 11:35:39 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore: add triggers In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore: add triggers ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:35:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:45:42 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 11:45:42 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22840 ) Change subject: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default ...................................................................... bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default Change-Id: Iecc2395efab703cf3de8f8e16b9e4bc8c8baf260 Related: SYS#5114 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/22840/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 0388e8e..d3f8a73 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2842,7 +2842,7 @@ "1 BER >= 0.2%\n" "2 BER >= 0.4%\n" "3 BER >= 0.8%\n" - "4 BER >= 1.6%\n" + "4 BER >= 1.6% (default)\n" "5 BER >= 3.2%\n" "6 BER >= 6.4%\n" "7 BER >= 12.8%\n") -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iecc2395efab703cf3de8f8e16b9e4bc8c8baf260 Gerrit-Change-Number: 22840 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:52:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:52:33 +0000 Subject: Change in docker-playground[master]: osmo-sip-master: Don't install packages not required References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22841 ) Change subject: osmo-sip-master: Don't install packages not required ...................................................................... osmo-sip-master: Don't install packages not required We don't need to install dozens of packages that osmo-sip-connector never had as an upstream dependency. Change-Id: I604c9843866c100f12574f1ca37ff853a1b64f42 --- M osmo-sip-master/Dockerfile 1 file changed, 1 insertion(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/22841/1 diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 4a53b7e..064432e 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -28,18 +28,8 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - libasn1c-dev \ - libdbd-sqlite3 \ - libdbi-dev \ - libosmo-abis-dev \ - libosmo-mgcp-client-dev \ - libosmo-netif-dev \ - libosmo-ranap-dev \ - libosmo-sccp-dev \ - libosmo-sigtran-dev \ libosmocore-dev \ - libsmpp34-dev \ - telnet && \ + libsofia-sip-ua-glib-dev && \ apt-get clean \ ;; \ centos*) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I604c9843866c100f12574f1ca37ff853a1b64f42 Gerrit-Change-Number: 22841 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:53:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 11:53:51 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22840 ) Change subject: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iecc2395efab703cf3de8f8e16b9e4bc8c8baf260 Gerrit-Change-Number: 22840 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 11:53:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:53:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:53:53 +0000 Subject: Change in docker-playground[master]: osmo-sip-master: Don't install packages not required In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22841 ) Change subject: osmo-sip-master: Don't install packages not required ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I604c9843866c100f12574f1ca37ff853a1b64f42 Gerrit-Change-Number: 22841 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 11:53:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:53:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:53:55 +0000 Subject: Change in docker-playground[master]: osmo-sip-master: Don't install packages not required In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22841 ) Change subject: osmo-sip-master: Don't install packages not required ...................................................................... osmo-sip-master: Don't install packages not required We don't need to install dozens of packages that osmo-sip-connector never had as an upstream dependency. Change-Id: I604c9843866c100f12574f1ca37ff853a1b64f42 --- M osmo-sip-master/Dockerfile 1 file changed, 1 insertion(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 4a53b7e..064432e 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -28,18 +28,8 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ - libasn1c-dev \ - libdbd-sqlite3 \ - libdbi-dev \ - libosmo-abis-dev \ - libosmo-mgcp-client-dev \ - libosmo-netif-dev \ - libosmo-ranap-dev \ - libosmo-sccp-dev \ - libosmo-sigtran-dev \ libosmocore-dev \ - libsmpp34-dev \ - telnet && \ + libsofia-sip-ua-glib-dev && \ apt-get clean \ ;; \ centos*) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I604c9843866c100f12574f1ca37ff853a1b64f42 Gerrit-Change-Number: 22841 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:57:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:57:57 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:57:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:57:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:57:59 +0000 Subject: Change in libosmo-sccp[master]: sccp: Notify users of point code available/unavailable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 ) Change subject: sccp: Notify users of point code available/unavailable ...................................................................... sccp: Notify users of point code available/unavailable * add N-PCSTATE.ind and N-STATE.ind definitions to SCCP user SAP * add minimal SCMG (SCCP Management) and LBCS (Local Broadcast) * generate MTP-PAUSE.ind/MTP-RESUME.ind based on received xUA DUNA/DAVA * generate N-PCSTATE.ind towards the local SCCP users Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Related: OS#2623, OS#3403, OS#4701 --- M include/osmocom/sigtran/sccp_sap.h M src/Makefile.am M src/sccp_internal.h A src/sccp_lbcs.c A src/sccp_scmg.c M src/xua_snm.c 6 files changed, 233 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index de9b24c..d741644 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -137,6 +137,21 @@ OSMO_SCCP_SSN_BSSAP = 254, }; +/* Q.711 6.3.2.2.5 Signalling point status */ +enum osmo_sccp_sp_status { + OSMO_SCCP_SP_S_INACCESSIBLE = 1, + OSMO_SCCP_SP_S_CONGESTED = 2, + OSMO_SCCP_SP_S_ACCESSIBLE = 3, +}; +/* Q.711 6.3.2.2.6 Remote SCCP status */ +enum osmo_sccp_rem_sccp_status { + OSMO_SCCP_REM_SCCP_S_AVAILABLE = 1, + OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN = 2, + OSMO_SCCP_REM_SCCP_S_UNEQUIPPED = 3, + OSMO_SCCP_REM_SCCP_S_INACCESSIBLE = 4, + OSMO_SCCP_REM_SCCP_S_CONGESTED = 5, +}; + /* legacy shim for name change */ #define OSMO_SCCP_SSN_SMLC_BSSAP OSMO_SCCP_SSN_SMLC_BSSAP_LE @@ -226,6 +241,22 @@ /* user data */ }; +/* OSMO_SCU_PRIM_N_STATE */ +struct osmo_scu_state_param { + uint32_t affected_pc; + uint32_t affected_ssn; + bool user_in_service; /* true: UIS; false: UOS */ + uint32_t ssn_multiplicity_ind; +}; + +/* OSMO_ASCU_PRIM_N_PCSTATE */ +struct osmo_scu_pcstate_param { + uint32_t affected_pc; + uint32_t restricted_importance_level; + enum osmo_sccp_sp_status sp_status; + enum osmo_sccp_rem_sccp_status remote_sccp_status; +}; + struct osmo_scu_prim { struct osmo_prim_hdr oph; union { @@ -235,6 +266,8 @@ struct osmo_scu_reset_param reset; struct osmo_scu_unitdata_param unitdata; struct osmo_scu_notice_param notice; + struct osmo_scu_state_param state; + struct osmo_scu_pcstate_param pcstate; } u; }; diff --git a/src/Makefile.am b/src/Makefile.am index 41d2a8d..4558810 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,8 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ - sccp_user.c sccp_types.c xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ + sccp_user.c sccp_types.c sccp_lbcs.c sccp_scmg.c \ + xua_rkm.c xua_shared.c xua_default_lm_fsm.c \ osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c xua_as_fsm.c \ xua_snm.c osmo_ss7_vty.c sccp_vty.c ipa.c libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_' diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 98f6d37..6ad7ee3 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -129,3 +129,13 @@ bool default_if_unset); void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst); + +/* Local Broadcast (LBCS) */ +void sccp_lbcs_local_bcast_pcstate(struct osmo_sccp_instance *inst, + const struct osmo_scu_pcstate_param *pcstate); +void sccp_lbcs_local_bcast_state(struct osmo_sccp_instance *inst, + const struct osmo_scu_state_param *state); + +/* SCCP Management (SCMG) */ +void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); +void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); diff --git a/src/sccp_lbcs.c b/src/sccp_lbcs.c new file mode 100644 index 0000000..3aa4f7a --- /dev/null +++ b/src/sccp_lbcs.c @@ -0,0 +1,68 @@ +/* SCCP Local Broadcast (LBCS) according to ITU-T Q.713/Q.714 */ + +/* (C) 2021 by Harald Welte + * All Rights reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "xua_internal.h" +#include "sccp_internal.h" + +/* perform a "local broadcast" of a N-PCSTATE.ind */ +void sccp_lbcs_local_bcast_pcstate(struct osmo_sccp_instance *inst, + const struct osmo_scu_pcstate_param *pcstate) +{ + struct osmo_sccp_user *scu; + + llist_for_each_entry(scu, &inst->users, list) { + struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_PCSTATE, + PRIM_OP_INDICATION, upmsg); + prim->u.pcstate = *pcstate; + sccp_user_prim_up(scu, prim); + } +} + +/* perform a "local broadcast" of a N-STATE.ind */ +void sccp_lbcs_local_bcast_state(struct osmo_sccp_instance *inst, + const struct osmo_scu_state_param *state) +{ + struct osmo_sccp_user *scu; + + llist_for_each_entry(scu, &inst->users, list) { + struct msgb *upmsg = sccp_msgb_alloc(__func__); + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_STATE, + PRIM_OP_INDICATION, upmsg); + prim->u.state = *state; + sccp_user_prim_up(scu, prim); + } +} diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c new file mode 100644 index 0000000..4a8ccf6 --- /dev/null +++ b/src/sccp_scmg.c @@ -0,0 +1,83 @@ +/* SCCP Management (SCMG) according to ITU-T Q.713/Q.714 */ + +/* (C) 2021 by Harald Welte + * All Rights reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "xua_internal.h" +#include "sccp_internal.h" + +/*! brief MTP -> SNM (MTP-PAUSE.ind) - inability to providing MTP service Q.714 5.2.2 */ +void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc) +{ + struct osmo_scu_pcstate_param pcstate; + /* 1) Informs the translation function to update the translation tables. */ + /* 2) SCCP management marks as "prohibited" the status of the remote signalling point, the + remote SCCP and each subsystem at the remote signalling point. */ + /* 3) Discontinues all subsystem status tests (including SSN = 1) */ + + /* 4) local broadcast of "user-out-of-service" for each SSN at that dest + * [this would require us to track SSNs at each PC, which we don't] */ + + /* 5) local broadcast of "signaling point inaccessible" */ + /* 6) local broadcast of "remote SCCP unavailable" */ + pcstate = (struct osmo_scu_pcstate_param) { + .affected_pc = dpc, + .restricted_importance_level = 0, + .sp_status = OSMO_SCCP_SP_S_INACCESSIBLE, + .remote_sccp_status = OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN, + }; + sccp_lbcs_local_bcast_pcstate(inst, &pcstate); +} + +/*! brief MTP -> SNM (MTP-RESUME.ind) - ability of providing the MTP service Q.714 5.2.3 */ +void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc) +{ + struct osmo_scu_pcstate_param pcstate; + /* 1) Sets the congestion state of that signalling point */ + /* 2) Instructs the translation function to update the translation tables. */ + /* 3) Marks as "allowed" the status of that destination, and the SCCP */ + /* 4) - not applicable */ + /* 5) Marks as "allowed" the status of remote subsystems */ + + /* 6) local broadcast of "signalling point accessible" */ + /* 7) local broadcast of "remote SCCP accessible" */ + pcstate = (struct osmo_scu_pcstate_param) { + .affected_pc = dpc, + .restricted_importance_level = 0, + .sp_status = OSMO_SCCP_SP_S_ACCESSIBLE, + .remote_sccp_status = OSMO_SCCP_REM_SCCP_S_AVAILABLE, + }; + sccp_lbcs_local_bcast_pcstate(inst, &pcstate); + + /* 8) local broadcast of "user-in-service" + * [this would require us to track SSNs at each PC, which we don't] */ +} diff --git a/src/xua_snm.c b/src/xua_snm.c index c4dffbb..e3efc8e 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -31,6 +31,7 @@ #include #include "xua_internal.h" +#include "sccp_internal.h" /* we can share this code between M3UA and SUA as the below conditions are true */ osmo_static_assert(M3UA_SNM_DUNA == SUA_SNM_DUNA, _sa_duna); @@ -98,6 +99,37 @@ } } +/* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ +static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, + const uint32_t *aff_pc, unsigned int num_aff_pc, + bool available) +{ + int i; + for (i = 0; i < num_aff_pc; i++) { + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + + if (!mask) { + if (available) + sccp_scmg_rx_mtp_resume(sccp, pc); + else + sccp_scmg_rx_mtp_pause(sccp, pc); + } else { + /* we have to send one MTP primitive for each individual point + * code within that mask */ + uint32_t maskbits = (1 << mask) - 1; + uint32_t fullpc; + for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) { + if (available) + sccp_scmg_rx_mtp_resume(sccp, pc); + else + sccp_scmg_rx_mtp_pause(sccp, pc); + } + } + } +} + /* advertise availability of point codes (with masks) */ void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str, bool available) @@ -107,6 +139,11 @@ uint32_t rctx[32]; unsigned int num_rctx; + /* inform local users via a MTP-{PAUSE, RESUME} primitive */ + if (s7i->sccp) + xua_snm_pc_available_to_sccp(s7i->sccp, aff_pc, num_aff_pc, available); + + /* inform remote ASPs via DUNA/DAVA */ llist_for_each_entry(asp, &s7i->asp_list, list) { /* SSNM is only permitted for ASPs in ACTIVE state */ if (!osmo_ss7_asp_active(asp)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idb799f7d7ab329ad12f07b7cbe6336da0891ae92 Gerrit-Change-Number: 22778 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:58:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:58:09 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:58:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:58:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:58:11 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation ...................................................................... sccp: Add minimalistic SCMG implementation SCMG (SCCP Management) is a special sub-system that normally resides at SSN=1. In Osmocom we so far ignored its existence. However, in terms of interop with other implementation, we should implement at least some basic features. The only procedure implemented in this initial commit is the response to an incoming SST (Subsystem Test) message. If we don't respond to this message, a remote SCCP entity could assume the SSN is dead on our side, rendering communication impossible. Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 --- M include/osmocom/sigtran/Makefile.am A include/osmocom/sigtran/protocol/sccp_scmg.h M src/sccp_internal.h M src/sccp_scmg.c M src/sccp_user.c 5 files changed, 166 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/Makefile.am b/include/osmocom/sigtran/Makefile.am index 0aa90cb..d9cc20c 100644 --- a/include/osmocom/sigtran/Makefile.am +++ b/include/osmocom/sigtran/Makefile.am @@ -3,5 +3,6 @@ sigtrandir = $(includedir)/osmocom/sigtran -sigtran_prot_HEADERS = protocol/sua.h protocol/m3ua.h protocol/mtp.h +sigtran_prot_HEADERS = protocol/sua.h protocol/m3ua.h protocol/mtp.h \ + protocol/sccp_scmg.h sigtran_protdir = $(includedir)/osmocom/sigtran/protocol diff --git a/include/osmocom/sigtran/protocol/sccp_scmg.h b/include/osmocom/sigtran/protocol/sccp_scmg.h new file mode 100644 index 0000000..5d97828 --- /dev/null +++ b/include/osmocom/sigtran/protocol/sccp_scmg.h @@ -0,0 +1,25 @@ +#pragma once + +/* SCCP Management as per Section 5.3 of ITU-T Q.713 */ + +enum sccp_scmg_msg_type { + SCCP_SCMG_MSGT_SSA = 0x01, /* Subsystem Allowed */ + SCCP_SCMG_MSGT_SSP = 0x02, /* Subsystem Prohibited */ + SCCP_SCMG_MSGT_SST = 0x03, /* Subsystem Status Test */ + SCCP_SCMG_MSGT_SOR = 0x04, /* Subsystem Out-of-service Request */ + SCCP_SCMG_MSGT_SOG = 0x05, /* Subsystem Out-of-service Grant */ + SCCP_SCMG_MSGT_SSC = 0x06, /* Subsystem Congested */ +}; + +struct sccp_scmg_msg { + uint8_t msg_type; /* enum sccp_scmg_msg_type */ + uint8_t affected_ssn; + uint16_t affected_pc; + uint8_t smi; + /* one octet, only in case of SSC */ + uint8_t ssc_congestion_lvl[0]; +} __attribute__ ((packed)); + +extern const struct value_string sccp_scmg_msgt_names[]; +static inline const char *sccp_scmg_msgt_name(enum sccp_scmg_msg_type msgt) +{ return get_value_string(sccp_scmg_msgt_names, msgt); } diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 6ad7ee3..6bd2af9 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -139,3 +139,4 @@ /* SCCP Management (SCMG) */ void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); +int sccp_scmg_init(struct osmo_sccp_instance *inst); diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 4a8ccf6..0e3905d 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -30,6 +30,7 @@ #include #include +#include #include #include "xua_internal.h" @@ -81,3 +82,133 @@ /* 8) local broadcast of "user-in-service" * [this would require us to track SSNs at each PC, which we don't] */ } + +const struct value_string sccp_scmg_msgt_names[] = { + { SCCP_SCMG_MSGT_SSA, "SSA (Subsystem Allowed)" }, + { SCCP_SCMG_MSGT_SSP, "SSP (Subsystem Prohibited)" }, + { SCCP_SCMG_MSGT_SST, "SST (Subsystem Status Test)" }, + { SCCP_SCMG_MSGT_SOR, "SOR (Subsystem Out-of-service Request)" }, + { SCCP_SCMG_MSGT_SOG, "SOG (Subsystem Out-of-service Grant)" }, + { SCCP_SCMG_MSGT_SSC, "SSC (Subsystem Congested)" }, + { 0, NULL } +}; + +static int sccp_scmg_tx(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, + uint8_t msg_type, uint8_t ssn, uint16_t pc, uint8_t smi, uint8_t *ssc_cong_lvl) +{ + struct msgb *msg = sccp_msgb_alloc(__func__); + struct osmo_scu_prim *prim; + struct osmo_scu_unitdata_param *param; + struct sccp_scmg_msg *scmg; + + /* fill primitive header */ + prim = (struct osmo_scu_prim *) msgb_put(msg, sizeof(*prim)); + param = &prim->u.unitdata; + memcpy(¶m->calling_addr, calling_addr, sizeof(*calling_addr)); + memcpy(¶m->called_addr, called_addr, sizeof(*called_addr)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST, msg); + + /* Fill the actual SCMG message */ + msg->l2h = msgb_put(msg, sizeof(*scmg)); + scmg = (struct sccp_scmg_msg *) msg->l2h; + scmg->msg_type = msg_type; + scmg->affected_ssn = ssn; + scmg->affected_pc = pc; + scmg->smi = smi; + + /* add congestion level in case of SSC message */ + if (msg_type == SCCP_SCMG_MSGT_SSC) { + msgb_put(msg, 1); + OSMO_ASSERT(ssc_cong_lvl); + scmg->ssc_congestion_lvl[1] = *ssc_cong_lvl; + } + + return osmo_sccp_user_sap_down(scu, &prim->oph); +} + + +/* Subsystem Test received */ +static int scmg_rx_sst(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *sst) +{ + /* Q.714 5.3.4.3 Actions at the receiving side (of SST) */ + + /* check "ignore subsystem status test" and bail out */ + /* check if SSN in question is available. If yes, return SSA. If not, ignore */ + scu = sccp_user_find(scu->inst, sst->affected_ssn, sst->affected_pc); + if (!scu) + return 0; + + /* is subsystem available? */ + if (0 /* !subsys_available(scu) */) + return 0; + + return sccp_scmg_tx(scu, called_addr, calling_addr, SCCP_SCMG_MSGT_SSA, + sst->affected_ssn, sst->affected_pc, 0, NULL); +} + +static int scmg_rx(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *scmg) +{ + switch (scmg->msg_type) { + case SCCP_SCMG_MSGT_SST: + return scmg_rx_sst(scu, calling_addr, called_addr, scmg); + case SCCP_SCMG_MSGT_SSP: + case SCCP_SCMG_MSGT_SSA: + case SCCP_SCMG_MSGT_SOR: + case SCCP_SCMG_MSGT_SOG: + case SCCP_SCMG_MSGT_SSC: + default: + LOGP(DLSCCP, LOGL_NOTICE, "Rx unsupported SCCP SCMG %s, ignoring", + sccp_scmg_msgt_name(scmg->msg_type)); + break; + } + return 0; +} + +/* main entry point for SCCP user primitives from SCRC/SCOC */ +static int scmg_prim_cb(struct osmo_prim_hdr *oph, void *_scu) +{ + struct osmo_sccp_user *scu = _scu; + struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; + struct osmo_scu_unitdata_param *param; + struct sccp_scmg_msg *scmg; + int rc = 0; + + switch (OSMO_PRIM_HDR(oph)) { + case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): + param = &prim->u.unitdata; + scmg = msgb_l2(oph->msg); + /* ensure minimum length based on message type */ + if (msgb_l2len(oph->msg) < sizeof(*scmg)) { + rc = -1; + break; + } + if (scmg->msg_type == SCCP_SCMG_MSGT_SSC && msgb_l2len(oph->msg) < sizeof(*scmg)+1) { + rc = -1; + break; + } + /* interestingly, PC is specified to be encoded in little endian ?!? */ + scmg->affected_pc = osmo_load16le(&scmg->affected_pc); + rc = scmg_rx(scu, ¶m->calling_addr, ¶m->called_addr, scmg); + break; + default: + LOGP(DLSCCP, LOGL_ERROR, "unsupported SCCP user primitive %s\n", + osmo_scu_prim_name(oph)); + break; + } + + msgb_free(oph->msg); + return rc; +} + +/* register SCMG as SCCP user for SSN=1 */ +int sccp_scmg_init(struct osmo_sccp_instance *inst) +{ + struct osmo_sccp_user *scu; + scu = osmo_sccp_user_bind(inst, "SCCP Maangement", scmg_prim_cb, SCCP_SSN_MANAGEMENT); + if (!scu) + return -1; + return 0; +} diff --git a/src/sccp_user.c b/src/sccp_user.c index 880cab1..d8e78f0 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -220,6 +220,7 @@ osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv) { struct osmo_sccp_instance *inst; + int rc; inst = talloc_zero(ss7, struct osmo_sccp_instance); if (!inst) @@ -235,6 +236,12 @@ inst->ss7_user.prim_cb = mtp_user_prim_cb; inst->ss7_user.priv = inst; + rc = sccp_scmg_init(inst); + if (rc < 0) { + talloc_free(inst); + return NULL; + } + osmo_ss7_user_register(ss7, MTP_SI_SCCP, &inst->ss7_user); llist_add_tail(&inst->list, &sccp_instances); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 11:59:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 11:59:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 ) Change subject: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates ...................................................................... Patch Set 1: > Can you explain better? I don't see why Length shouldn't be lengthof(data) well, it's a receive template. so it could be that "data == ?", i.e an unspecific template. You cannot build lengthof() on that. Matching the length byte has no benefit (and we generally never do), as we match the actual data. IF the length of the data octetstring differs, you get exactly the same result. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 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: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 Gerrit-Change-Number: 22830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 11:59:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:00:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:00:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 ) Change subject: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 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: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 Gerrit-Change-Number: 22830 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 12:00:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:00:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:00:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add Tests for SCMG SST procedure In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 ) Change subject: sccp: Add Tests for SCMG SST procedure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 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: If3f5f3144c0ed83d0bda5953522a9d73287c8ba2 Gerrit-Change-Number: 22831 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 12:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:00:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:00:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 ) Change subject: SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates ...................................................................... SCCP_Templates: Make tr_SCCP_UDT work for unspecific templates Change-Id: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 --- M library/SCCP_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index b0e6df7..ff4d745 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -143,7 +143,7 @@ calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), data := { - paramLength := lengthof(data), + paramLength := ?, data := data } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22830 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: Ic77f52f7ec6dc8e17d9cd0789ba790296a25bc50 Gerrit-Change-Number: 22830 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:00:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:00:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add Tests for SCMG SST procedure In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 ) Change subject: sccp: Add Tests for SCMG SST procedure ...................................................................... sccp: Add Tests for SCMG SST procedure The SST procedure can be used by any SCCP node to test the availability of a remote SSN. If the specified remote SSN is available at the specified PC, a SCMG SSA is returned. If not, there's a timeout. Test for SSN=1 (SCMG), another non-SCMG SSN that exists, and for one SSN that doesn't exist. Change-Id: If3f5f3144c0ed83d0bda5953522a9d73287c8ba2 --- M deps/Makefile M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 3 files changed, 185 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index c5fd338..c9cc53d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -44,7 +44,6 @@ titan.TestPorts.UNIX_DOMAIN_SOCKETasp ECLIPSEGIT2_REPOS= titan.ProtocolEmulations.M3UA \ - titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.GRE \ titan.ProtocolModules.M2PA \ titan.ProtocolModules.ROSE \ @@ -65,6 +64,7 @@ OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \ titan.TestPorts.MTP3asp \ titan.TestPorts.UDPasp \ + titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.BSSGP_v13.0.0 OSMOGIT_REPOS= titan.ProtocolModules.MAP \ @@ -80,7 +80,7 @@ # name of a local branch here (e.g. 'master'). titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= f086e78d74defa044d864f17adaad9433fedc961 -titan.ProtocolEmulations.SCCP_commit= R.7.A-10-g2ca1566 +titan.ProtocolEmulations.SCCP_commit= R.7.A-11-gd4b7a6d titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8 titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a titan.ProtocolModules.BSSMAP_commit= master diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index ff4d745..9936dd0 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -215,5 +215,90 @@ } } +private function f_pc_int2bit(template (present) integer pc) +return template SCMG_param_AffectedPointCode { + if (istemplatekind(pc, "?")) { + return ?; + } else { + return int2bit(valueof(pc), 16); + } +} + +template (value) PDU_SCMG_message ts_SCMG_SSA(template (value) integer ssn, + integer pc, + template (value) BIT2 smi := '00'B) := { + messageType := sSAallowed, + affectedSSN := ssn, + affectedPC := int2bit(valueof(pc), 16), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCMG_SSA(template (present) integer ssn := ?, + template (present) integer pc := ?, + template (present) BIT2 smi := ?) := { + messageType := sSAallowed, + affectedSSN := ssn, + affectedPC := f_pc_int2bit(pc), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} + +template (value) PDU_SCMG_message ts_SCMG_SSP(template (value) integer ssn, + integer pc, + template (value) BIT2 smi := '00'B) := { + messageType := sSPprohib, + affectedSSN := ssn, + affectedPC := int2bit(valueof(pc), 16), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCMG_SSP(template (present) integer ssn := ?, + template (present) integer pc := ?, + template (present) BIT2 smi := ?) := { + messageType := sSPprohib, + affectedSSN := ssn, + affectedPC := f_pc_int2bit(pc), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} + +template (value) PDU_SCMG_message ts_SCMG_SST(template (value) integer ssn, + integer pc, + template (value) BIT2 smi := '00'B) := { + messageType := sSTstaTest, + affectedSSN := ssn, + affectedPC := int2bit(valueof(pc), 16), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} +template (present) PDU_SCMG_message tr_SCMG_SST(template (present) integer ssn := ?, + template (present) integer pc := ?, + template (present) BIT2 smi := ?) := { + messageType := sSTstaTest, + affectedSSN := ssn, + affectedPC := f_pc_int2bit(pc), + smi := { + smi := smi, + reserved := '000000'B + }, + congLevel := omit +} + + } diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 7d44eb4..356fbb2 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -310,11 +310,109 @@ } } +function f_scmg_xceive(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) PDU_SCMG_message tx, + template (omit) PDU_SCMG_message rx_exp) runs on SCCP_Test_RAW_CT +{ + var boolean exp_something := true; + timer T := 5.0; + + if (istemplatekind(rx_exp, "omit")) { + exp_something := false; + } + + MTP3.clear; + f_send_sccp(ts_SCCP_UDT(calling, called, enc_PDU_SCMG_message(valueof(tx)))); + T.start; + alt { + [exp_something] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_UDT(called, calling, decmatch rx_exp))) { + setverdict(pass); + } + [] MTP3.receive(tr_SCCP_MTP3_TRANSFERind(tr_SCCP_UDT(called, calling, ?))) { + setverdict(fail, "Received unexpected SCCP waiting for ", rx_exp); + } + [] MTP3.receive { + setverdict(fail, "Received unexpected waiting for ", rx_exp); + } + [exp_something] T.timeout { + setverdict(fail, "Timeout waiting for ", rx_exp); + } + [not exp_something] T.timeout { + setverdict(pass); + } + } + +} + +/* Test is SST(SSN=1) returns SSA */ +testcase TC_scmg_sst_ssn1() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var template (value) PDU_SCMG_message tx; + var template (present) PDU_SCMG_message rx_exp; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + tx := ts_SCMG_SST(1, mp_sccp_cfg[0].peer_pc); + rx_exp := ts_SCMG_SSA(1, mp_sccp_cfg[0].peer_pc); + f_scmg_xceive(calling, called, tx, rx_exp); +} + +/* Test is SST(SSN=valid) returns SSA */ +testcase TC_scmg_sst_ssn_valid() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var template (value) PDU_SCMG_message tx; + var template (present) PDU_SCMG_message rx_exp; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + tx := ts_SCMG_SST(mp_sccp_cfg[0].peer_ssn, mp_sccp_cfg[0].peer_pc); + rx_exp := ts_SCMG_SSA(mp_sccp_cfg[0].peer_ssn, mp_sccp_cfg[0].peer_pc); + f_scmg_xceive(calling, called, tx, rx_exp); +} + + +/* Test is SST(SSN=invalid) returns nothing */ +testcase TC_scmg_sst_ssn_invalid() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var template (value) PDU_SCMG_message tx; + var template (omit) PDU_SCMG_message rx_exp; + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, 1, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + tx := ts_SCMG_SST(123, mp_sccp_cfg[0].peer_pc); + rx_exp := omit; + f_scmg_xceive(calling, called, tx, rx_exp); +} + + + control { execute( TC_cr_cc() ); execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); execute( TC_it_avoids_tiar() ); + + execute( TC_scmg_sst_ssn1() ); + execute( TC_scmg_sst_ssn_valid() ); + execute( TC_scmg_sst_ssn_invalid() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22831 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: If3f5f3144c0ed83d0bda5953522a9d73287c8ba2 Gerrit-Change-Number: 22831 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:01:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:01:05 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore: add triggers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore: add triggers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 12:01:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:01:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:01:34 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Move code filling struct to helper function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22826 ) Change subject: nacc_fsm: Move code filling struct to helper function ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idfd4db8408f767b1847b04c88047a1c4996e543e Gerrit-Change-Number: 22826 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 12:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:01:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:01:50 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22840 ) Change subject: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iecc2395efab703cf3de8f8e16b9e4bc8c8baf260 Gerrit-Change-Number: 22840 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 12:01:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:01:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:01:53 +0000 Subject: Change in osmo-bsc[master]: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22840 ) Change subject: bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default ...................................................................... bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default Change-Id: Iecc2395efab703cf3de8f8e16b9e4bc8c8baf260 Related: SYS#5114 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 0388e8e..d3f8a73 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2842,7 +2842,7 @@ "1 BER >= 0.2%\n" "2 BER >= 0.4%\n" "3 BER >= 0.8%\n" - "4 BER >= 1.6%\n" + "4 BER >= 1.6% (default)\n" "5 BER >= 3.2%\n" "6 BER >= 6.4%\n" "7 BER >= 12.8%\n") -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iecc2395efab703cf3de8f8e16b9e4bc8c8baf260 Gerrit-Change-Number: 22840 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:02:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 12:02:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans ...................................................................... pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans Tests verify MS retransmitting a Pkt cell Chg Notif with different target cell (hence a different NACC procedure) will be handled correctly if PCU state was in the middle of handling a different NACC request. Related: SYS#4909 Change-Id: I68c749aaabe9fe8272fc43045be09a46852359e5 --- M pcu/PCU_Tests.ttcn 1 file changed, 169 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/22842/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index f7687f5..251ccee 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4313,6 +4313,174 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) + * while waiting for CTRL resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl; + /* Before receiving CTRL response, MS retransmits Pkt cell Chg Notif with different tgt arfcn */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + IPA_CTRL.send(ts_CtrlMsgGetRepl(rx_ctrl.cmd.id, valueof(ctrl_var), valueof("023-43-423-2-5"))); + /* We should now receive a 2nd CTRL request with the new ARFCN+BSIC */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + + /* And finally everything continues as usual with RIN procedure */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + +/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) + * while waiting for SI resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice2() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + as_outbound_nacc_rim_resolve(info_ind, do_answer := false); + /* Before receiving RIM response, MS retransmits Pkt cell Chg Notif with different tgt cell: */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + f_outbound_nacc_rim_tx_resp(info_ind); + + /* As a result, CTRL + RIM resolution for new tgt cell should now be done: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + + /* And finally everything continues as usual with RIN procedure */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -4542,6 +4710,7 @@ execute( TC_nacc_outbound_si_resolve_timeout() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup2() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 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: I68c749aaabe9fe8272fc43045be09a46852359e5 Gerrit-Change-Number: 22842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:04:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 12:04:25 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore: add triggers In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore: add triggers ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 12:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:04:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 12:04:27 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: libosmocore: add triggers In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22839 ) Change subject: jobs/master-builds: libosmocore: add triggers ...................................................................... jobs/master-builds: libosmocore: add triggers Add missing triggers for osmo-gbproxy, osmo-trx. Related: OS#4992 Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 --- M jobs/master-builds.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index e6a8239..fb23553 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -142,12 +142,14 @@ # [...] trigger: > master-libosmo-abis, + master-osmo-gbproxy, master-osmo-ggsn, master-osmo-gmr, master-osmo-pcap, master-osmo-pcu, master-osmo-sip-connector, master-osmo-tetra, + master-osmo-trx, master-osmocom-bb, SIMtrace, xgoldmon -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1bc590cc9560b1780cccd99f7ca86700bd9a6ad9 Gerrit-Change-Number: 22839 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:04:28 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to bts.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Patch Set 1: Code-Review-1 > Patch Set 1: > > So, what I meant is: In the end, to me it doesn't make sense to decide to put code in the incorrect file just because then on our build foo adding lots of *.o we have to put more churn (which should be fixed as expressed in my prev comment). but it does make sense to move the function, despite it causing really ugly fall-out like long makefile dependency lists _and_ lots of stubs to be created? Sorry, I would prefere to keep it either as-is or to fix it properly. The required stubs should always be as small as possible at all. If it grows to that kind of size, we have a serious problem with encapsulation. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 12:04:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:04:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:04:43 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to bts.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to bts.c ...................................................................... Patch Set 1: In fact, I'd even prefer copying the fucntion than this. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 12:04:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 12:05:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 12:05:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 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: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 Gerrit-Change-Number: 22829 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 12:05:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:05:30 2021 From: gerrit-no-reply at lists.osmocom.org (Gabriel Ganne) Date: Thu, 11 Feb 2021 13:05:30 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools References: Message-ID: Gabriel Ganne has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... install gtp-tunnel and gtp-link tools This eases quick setup for demontration purposes. Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df --- M tools/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/43/22843/1 diff --git a/tools/Makefile.am b/tools/Makefile.am index ec2eb66..7beae57 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Make_global.am -noinst_PROGRAMS = gtp-link \ +bin_PROGRAMS = gtp-link \ gtp-tunnel gtp_link_SOURCES = gtp-link.c -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 1 Gerrit-Owner: Gabriel Ganne Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:29:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 13:29:40 +0000 Subject: Change in osmo-gsm-manuals[master]: logging: add documentation for 'systemd-journal' target References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844 ) Change subject: logging: add documentation for 'systemd-journal' target ...................................................................... logging: add documentation for 'systemd-journal' target Change-Id: I04c9f81b10ac56c020f537c3ad52026733b5c620 --- M common/chapters/logging.adoc 1 file changed, 78 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/44/22844/1 diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index 11ec774..b0a1f5e 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -290,6 +290,84 @@ by issuing the `logging timestamp 0` command. +==== Logging to systemd-journal + +systemd has been adopted by the majority of modern GNU/Linux distributions. +Along with various daemons and utilities it provides systemd-journald [1] - +a daemon responsible for event logging (syslog replacement). libosmocore +based applications can log messages directly to systemd-journald. + +The key difference from other logging targets is that systemd based logging +allows to offload rendering of the meta information, such as location +(file name, line number), subsystem, and logging level, to systemd-journald. +Furthermore, systemd allows to attach arbitrary meta fields to the logging +messages [2], which can be used for advanced log filtering. + +[1] https://www.freedesktop.org/software/systemd/man/systemd-journald.service.html +[2] https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html + +It was decided to introduce libsystemd as an optional dependency, +so it needs to be enabled explicitly at configure/build time: + +---- +$ ./configure --enable-systemd-logging +---- + +NOTE: Recent libosmocore packages provided by Osmocom for Debian and CentOS are +compiled *with* libsystemd (https://gerrit.osmocom.org/c/libosmocore/+/22651). + +You can configure systemd based logging in two ways: + +.Example: `systemd-journal` target with offloaded rendering +---- +log systemd-journal raw <1> + logging filter all 1 + logging level set-all notice +---- +<1> `raw` logging handler, rendering offloaded to systemd. + +In this example, logging messages will be passed to systemd without any meta +information (time, location, level, category) in the text itself, so all +the printing parameters like `logging print file` will be ignored. Instead, +the meta information is passed separately as _fields_ which can be retrieved +from the journal and rendered in any preferred way. + +---- +# Show Osmocom specific fields +$ journalctl --fields | grep OSMO + +# Filter messages by logging subsystem at run-time +$ journalctl OSMO_SUBSYS=DMSC -f + +# Render specific fields only +$ journalctl --output=verbose \ + --output-fields=SYSLOG_IDENTIFIER,OSMO_SUBSYS,CODE_FILE,CODE_LINE,MESSAGE +---- + +See `man 7 systemd.journal-fields` for a list of default fields, and +`man 1 journalctl` for general information and available formatters. + +.Example: `systemd-journal` target with libosmocore based rendering +---- +log systemd-journal <1> + logging filter all 1 + logging print file basename + logging print category-hex 0 + logging print category 1 + logging print level 1 + logging timestamp 0 <2> + logging color 1 <3> + logging level set-all notice +---- +<1> Generic logging handler, rendering is done by libosmocore. +<2> Disable timestamping, systemd will timestamp every message anyway. +<3> Colored messages can be rendered with `journalctl --output=cat`. + +In this example, logging messages will be pre-processed by libosmocore before +being passed to systemd. No additional fields will be attached, except the +logging level (`PRIORITY`). This mode is similar to _syslog_ and _stderr_. + + ==== Logging to stderr If you're not running the respective application as a daemon in the -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I04c9f81b10ac56c020f537c3ad52026733b5c620 Gerrit-Change-Number: 22844 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:31:50 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 13:31:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 ) Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 This commit used a send template (ts) to match a received BSSGP PDU which doesn't work due to some differences in the length field. Use tr_BSSGP_IMSI again and change the template restrictions so it compiles. Change-Id: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 --- M gbproxy/GBProxy_Tests.ttcn M library/Osmocom_Gb_Types.ttcn 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/22845/1 diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index af9646c..e12d69f 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -1105,7 +1105,7 @@ ts_BSSGP_DL_UD(g_pars.tlli, payload, omit, ts_BSSGP_IMSI(g_pars.imsi)); /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */ var template (present) PDU_BSSGP pdu_rx := - tr_BSSGP_DL_UD(g_pars.tlli, payload, ts_BSSGP_IMSI(g_pars.imsi)); + tr_BSSGP_DL_UD(g_pars.tlli, payload, tr_BSSGP_IMSI(g_pars.imsi)); log("DL-UNITDATA(payload_size=", i); f_sgsn2pcu(pdu_tx, pdu_rx); diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 687a073..e1f3042 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -1023,7 +1023,7 @@ suspend_Reference_Number_value := susp_ref } - template (present) IMSI_BSSGP tr_BSSGP_IMSI(template (present) hexstring imsi) := { + template IMSI_BSSGP tr_BSSGP_IMSI(template hexstring imsi) := { iEI := '0D'O, ext := '1'B, lengthIndicator := ?, @@ -1815,7 +1815,7 @@ } } template (present) PDU_BSSGP tr_BSSGP_DL_UD(template (present) GprsTlli tlli, template (present) octetstring pdu, - template (omit) IMSI_BSSGP imsi := omit) := { + template IMSI_BSSGP imsi := omit) := { pDU_BSSGP_DL_UNITDATA := { bssgpPduType := '00'O, tLLI_current := tlli, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:31:50 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 13:31:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Increase timeouts for dl/ul unitdata tests References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 ) Change subject: gbproxy: Increase timeouts for dl/ul unitdata tests ...................................................................... gbproxy: Increase timeouts for dl/ul unitdata tests These tests run quite some time and I had issues with timeouts locally. Change-Id: Id99ffa14bf6bcb584688c410feb9163a4f0fb492 --- M gbproxy/GBProxy_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/22846/1 diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index e12d69f..f1e5c79 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -1089,7 +1089,7 @@ testcase TC_ul_unitdata() runs on test_CT { - f_init(); + f_init(60.0); f_start_handlers(refers(f_TC_ul_unitdata), testcasename(), 1); /* TODO: start multiple handlers (UEs) on various cells on same and other NSEs */ f_cleanup(); @@ -1115,7 +1115,7 @@ testcase TC_dl_unitdata() runs on test_CT { - f_init(); + f_init(60.0); f_start_handlers(refers(f_TC_dl_unitdata), testcasename(), 2); /* TODO: start multiple handlers (UEs) on various cells on same and other NSEs */ f_cleanup(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 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: Id99ffa14bf6bcb584688c410feb9163a4f0fb492 Gerrit-Change-Number: 22846 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:34:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 13:34:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 ) Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1//COMMIT_MSG at 13 PS1, Line 13: Fixes: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 13:34:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:34:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 13:34:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Increase timeouts for dl/ul unitdata tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 ) Change subject: gbproxy: Increase timeouts for dl/ul unitdata tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 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: Id99ffa14bf6bcb584688c410feb9163a4f0fb492 Gerrit-Change-Number: 22846 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 13:34:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:37:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 13:37:41 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... Patch Set 1: Code-Review-1 (1 comment) In the event we really want this to be installed, the debian package metada should be updated to put those binarines into another separate package (libgtpnl-tools, libgtpnl-utils, etc). see debian/control and debian/*.install https://gerrit.osmocom.org/c/libgtpnl/+/22843/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libgtpnl/+/22843/1//COMMIT_MSG at 9 PS1, Line 9: This eases quick setup for demontration purposes. demonstration -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 1 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 13:37:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:41:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 13:41:47 +0000 Subject: Change in libosmocore[master]: logging: introduce 'systemd-journal' target In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20045 ) Change subject: logging: introduce 'systemd-journal' target ...................................................................... Patch Set 7: > Patch Set 6: > > merging this, but pleaes try to update the user manual accordingly in a separate patch Please see https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I609f5cf438e6ad9038d8fc95f00add6aac29fb23 Gerrit-Change-Number: 20045 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 13:41:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:43:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 13:43:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 ) Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1/library/Osmocom_Gb_Types.ttcn at 1026 PS1, Line 1026: template IMSI_BSSGP tr_BSSGP_IMSI(template hexstring imsi) := { why that change? The template does not return a * type wild card, so it is by definition always 'present'? So it is "consistent" before this change, but now after the change it appears to do support something that it cannot in its current form (e.g. acceptiong imsi:=*) I guess you'd need to create a function retunring a template and use the usual 'istemplatekind' approach? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 13:43:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:46:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 13:46:24 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... Patch Set 1: > In the event we really want this to be installed, the debian package metada should be updated to put those binarines into another separate package (libgtpnl-tools, libgtpnl-utils, etc). > > see debian/control and debian/*.install same also applies to the RPM spec file in contrib/libgtpnl.spec.in -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 1 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 13:46:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:46:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 13:46:56 +0000 Subject: Change in pysim[master]: utils.py: Fix for parsing MNC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/22836 ) Change subject: utils.py: Fix for parsing MNC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I799469206f87e930d8888367890babcb8ebe23a9 Gerrit-Change-Number: 22836 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 13:46:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:46:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 13:46:58 +0000 Subject: Change in pysim[master]: utils.py: Fix for parsing MNC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/22836 ) Change subject: utils.py: Fix for parsing MNC ...................................................................... utils.py: Fix for parsing MNC This commit fixes the incorrect parsing of MNC from PLMN. Previously its was parsing PLMN string 130062 as MCC 310 MNC 260, whereas it should be MCC 310 MNC 026. (The SIM was programmed with MCC 310 and MNC 026) Change-Id: I799469206f87e930d8888367890babcb8ebe23a9 --- M pySim/utils.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 3838eff..c150184 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -137,9 +137,9 @@ def dec_mnc_from_plmn(plmn): ia = h2i(plmn) - digit1 = ia[2] & 0x0F # 3rd byte, LSB - digit2 = (ia[2] & 0xF0) >> 4 # 3rd byte, MSB - digit3 = (ia[1] & 0xF0) >> 4 # 2nd byte, MSB + digit1 = (ia[1] & 0xF0) >>4 # 2nd byte, MSB + digit2 = ia[2] & 0x0F # 3rd byte, LSB + digit3 = (ia[2] & 0xF0) >> 4 # 3nd byte, MSB if digit3 == 0xF and digit2 == 0xF and digit1 == 0xF: return 0xFFF # 4095 return derive_mnc(digit1, digit2, digit3) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/22836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I799469206f87e930d8888367890babcb8ebe23a9 Gerrit-Change-Number: 22836 Gerrit-PatchSet: 1 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 13:47:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 13:47:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 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: I68c749aaabe9fe8272fc43045be09a46852359e5 Gerrit-Change-Number: 22842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 13:47:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:02:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 14:02:32 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22847 ) Change subject: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states ...................................................................... nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states We don't care about those messages anymore if we already transitioned further than NACC_ST_WAIT_REQUEST_SI. Furthermore, RIM code dispatching the event to the FSM is only doing it in the mentioned state above. Related: SYS#4909 Change-Id: If420b49e437ff02073669522408763e5e84fe477 --- M src/nacc_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/22847/1 diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index f9dea98..99c8164 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -610,7 +610,6 @@ [NACC_ST_TX_NEIGHBOUR_DATA] = { .in_event_mask = X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | - X(NACC_EV_RX_SI) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = X(NACC_ST_TX_CELL_CHG_CONTINUE), @@ -620,7 +619,6 @@ [NACC_ST_TX_CELL_CHG_CONTINUE] = { .in_event_mask = X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | - X(NACC_EV_RX_SI) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = X(NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If420b49e437ff02073669522408763e5e84fe477 Gerrit-Change-Number: 22847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:13:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 14:13:04 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22847 ) Change subject: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If420b49e437ff02073669522408763e5e84fe477 Gerrit-Change-Number: 22847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 14:13:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:17:36 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 14:17:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 ) Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1//COMMIT_MSG at 13 PS1, Line 13: > Fixes: Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1/library/Osmocom_Gb_Types.ttcn File library/Osmocom_Gb_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845/1/library/Osmocom_Gb_Types.ttcn at 1026 PS1, Line 1026: template IMSI_BSSGP tr_BSSGP_IMSI(template hexstring imsi) := { > why that change? The template does not return a * type wild card, so it is by definition always 'pr [?] I tried various things, including making the function in line 1050 non-private but that didn't compile. tbh I don't really understand the templating restrictions in ttcn3 and how they interact so I reverted the parts of the original commit until it compiled and passed again. But you're right, the change below on its own seems to fix the issue and after reading Ch. 15.8 of the ttcn3 core language it sort of makes sense why: omit only allows either a concrete value or omit, but not a template that matches on '?'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 14:17:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:17:42 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 14:17:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 to look at the new patch set (#2). Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 This commit used a send template (ts) to match a received BSSGP PDU which doesn't work due to some differences in the length field. Use tr_BSSGP_IMSI again and change the template restrictions so it compiles. Fixes: 6ee0126971c83fd60658761263af559a482f13d9 Change-Id: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 --- M gbproxy/GBProxy_Tests.ttcn M library/Osmocom_Gb_Types.ttcn 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/22845/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:19:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 14:19:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 ) Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 14:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:19:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 14:19:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 ) Change subject: gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 ...................................................................... gbproxy: Fix TC_dl_unitdata test failure introduced by 6ee0126971 This commit used a send template (ts) to match a received BSSGP PDU which doesn't work due to some differences in the length field. Use tr_BSSGP_IMSI again and change the template restrictions so it compiles. Fixes: 6ee0126971c83fd60658761263af559a482f13d9 Change-Id: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 --- M gbproxy/GBProxy_Tests.ttcn M library/Osmocom_Gb_Types.ttcn 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index af9646c..e12d69f 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -1105,7 +1105,7 @@ ts_BSSGP_DL_UD(g_pars.tlli, payload, omit, ts_BSSGP_IMSI(g_pars.imsi)); /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */ var template (present) PDU_BSSGP pdu_rx := - tr_BSSGP_DL_UD(g_pars.tlli, payload, ts_BSSGP_IMSI(g_pars.imsi)); + tr_BSSGP_DL_UD(g_pars.tlli, payload, tr_BSSGP_IMSI(g_pars.imsi)); log("DL-UNITDATA(payload_size=", i); f_sgsn2pcu(pdu_tx, pdu_rx); diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 687a073..76988b5 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -1815,7 +1815,7 @@ } } template (present) PDU_BSSGP tr_BSSGP_DL_UD(template (present) GprsTlli tlli, template (present) octetstring pdu, - template (omit) IMSI_BSSGP imsi := omit) := { + template IMSI_BSSGP imsi := omit) := { pDU_BSSGP_DL_UNITDATA := { bssgpPduType := '00'O, tLLI_current := tlli, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22845 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: I85676e96f8d32a9d2c7deadc1d66707b6b8697d0 Gerrit-Change-Number: 22845 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:20:16 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 14:20:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Increase timeouts for dl/ul unitdata tests In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 ) Change subject: gbproxy: Increase timeouts for dl/ul unitdata tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 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: Id99ffa14bf6bcb584688c410feb9163a4f0fb492 Gerrit-Change-Number: 22846 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 14:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:20:19 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 14:20:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Increase timeouts for dl/ul unitdata tests In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 ) Change subject: gbproxy: Increase timeouts for dl/ul unitdata tests ...................................................................... gbproxy: Increase timeouts for dl/ul unitdata tests These tests run quite some time and I had issues with timeouts locally. Change-Id: Id99ffa14bf6bcb584688c410feb9163a4f0fb492 --- M gbproxy/GBProxy_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index e12d69f..f1e5c79 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -1089,7 +1089,7 @@ testcase TC_ul_unitdata() runs on test_CT { - f_init(); + f_init(60.0); f_start_handlers(refers(f_TC_ul_unitdata), testcasename(), 1); /* TODO: start multiple handlers (UEs) on various cells on same and other NSEs */ f_cleanup(); @@ -1115,7 +1115,7 @@ testcase TC_dl_unitdata() runs on test_CT { - f_init(); + f_init(60.0); f_start_handlers(refers(f_TC_dl_unitdata), testcasename(), 2); /* TODO: start multiple handlers (UEs) on various cells on same and other NSEs */ f_cleanup(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22846 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: Id99ffa14bf6bcb584688c410feb9163a4f0fb492 Gerrit-Change-Number: 22846 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:38:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 14:38:28 +0000 Subject: Change in libosmo-sccp[master]: xua: introduce xua_msg_get_u32p() helper In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 ) Change subject: xua: introduce xua_msg_get_u32p() helper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id7780074b82bc668ae148456750b1a01799decd1 Gerrit-Change-Number: 22832 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 14:38:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:41:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 14:41:03 +0000 Subject: Change in libosmo-netif[master]: Don't depend on libosmo-abis (by default) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22848 ) Change subject: Don't depend on libosmo-abis (by default) ...................................................................... Don't depend on libosmo-abis (by default) The only reason we have a libosmo-netif -> libosmo-abis dependency is the lapd examples whihc are built but not even installed. Let's build those only if --enable-lapd-examples is specified at the command line, and remove the dependency to libosmo-abis in all other cases. Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 Closes: OS#4726 --- M configure.ac M contrib/jenkins.sh M contrib/libosmo-netif.spec.in M debian/control M examples/Makefile.am 5 files changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/48/22848/1 diff --git a/configure.ac b/configure.ac index 36c2f49..1b2a459 100644 --- a/configure.ac +++ b/configure.ac @@ -91,8 +91,19 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) -dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) + +AC_ARG_ENABLE([lapd_examples], + [AS_HELP_STRING( + [--enable-lapd-examples], + [Build some lapd examples] + )], + [lapd_examples=$enableval], [lapd_examples="no"]) +AS_IF([test "x$lapd_examples" = "xyes"], [ + PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) + AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples]) +]) +AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes") +AC_SUBST(ENABLE_LAPD) AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bf04643..543671c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -35,7 +35,7 @@ set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror +./configure --enable-sanitize --enable-werror --enable-lapd-examples $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in index 98d021b..95690a7 100644 --- a/contrib/libosmo-netif.spec.in +++ b/contrib/libosmo-netif.spec.in @@ -24,7 +24,6 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 BuildRequires: pkgconfig(libosmocore) >= 1.0.0 BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 diff --git a/debian/control b/debian/control index d242b48..8b76089 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ git, doxygen, libosmocore-dev (>= 1.3.0), - libosmo-abis-dev (>= 0.6.0), pkg-config, libpcap0.8-dev, libsctp-dev diff --git a/examples/Makefile.am b/examples/Makefile.am index 4125243..6d74238 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,8 +4,6 @@ noinst_PROGRAMS = ipa-stream-client \ ipa-stream-server \ - lapd-over-datagram-user \ - lapd-over-datagram-network \ stream-client \ stream-server \ rs232-read \ @@ -27,6 +25,8 @@ ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +if ENABLE_LAPD +noinst_PROGRAMS += lapd-over-datagram-user lapd-over-datagram-network lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ @@ -36,6 +36,7 @@ lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) +endif stream_client_SOURCES = stream-client.c stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 Gerrit-Change-Number: 22848 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 14:52:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 14:52:45 +0000 Subject: Change in libosmo-netif[master]: Don't depend on libosmo-abis (by default) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22848 ) Change subject: Don't depend on libosmo-abis (by default) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 Gerrit-Change-Number: 22848 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 14:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:01:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:01:12 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/22819/1/ttcn3-ggsn-test/Dockerfile File ttcn3-ggsn-test/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/22819/1/ttcn3-ggsn-test/Dockerfile at 6 PS1, Line 6: ggsn_test Needs to be "ggsn_tests", I'll fix it before merge. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:01:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:01:51 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:01:51 +0000 Subject: Change in docker-playground[master]: ttcn3: remove /root/projects/git symlink In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22816 ) Change subject: ttcn3: remove /root/projects/git symlink ...................................................................... Patch Set 1: Verified+1 I ran all testsuites, some locally, some in jenkins, to make sure that they still work like before. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 Gerrit-Change-Number: 22816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Feb 2021 15:01:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:02:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:02:28 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/22819 to look at the new patch set (#2). Change subject: ttcn3: move prepare code to shared script ...................................................................... ttcn3: move prepare code to shared script Move the git fetch/checkout code and make call to build the testsuite, to debian-stretch-titan/ttcn3-docker-prepare.sh. In the next patch, I will extend the script to update deps right before building too (e.g. because OSMO_TTCN3_BRANCH changed). Related: OS#5017 Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 --- M debian-stretch-titan/Dockerfile A debian-stretch-titan/ttcn3-docker-prepare.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 19 files changed, 47 insertions(+), 102 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/19/22819/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:04:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 15:04:47 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:04:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:04:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:04:53 +0000 Subject: Change in docker-playground[master]: ttcn3: remove /root/projects/git symlink In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22816 ) Change subject: ttcn3: remove /root/projects/git symlink ...................................................................... Patch Set 2: Verified+1 Code-Review+2 Everything else in the patchset has +2 and I've extensively tested the changes. This specific patch is trivial, applying +2 here too so I can merge all of them now. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 Gerrit-Change-Number: 22816 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Feb 2021 15:04:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:05:04 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:05:04 +0000 Subject: Change in docker-playground[master]: ttcn3: move initial clone to debian-stretch-titan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22817 ) Change subject: ttcn3: move initial clone to debian-stretch-titan ...................................................................... Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd Gerrit-Change-Number: 22817 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:05:13 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:05:13 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: update deps on change In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change ...................................................................... Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:05:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:05:31 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:05:38 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:05:38 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: run 'make deps' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22820 ) Change subject: debian-stretch-titan: prepare: run 'make deps' ...................................................................... Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 Gerrit-Change-Number: 22820 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:05:45 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:05:45 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: start/stop links In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22821 ) Change subject: debian-stretch-titan: prepare: start/stop links ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada Gerrit-Change-Number: 22821 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:05:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:05:56 +0000 Subject: Change in docker-playground[master]: ttcn3: move shared run code to script In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22822 ) Change subject: ttcn3: move shared run code to script ...................................................................... Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 Gerrit-Change-Number: 22822 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:05:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:02 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:02 +0000 Subject: Change in docker-playground[master]: ttcn3-{fr, gbproxy}-test: use ttcn3-docker-run too In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22823 ) Change subject: ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too ...................................................................... Patch Set 2: Verified+1 Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 Gerrit-Change-Number: 22823 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:06:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:05 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:05 +0000 Subject: Change in docker-playground[master]: ttcn3: remove /root/projects/git symlink In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22816 ) Change subject: ttcn3: remove /root/projects/git symlink ...................................................................... ttcn3: remove /root/projects/git symlink Remove leftover from old TTCN-3 build scripts, before refactoring ttcn3 Dockerfiles. This line has already been removed in 357ec806 from 2017 for ggsn-test. In osmo-ttcn3-hacks.git, this is only referenced in the obsolete bin/install.script (looks like we could remove that, together with the rest of the bin dir?). Related: OS#5017 Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 --- M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 16 files changed, 0 insertions(+), 16 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 9288469..8bdf87f 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index f927513..84928a7 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 29185c8..30704cf 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 2363f18..7b80504 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 9a92c4a..4e0c66f 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 0233035..78ff0ce 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 33183d0..9afef2e 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index ee7e5f0..db73c8e 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 76fd630..44424b3 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index b78fee2..2f3deff 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b1ea71f..3a2d14e 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index d9c3232..901200a 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index fcc2c02..9b1c540 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 9f1a6df..0828e08 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 1eb3b9d..3ffecb9 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index e6bb9d0..532da9f 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,7 +1,6 @@ ARG USER FROM $USER/debian-stretch-titan -RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id23e7fae58ba246916a38aa0a10035d4f67f7588 Gerrit-Change-Number: 22816 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:06 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:06 +0000 Subject: Change in docker-playground[master]: ttcn3: move initial clone to debian-stretch-titan In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22817 ) Change subject: ttcn3: move initial clone to debian-stretch-titan ...................................................................... ttcn3: move initial clone to debian-stretch-titan Clone the osmo-ttcn3-hacks and all dependency repositories less often by moving related commands to the shared debian-stretch-titan image. Remove the 'git checkout -f -B master origin/master' line, because the master branch is checked out by default. While at it, move the shared "git config" commands too, and move them before cloning the repositories, so they don't run again whenever the deps change (logic to invalidate the cache if deps change will be added in the next patch). Related: OS#5017 Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd --- M debian-stretch-titan/Dockerfile M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 18 files changed, 7 insertions(+), 161 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 74bc420..0f4f17e 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -48,3 +48,10 @@ dpkg -i ./libfftranscode0_0.3_${DPKG_ARCH}.deb ./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \ apt install --fix-broken && \ rm libfftranscode*.deb + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +# clone osmo-ttcn3-hacks and deps +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ + make -C /osmo-ttcn3-hacks deps diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 8bdf87f..c26247d 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 84928a7..dcf66d2 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 30704cf..48909aa 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 7b80504..3941895 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 4e0c66f..2acd103 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 7e88f28..1d53747 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 78ff0ce..20e1597 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 9afef2e..6580e92 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index db73c8e..bb04c10 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 44424b3..27a3e23 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2f3deff..c3606bb 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 3a2d14e..594dcb6 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 901200a..d906106 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 9b1c540..e3babb7 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 0828e08..5b3044c 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 3ffecb9..88a4dfc 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 532da9f..55ccf01 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker at dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd Gerrit-Change-Number: 22817 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:06 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:06 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: update deps on change In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22818 ) Change subject: debian-stretch-titan: update deps on change ...................................................................... debian-stretch-titan: update deps on change After the initial clone of osmo-ttcn3-hacks and deps, let docker download deps/Makefile to invalidate the cache if the file changed. Run "git pull" and "make deps" afterwards, but only if the Makefile is different. The "if" saves time in the initial build of the image, it avoids the "git fetch" on every dependency repository during "make deps". Related: OS#5017 Change-Id: I56673312cfb23375d67900016aaac1931f677275 --- M debian-stretch-titan/Dockerfile 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 0f4f17e..39ff76f 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -52,6 +52,12 @@ RUN git config --global user.email docker at dock.er && \ git config --global user.name "Dock Er" -# clone osmo-ttcn3-hacks and deps +# clone osmo-ttcn3-hacks and deps, invalidate cache if deps change (OS#5017) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ make -C /osmo-ttcn3-hacks deps +ADD https://git.osmocom.org/osmo-ttcn3-hacks/plain/deps/Makefile /tmp/deps-Makefile +RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ + cd /osmo-ttcn3-hacks && \ + git pull && \ + make deps; \ + fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56673312cfb23375d67900016aaac1931f677275 Gerrit-Change-Number: 22818 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:07 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:07 +0000 Subject: Change in docker-playground[master]: ttcn3: move prepare code to shared script In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22819 ) Change subject: ttcn3: move prepare code to shared script ...................................................................... ttcn3: move prepare code to shared script Move the git fetch/checkout code and make call to build the testsuite, to debian-stretch-titan/ttcn3-docker-prepare.sh. In the next patch, I will extend the script to update deps right before building too (e.g. because OSMO_TTCN3_BRANCH changed). Related: OS#5017 Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 --- M debian-stretch-titan/Dockerfile A debian-stretch-titan/ttcn3-docker-prepare.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 19 files changed, 47 insertions(+), 102 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved; Verified diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 39ff76f..daa0f8c 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -61,3 +61,5 @@ git pull && \ make deps; \ fi + +ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh new file mode 100755 index 0000000..d7363f5 --- /dev/null +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -0,0 +1,28 @@ +#!/bin/sh -e +if [ $# -lt 2 ]; then + echo + echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT ...]" + echo "arguments:" + echo " OSMO_TTCN3_BRANCH: as passed from docker" + echo " PROJECT: make target from osmo-ttcn3-hacks.git, e.g. 'msc'" + echo + exit 1 +fi + +set -x +OSMO_TTCN3_BRANCH=$1 +PROJECT=$2 + +cd /osmo-ttcn3-hacks + +git fetch +git checkout "$OSMO_TTCN3_BRANCH" + +if git symbolic-ref -q HEAD; then + git reset --hard origin/"$OSMO_TTCN3_BRANCH" +fi + +git rev-parse --abbrev-ref HEAD +git rev-parse HEAD + +make "$PROJECT" diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index c26247d..80d3384 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make bsc +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc VOLUME /data diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index dcf66d2..61f699d 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make bsc-nat +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat VOLUME /data diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 48909aa..685d99b 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make deps-update bts +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts VOLUME /data diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 3941895..dcee72d 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make fr fr-net +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net VOLUME /data diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 2acd103..c0a8841 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make gbproxy +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy VOLUME /data diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 1d53747..10683b6 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make ggsn_tests +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests VOLUME /data diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 20e1597..3d12234 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make deps-update hlr +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr VOLUME /data diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 6580e92..860a06a 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make mgw +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw VOLUME /data diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index bb04c10..93b3e0a 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make msc +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc VOLUME /data diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 27a3e23..4d0cf73 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sysinfo +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo VOLUME /data diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index c3606bb..6b2072c 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make pcu +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu VOLUME /data diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 594dcb6..b526206 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make deps-update remsim +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim VOLUME /data diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index d906106..b047ba7 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sccp +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp VOLUME /data diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index e3babb7..01bbce1 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sgsn +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn VOLUME /data diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 5b3044c..3e7b8f0 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make sip +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip VOLUME /data diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 88a4dfc..0205547 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make smlc +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc VOLUME /data diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 55ccf01..183c545 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -3,12 +3,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -RUN cd osmo-ttcn3-hacks && \ - git fetch && \ - git checkout $OSMO_TTCN3_BRANCH && \ - (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \ - git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ - make stp +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp VOLUME /data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9 Gerrit-Change-Number: 22819 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:07 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:07 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: run 'make deps' In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22820 ) Change subject: debian-stretch-titan: prepare: run 'make deps' ...................................................................... debian-stretch-titan: prepare: run 'make deps' Run 'make deps' in ttcn3-docker-prepare.sh, if needed. Related: OS#5017 Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 --- M debian-stretch-titan/ttcn3-docker-prepare.sh 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index d7363f5..2b3cbd7 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -25,4 +25,11 @@ git rev-parse --abbrev-ref HEAD git rev-parse HEAD +# Update deps if Makefile changed since last 'make deps' (e.g. because +# OSMO_TTCN3_BRANCH is different). The Dockerfile does the initial 'make deps' +# and downloads /tmp/deps-Makefile. +if ! diff -q /tmp/deps-Makefile deps/Makefile; then + make deps +fi + make "$PROJECT" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9085203b27d310b63a035fd71f7c2a78d02710d4 Gerrit-Change-Number: 22820 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:09 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:09 +0000 Subject: Change in docker-playground[master]: debian-stretch-titan: prepare: start/stop links In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22821 ) Change subject: debian-stretch-titan: prepare: start/stop links ...................................................................... debian-stretch-titan: prepare: start/stop links Create symlinks to ttcn3-*-start.sh and ttcn3-*-stop.sh in the prepare.sh script instead of in each of the ttcn3 Dockerfiles. Related: OS#5017 Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada --- M debian-stretch-titan/ttcn3-docker-prepare.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 5 insertions(+), 48 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index 2b3cbd7..a5cbc91 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -32,4 +32,9 @@ make deps fi +# Link start/stop scripts to / +for i in ttcn3-*-start.sh ttcn3-*-stop.sh; do + ln -sv "/osmo-ttcn3-hacks/$i" "/$i" +done + make "$PROJECT" diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 80d3384..c56f3a5 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BSC_Tests.cfg /data/BSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 61f699d..405c0a6 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 685d99b..4aa3825 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY BTS_Tests.cfg /data/BTS_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index dcee72d..1f0e6e1 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / - COPY FR_Tests.cfg /data/FR_Tests.cfg COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg COPY pipework /usr/bin/pipework diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index c0a8841..661ca07 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-dumpcap-stop.sh / - COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg COPY pipework /usr/bin/pipework COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 10683b6..e38e9d5 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 3d12234..b180567 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY HLR_Tests.cfg /data/HLR_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 860a06a..b05fa21 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY MGCP_Test.cfg /data/MGCP_Test.cfg CMD cd /data && \ diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 93b3e0a..06c07ca 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY MSC_Tests.cfg /data/MSC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 6b2072c..2c7d52f 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY PCU_Tests.cfg /data/PCU_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index b526206..c826d7c 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index b047ba7..3fc4ca3 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 01bbce1..2cc9778 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 3e7b8f0..4d138ce 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SIP_Tests.cfg /data/SIP_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 0205547..d2a081f 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg CMD cd /data && \ diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 183c545..0ae2c5e 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -7,9 +7,6 @@ VOLUME /data -RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ - ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / - COPY STP_Tests.cfg /data/STP_Tests.cfg CMD cd /data && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I634cf71cff7936efe6e0461d21dc1119de922ada Gerrit-Change-Number: 22821 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:10 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:10 +0000 Subject: Change in docker-playground[master]: ttcn3: move shared run code to script In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22822 ) Change subject: ttcn3: move shared run code to script ...................................................................... ttcn3: move shared run code to script While I'm at it with tidying up the Dockerfiles, create a ttcn3-docker-run.sh with shared run code. Related: OS#5017 Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 --- M debian-stretch-titan/Dockerfile A debian-stretch-titan/ttcn3-docker-run.sh M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 39 insertions(+), 75 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index daa0f8c..512b4ac 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -63,3 +63,4 @@ fi ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare +ADD ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-stretch-titan/ttcn3-docker-run.sh new file mode 100755 index 0000000..0cda8a5 --- /dev/null +++ b/debian-stretch-titan/ttcn3-docker-run.sh @@ -0,0 +1,23 @@ +#!/bin/sh +if [ $# -lt 2 ]; then + echo + echo "usage: ttcn3-docker-run SUBDIR SUITE" + echo "arguments:" + echo " SUBDIR: directory in osmo-ttcn3-hacks, e.g. 'msc'" + echo " SUITE: name of the testsuite, e.g. 'MSC_Tests'" + echo + exit 1 +fi + +set -x +SUBDIR=$1 +SUITE=$2 + +cd /data + +/osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE" +exit_code=$? + +/osmo-ttcn3-hacks/log_merge.sh "$SUITE" --rm + +exit $exit_code diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index c56f3a5..10b7267 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -9,8 +9,4 @@ COPY BSC_Tests.cfg /data/BSC_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run bsc BSC_Tests diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 405c0a6..d970482 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -9,8 +9,4 @@ COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh BSCNAT_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run bsc-nat BSCNAT_Tests diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 4aa3825..7abf1a9 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -9,8 +9,4 @@ COPY BTS_Tests.cfg /data/BTS_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run bts BTS_Tests diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index e38e9d5..e67dc9f 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -9,8 +9,4 @@ COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run ggsn_tests GGSN_Tests diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index b180567..36761a7 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -9,8 +9,4 @@ COPY HLR_Tests.cfg /data/HLR_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run hlr HLR_Tests diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index b05fa21..bd74f79 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -9,8 +9,4 @@ COPY MGCP_Test.cfg /data/MGCP_Test.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm; \ - exit $exit_code +CMD ttcn3-docker-run mgw MGCP_Test diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 06c07ca..8ce9828 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -9,8 +9,4 @@ COPY MSC_Tests.cfg /data/MSC_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run msc MSC_Tests diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 4d0cf73..026a465 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -9,8 +9,4 @@ COPY Test.cfg /data/Test.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh Test --rm; \ - exit $exit_code +CMD ttcn3-docker-run sysinfo Test diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2c7d52f..2a35db3 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -9,8 +9,4 @@ COPY PCU_Tests.cfg /data/PCU_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/pcu/PCU_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh PCU_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run pcu PCU_Tests diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index c826d7c..0391d0a 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -9,8 +9,4 @@ COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/remsim/REMSIM_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh REMSIM_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run remsim REMSIM_Tests diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 3fc4ca3..a818d8b 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -9,8 +9,4 @@ COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sccp/SCCP_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SCCP_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run sccp SCCP_Tests diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 2cc9778..2a2e66e 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -9,8 +9,4 @@ COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run sgsn SGSN_Tests diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 4d138ce..bce215a 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -9,8 +9,4 @@ COPY SIP_Tests.cfg /data/SIP_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sip/SIP_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run sip SIP_Tests diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index d2a081f..21d77a4 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -9,8 +9,4 @@ COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/smlc/SMLC_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh SMLC_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run smlc SMLC_Tests diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 0ae2c5e..073753b 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -9,8 +9,4 @@ COPY STP_Tests.cfg /data/STP_Tests.cfg -CMD cd /data && \ - /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/stp/STP_Tests; \ - exit_code=$?; \ - /osmo-ttcn3-hacks/log_merge.sh STP_Tests --rm; \ - exit $exit_code +CMD ttcn3-docker-run stp STP_Tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8 Gerrit-Change-Number: 22822 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:06:10 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:06:10 +0000 Subject: Change in docker-playground[master]: ttcn3-{fr, gbproxy}-test: use ttcn3-docker-run too In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22823 ) Change subject: ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too ...................................................................... ttcn3-{fr,gbproxy}-test: use ttcn3-docker-run too Move the shared pipework script to the base image, and call it in ttcn3-docker-run.sh if WAIT_FOR_NETDEV is set. Use ttcn3-docker-run.sh as entrypoint in both Dockerfiles and remove the custom entrypoint scripts (which are the same as ttcn3-docker-run.sh now). Related: OS#5017 Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 --- M debian-stretch-titan/Dockerfile R debian-stretch-titan/pipework M debian-stretch-titan/ttcn3-docker-run.sh M ttcn3-fr-test/Dockerfile D ttcn3-fr-test/docker-entrypoint.sh M ttcn3-gbproxy-test/Dockerfile D ttcn3-gbproxy-test/docker-entrypoint.sh D ttcn3-gbproxy-test/pipework 8 files changed, 7 insertions(+), 524 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 512b4ac..6a70d6c 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -64,3 +64,4 @@ ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare ADD ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run +ADD pipework /usr/local/bin/pipework diff --git a/ttcn3-fr-test/pipework b/debian-stretch-titan/pipework similarity index 100% rename from ttcn3-fr-test/pipework rename to debian-stretch-titan/pipework diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-stretch-titan/ttcn3-docker-run.sh index 0cda8a5..da3d314 100755 --- a/debian-stretch-titan/ttcn3-docker-run.sh +++ b/debian-stretch-titan/ttcn3-docker-run.sh @@ -13,6 +13,10 @@ SUBDIR=$1 SUITE=$2 +if [ -n "$WAIT_FOR_NETDEV" ]; then + pipework --wait -i "$WAIT_FOR_NETDEV" +fi + cd /data /osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE" diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 1f0e6e1..ae355d7 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -9,7 +9,5 @@ COPY FR_Tests.cfg /data/FR_Tests.cfg COPY FRNET_Tests.cfg /data/FRNET_Tests.cfg -COPY pipework /usr/bin/pipework -COPY docker-entrypoint.sh /docker-entrypoint.sh -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["ttcn3-docker-run"] diff --git a/ttcn3-fr-test/docker-entrypoint.sh b/ttcn3-fr-test/docker-entrypoint.sh deleted file mode 100755 index 132c73c..0000000 --- a/ttcn3-fr-test/docker-entrypoint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -eou pipefail - -SUBDIR=$1 -SUITE=$2 - -if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then - /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} -fi - -cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/$SUBDIR/$SUITE; \ -exit_code=$? - -/osmo-ttcn3-hacks/log_merge.sh $SUITE --rm - -exit $exit_code diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 661ca07..aee22ff 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -8,7 +8,5 @@ VOLUME /data COPY GBProxy_Tests.cfg /data/GBProxy_Tests.cfg -COPY pipework /usr/bin/pipework -COPY docker-entrypoint.sh /docker-entrypoint.sh -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["ttcn3-docker-run", "gbproxy", "GBProxy_Tests"] diff --git a/ttcn3-gbproxy-test/docker-entrypoint.sh b/ttcn3-gbproxy-test/docker-entrypoint.sh deleted file mode 100755 index cfdd898..0000000 --- a/ttcn3-gbproxy-test/docker-entrypoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eou pipefail - -if [[ -n ${WAIT_FOR_NETDEV:-} ]]; then - /usr/bin/pipework --wait -i ${WAIT_FOR_NETDEV} -fi - -cd /data && /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/gbproxy/GBProxy_Tests; \ -exit_code=$? - -/osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm - -exit $exit_code diff --git a/ttcn3-gbproxy-test/pipework b/ttcn3-gbproxy-test/pipework deleted file mode 100755 index 97ce66b..0000000 --- a/ttcn3-gbproxy-test/pipework +++ /dev/null @@ -1,489 +0,0 @@ -#!/bin/sh -# This code should (try to) follow Google's Shell Style Guide -# (https://google.github.io/styleguide/shell.xml) -set -e - -case "$1" in - --wait) - WAIT=1 - ;; - --direct-phys) - DIRECT_PHYS=1 - shift - ;; -esac - -IFNAME=$1 - -# default value set further down if not set here -CONTAINER_IFNAME= -if [ "$2" = "-i" ]; then - CONTAINER_IFNAME=$3 - shift 2 -fi - -if [ "$2" = "-l" ]; then - LOCAL_IFNAME=$3 - shift 2 -fi - -#inet or inet6 -FAMILY_FLAG="-4" -if [ "$2" = "-a" ]; then - FAMILY_FLAG="-$3" - shift 2 -fi - -GUESTNAME=$2 -IPADDR=$3 -MACADDR=$4 - -case "$MACADDR" in - *@*) - VLAN="${MACADDR#*@}" - VLAN="${VLAN%%@*}" - MACADDR="${MACADDR%%@*}" - ;; - *) - VLAN= - ;; -esac - -# did they ask to generate a custom MACADDR? -# generate the unique string -case "$MACADDR" in - U:*) - macunique="${MACADDR#*:}" - # now generate a 48-bit hash string from $macunique - MACADDR=$(echo $macunique|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/') - ;; -esac - - -[ "$IPADDR" ] || [ "$WAIT" ] || { - echo "Syntax:" - echo "pipework [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" - echo "pipework [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" - echo "pipework mac: [-i containerinterface] [-l localinterfacename] [-a addressfamily] /[@default_gateway] [macaddr][@vlan]" - echo "pipework mac: [-i containerinterface] [-l localinterfacename] dhcp [macaddr][@vlan]" - echo "pipework route " - echo "pipework rule " - echo "pipework tc " - echo "pipework --wait [-i containerinterface]" - exit 1 -} - -# Succeed if the given utility is installed. Fail otherwise. -# For explanations about `which` vs `type` vs `command`, see: -# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212 -# (Thanks to @chenhanxiao for pointing this out!) -installed () { - command -v "$1" >/dev/null 2>&1 -} - -# Google Styleguide says error messages should go to standard error. -warn () { - echo "$@" >&2 -} -die () { - status="$1" - shift - warn "$@" - exit "$status" -} - -if echo $IFNAME | grep -q '^mac:'; then - mac_address=$(echo $IFNAME | cut -c5-) - ifmatch= - for iftest in /sys/class/net/*; do - if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then - ifmatch="$(basename $iftest)" - break - fi - done - - if [ -z "$ifmatch" ]; then - die 1 "Mac address $mac_address specified for interface but no host interface matched." - else - IFNAME=$ifmatch - fi -fi - -# First step: determine type of first argument (bridge, physical interface...), -# Unless "--wait" is set (then skip the whole section) -if [ -z "$WAIT" ]; then - if [ -d "/sys/class/net/$IFNAME" ] - then - if [ -d "/sys/class/net/$IFNAME/bridge" ]; then - IFTYPE=bridge - BRTYPE=linux - elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then - IFTYPE=bridge - BRTYPE=openvswitch - elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 - IFTYPE=ipoib - # The IPoIB kernel module is fussy, set device name to ib0 if not overridden - CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} - PKEY=$VLAN - else IFTYPE=phys - fi - else - case "$IFNAME" in - br*) - IFTYPE=bridge - BRTYPE=linux - ;; - ovs*) - if ! installed ovs-vsctl; then - die 1 "Need OVS installed on the system to create an ovs bridge" - fi - IFTYPE=bridge - BRTYPE=openvswitch - ;; - route*) - IFTYPE=route - ;; - rule*) - IFTYPE=rule - ;; - tc*) - IFTYPE=tc - ;; - dummy*) - IFTYPE=dummy - ;; - *) die 1 "I do not know how to setup interface $IFNAME." ;; - esac - fi -fi - -# Set the default container interface name to eth1 if not already set -CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} - -[ "$WAIT" ] && { - while true; do - # This first method works even without `ip` or `ifconfig` installed, - # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. - grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break - # This method hopefully works on those older kernels. - ip link ls dev "$CONTAINER_IFNAME" && break - sleep 1 - done > /dev/null 2>&1 - exit 0 -} - -[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { - die 1 "VLAN configuration currently unsupported for Linux bridge." -} - -[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { - die 1 "MACADDR configuration unsupported for IPoIB interfaces." -} - -# Second step: find the guest (for now, we only support LXC containers) -while read _ mnt fstype options _; do - [ "$fstype" != "cgroup" ] && continue - echo "$options" | grep -qw devices || continue - CGROUPMNT=$mnt -done < /proc/mounts - -[ "$CGROUPMNT" ] || { - die 1 "Could not locate cgroup mount point." -} - -# Try to find a cgroup matching exactly the provided name. -M=$(find "$CGROUPMNT" -name "$GUESTNAME") -N=$(echo "$M" | wc -l) -if [ -z "$M" ] ; then - N=0 -fi -case "$N" in - 0) - # If we didn't find anything, try to lookup the container with Docker. - if installed docker; then - RETRIES=3 - while [ "$RETRIES" -gt 0 ]; do - DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") - DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") - DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") - - [ "$DOCKERPID" != 0 ] && break - sleep 1 - RETRIES=$((RETRIES - 1)) - done - - [ "$DOCKERPID" = 0 ] && { - die 1 "Docker inspect returned invalid PID 0" - } - - [ "$DOCKERPID" = "" ] && { - die 1 "Container $GUESTNAME not found, and unknown to Docker." - } - else - die 1 "Container $GUESTNAME not found, and Docker not installed." - fi - ;; - 1) true ;; - 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. - echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." - ;; - *) die 1 "Found more than one container matching $GUESTNAME." ;; -esac - -# only check IPADDR if we are not in a route mode -[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { - case "$IPADDR" in - # Let's check first if the user asked for DHCP allocation. - dhcp|dhcp:*) - # Use Docker-specific strategy to run the DHCP client - # from the busybox image, in the network namespace of - # the container. - if ! [ "$DOCKERPID" ]; then - warn "You asked for a Docker-specific DHCP method." - warn "However, $GUESTNAME doesn't seem to be a Docker container." - warn "Try to replace 'dhcp' with another option?" - die 1 "Aborting." - fi - DHCP_CLIENT=${IPADDR%%:*} - ;; - udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) - DHCP_CLIENT=${IPADDR%%:*} - # did they ask for the client to remain? - DHCP_FOREGROUND= - [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { - DHCP_FOREGROUND=true - } - DHCP_CLIENT=${DHCP_CLIENT%-f} - if ! installed "$DHCP_CLIENT"; then - die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." - fi - ;; - # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. - */*@*) - GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" - IPADDR="${IPADDR%%@*}" - ;; - # No gateway? We need at least a subnet, anyway! - */*) : ;; - # ... No? Then stop right here. - *) - warn "The IP address should include a netmask." - die 1 "Maybe you meant $IPADDR/24 ?" - ;; - esac -} - -# If a DHCP method was specified, extract the DHCP options. -if [ "$DHCP_CLIENT" ]; then - case "$IPADDR" in - *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; - esac -fi - -if [ "$DOCKERPID" ]; then - NSPID=$DOCKERPID -else - NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") - [ "$NSPID" ] || { - # it is an alternative way to get the pid - NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') - [ "$NSPID" ] || { - die 1 "Could not find a process inside container $GUESTNAME." - } - } -fi - -# Check if an incompatible VLAN device already exists -[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { - ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { - die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" - } -} - -[ ! -d /var/run/netns ] && mkdir -p /var/run/netns -rm -f "/var/run/netns/$NSPID" -ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" - -# Check if we need to create a bridge. -[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { - [ "$BRTYPE" = linux ] && { - (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") - ip link set "$IFNAME" up - } - [ "$BRTYPE" = openvswitch ] && { - ovs-vsctl add-br "$IFNAME" - } -} - -[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') - -# If it's a bridge, we need to create a veth pair -[ "$IFTYPE" = bridge ] && { - if [ -z "$LOCAL_IFNAME" ]; then - LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" - fi - GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" - # Does the link already exist? - if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then - # link exists, is it in use? - if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then - echo "Link $LOCAL_IFNAME exists and is up" - exit 1 - fi - # delete the link so we can re-add it afterwards - ip link del "$LOCAL_IFNAME" - fi - ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" - case "$BRTYPE" in - linux) - (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") - ;; - openvswitch) - if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then - ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ - -- set Interface "$LOCAL_IFNAME" \ - external-ids:pipework.interface="$LOCAL_IFNAME" \ - external-ids:pipework.bridge="$IFNAME" \ - ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ - ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ - ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ - ${VLAN:+external-ids:pipework.vlan="$VLAN"} - fi - ;; - esac - ip link set "$LOCAL_IFNAME" up -} - -# If it's a physical interface, create a macvlan subinterface -[ "$IFTYPE" = phys ] && { - [ "$VLAN" ] && { - [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { - ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" - } - ip link set "$IFNAME" up - IFNAME=$IFNAME.$VLAN - } - - if [ ! -z "$DIRECT_PHYS" ]; then - GUEST_IFNAME=$IFNAME - else - GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME - ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge - fi - - ip link set "$IFNAME" up -} - -# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB -# equivalent of a macvlan device) -# -# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an -# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of -# InfiniBand, without an intermediate Ethernet layer. -[ "$IFTYPE" = ipoib ] && { - GUEST_IFNAME="${IFNAME}.${NSPID}" - - # If a partition key is provided, use it - [ "$PKEY" ] && { - GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" - PKEY="pkey 0x$PKEY" - } - - ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY - ip link set "$IFNAME" up -} - -# If its a dummy interface, create a dummy interface. -[ "$IFTYPE" = dummy ] && { - GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME - ip link add dev "$GUEST_IFNAME" type dummy -} - -# If the `route` command was specified ... -if [ "$IFTYPE" = route ]; then - # ... discard the first two arguments and pass the rest to the route command. - shift 2 - ip netns exec "$NSPID" ip route "$@" -elif [ "$IFTYPE" = rule ] ; then - shift 2 - ip netns exec "$NSPID" ip rule "$@" -elif [ "$IFTYPE" = tc ] ; then - shift 2 - ip netns exec "$NSPID" tc "$@" -else - # Otherwise, run normally. - ip link set "$GUEST_IFNAME" netns "$NSPID" - ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" - [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" - - # When using any of the DHCP methods, we start a DHCP client in the - # network namespace of the container. With the 'dhcp' method, the - # client used is taken from the Docker busybox image (therefore - # requiring no specific client installed on the host). Other methods - # use a locally installed client. - case "$DHCP_CLIENT" in - dhcp) - docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \ - busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ - $DHCP_OPTIONS \ - >/dev/null - ;; - udhcpc) - DHCP_Q="-q" - [ "$DHCP_FOREGROUND" ] && { - DHCP_OPTIONS="$DHCP_OPTIONS -f" - } - ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ - -x "hostname:$GUESTNAME" \ - -p "/var/run/udhcpc.$GUESTNAME.pid" \ - $DHCP_OPTIONS - [ ! "$DHCP_FOREGROUND" ] && { - rm "/var/run/udhcpc.$GUESTNAME.pid" - } - ;; - dhclient) - ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ - -pf "/var/run/dhclient.$GUESTNAME.pid" \ - -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ - $DHCP_OPTIONS - # kill dhclient after get ip address to prevent device be used after container close - [ ! "$DHCP_FOREGROUND" ] && { - kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" - rm "/var/run/dhclient.$GUESTNAME.pid" - } - ;; - dhcpcd) - ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" - ;; - "") - if installed ipcalc; then - eval $(ipcalc -b $IPADDR) - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" - else - ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" - fi - - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true - } - ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up - [ "$GATEWAY" ] && { - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" - ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" - } - ;; - esac - - # Give our ARP neighbors a nudge about the new interface - if installed arping; then - IPADDR=$(echo "$IPADDR" | cut -d/ -f1) - ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true - else - echo "Warning: arping not found; interface may not be immediately reachable" - fi -fi -# Remove NSPID to avoid `ip netns` catch it. -rm -f "/var/run/netns/$NSPID" - -# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2889abe94ed522a205890e5cb39e09cbebfbd820 Gerrit-Change-Number: 22823 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:08:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 15:08:00 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix null pointer deref in error path References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22849 ) Change subject: ns2_fr: Fix null pointer deref in error path ...................................................................... ns2_fr: Fix null pointer deref in error path The followign happens if osmo-gbproxy is started without CAP_NET_RAW: <0026> gprs_ns2_fr.c:515 BIND(hdlcnet1) Can not create AF_PACKET socket. Are you root or have CAP_NET_RAW? gprs_ns2_fr.c:176:2: runtime error: member access within null pointer of type 'struct msgb' AddressSanitizer:DEADLYSIGNAL the second line is free_bind() iterating overr the backlog while destroying the not-yet-fully-initialized bind. Let's make sure the backlog llist_head is always initialized properly. Change-Id: I4d2fa50955c5897cd469fee68d4ddc65a9f5688f --- M src/gb/gprs_ns2_fr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22849/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 93b7759..2df5986 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -807,6 +807,7 @@ goto err_bind; } + INIT_LLIST_HEAD(&priv->backlog.list); OSMO_STRLCPY_ARRAY(priv->netif, netif); /* FIXME: move fd handling into socket.c */ @@ -836,7 +837,6 @@ rc = open_socket(priv->ifindex, bind); if (rc < 0) goto err_fr; - INIT_LLIST_HEAD(&priv->backlog.list); priv->backlog.retry_us = 2500; /* start with some non-zero value; this corrsponds to 496 bytes */ osmo_timer_setup(&priv->backlog.timer, fr_backlog_timer_cb, bind); osmo_fd_setup(&priv->backlog.ofd, rc, OSMO_FD_READ, fr_netif_ofd_cb, bind, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d2fa50955c5897cd469fee68d4ddc65a9f5688f Gerrit-Change-Number: 22849 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:08:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 15:08:01 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix heap-use-after-free in error recovery path References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22850 ) Change subject: ns2_fr: Fix heap-use-after-free in error recovery path ...................................................................... ns2_fr: Fix heap-use-after-free in error recovery path <0026> gprs_ns2_fr.c:515 BIND(hdlcnet1) Can not create AF_PACKET socket. Are you root or have CAP_NET_RAW? ================================================================= ==3872359==ERROR: AddressSanitizer: heap-use-after-free on address 0x6130000030c0 at pc 0x7fef120aa92e bp 0x7ffebf6b5c20 sp 0x7ffebf6b5c18 READ of size 8 at 0x6130000030c0 thread T0 #0 0x7fef120aa92d in osmo_fr_link_free (/usr/local/lib/libosmogb.so.11+0x16992d) #1 0x7fef1205105a in free_bind (/usr/local/lib/libosmogb.so.11+0x11005a) Change-Id: I23c0f1697edd5734085fa18b0a2f253c0f206c53 --- M src/gb/gprs_ns2_fr.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/22850/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 2df5986..7e6db2a 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -863,6 +863,7 @@ close(priv->backlog.ofd.fd); err_fr: osmo_fr_link_free(fr_link); + priv->link = NULL; err_bind: gprs_ns2_free_bind(bind); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c0f1697edd5734085fa18b0a2f253c0f206c53 Gerrit-Change-Number: 22850 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:23:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 15:23:51 +0000 Subject: Change in libosmo-sccp[master]: sua: per-ssn DUNA/DAVA notification In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 ) Change subject: sua: per-ssn DUNA/DAVA notification ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c at 278 PS1, Line 278: const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; > is this pointer properly aligned? Good question, this also looks suspicious to me. https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c at 313 PS1, Line 313: const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; Same here. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf Gerrit-Change-Number: 22833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 15:23:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:26:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 15:26:01 +0000 Subject: Change in libosmo-sccp[master]: sccp: more SCMG handling: SSA and SSP message handling In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 ) Change subject: sccp: more SCMG handling: SSA and SSP message handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I149166a25113f5d3e3536f9297bf89ff3139b9e3 Gerrit-Change-Number: 22834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:26:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:32:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 15:32:53 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix null pointer deref in error path In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22849 ) Change subject: ns2_fr: Fix null pointer deref in error path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d2fa50955c5897cd469fee68d4ddc65a9f5688f Gerrit-Change-Number: 22849 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:32:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:34:38 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:34:38 +0000 Subject: Change in osmo-ci[master]: jobs/registry-update-base-images: fix typos References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22851 ) Change subject: jobs/registry-update-base-images: fix typos ...................................................................... jobs/registry-update-base-images: fix typos Change-Id: Ifc6c85e638818113182802841c3e0e4a7e6cfda8 --- M jobs/registry-update-base-images.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/22851/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index e036799..48e8b59 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -7,10 +7,10 @@ - job: name: registry-update-base-images description: | - Update base docker images in our private reigstry.osmocom.org with those from docker.io + Update base docker images in our private registry.osmocom.org with those from docker.io Related:
node: osmocom-master-debian9 builders: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc6c85e638818113182802841c3e0e4a7e6cfda8 Gerrit-Change-Number: 22851 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:34:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 15:34:46 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix heap-use-after-free in error recovery path In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22850 ) Change subject: ns2_fr: Fix heap-use-after-free in error recovery path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c0f1697edd5734085fa18b0a2f253c0f206c53 Gerrit-Change-Number: 22850 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:34:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:35:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:35:03 +0000 Subject: Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: new job References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22852 ) Change subject: jobs/registry-rebuild-upload-titan: new job ...................................................................... jobs/registry-rebuild-upload-titan: new job Trigger for this job will be added in follow-up patch. Related: OS#5017 Change-Id: I2c4b264abf760894edb0788054fd987f9346b6ec --- A jobs/registry-rebuild-upload-titan.yml 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/22852/1 diff --git a/jobs/registry-rebuild-upload-titan.yml b/jobs/registry-rebuild-upload-titan.yml new file mode 100644 index 0000000..7e50aed --- /dev/null +++ b/jobs/registry-rebuild-upload-titan.yml @@ -0,0 +1,37 @@ + +--- +- project: + name: registry-rebuild-upload-titan + jobs: + - registry-rebuild-upload-titan + +- job: + name: registry-rebuild-upload-titan + description: | + Rebuild + push ttcn3 base images (debian-stretch-titan) in our private + registry.osmocom.org +

+ Related:
+ + node: osmocom-master-debian9 + scm: + - git: + url: git://git.osmocom.org/docker-playground + skip-tag: true + branches: + - 'origin/master' + + builders: + - shell: | + REGISTRY="registry.osmocom.org" + make -C debian-stretch-titan REGISTRY_HOST=$REGISTRY + docker push "$REGISTRY/$USER/debian-stretch-titan" + + publishers: + - email: + notify-every-unstable-build: true + recipients: 'jenkins-notifications at lists.osmocom.org' + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2c4b264abf760894edb0788054fd987f9346b6ec Gerrit-Change-Number: 22852 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:35:04 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:35:04 +0000 Subject: Change in osmo-ci[master]: jobs/registry-triggers: new jobs References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22853 ) Change subject: jobs/registry-triggers: new jobs ...................................................................... jobs/registry-triggers: new jobs Trigger rebuild and upload jobs for the Osmocom docker registry on changes in docker-playground.git and osmo-ttcn3-hacks.git. Related: OS#5017 Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 --- A jobs/registry-triggers.yml 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/53/22853/1 diff --git a/jobs/registry-triggers.yml b/jobs/registry-triggers.yml new file mode 100644 index 0000000..8fa68a3 --- /dev/null +++ b/jobs/registry-triggers.yml @@ -0,0 +1,36 @@ +- project: + name: registry-triggers + jobs: + - 'registry-trigger-{repos}' + repos: + - docker-playground: + trigger: > + registry-rebuild-upload-titan, + registry-rebuild-upload-fpga-build + - osmo-ttcn3-hacks: + # Cache is invalidated on changes in deps/Makefile (OS#5017) + trigger: > + registry-rebuild-upload-titan + +- job-template: + name: 'registry-trigger-{repos}' + description: | + Update registry.osmocom.org after changes in {repos}. + node: osmocom-master-debian9 + scm: + - git: + url: git://git.osmocom.org/{repos} + branches: + - 'origin/master' + trigger: + email: jenkins-notifications at lists.osmocom.org + triggers: + - pollscm: + cron: "H/5 * * * *" + ignore-post-commit-hooks: false + - timed: "H H * * *" + publishers: + - trigger: + project: '{obj:trigger}' + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 Gerrit-Change-Number: 22853 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:35:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:35:12 +0000 Subject: Change in docker-playground[master]: ttcn3: use REGISTRY arg with debian-stretch-titan References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22854 ) Change subject: ttcn3: use REGISTRY arg with debian-stretch-titan ...................................................................... ttcn3: use REGISTRY arg with debian-stretch-titan Allow jenkins to fetch the image from our private docker registry. Outside of jenkins, the image is built locally just like before. Related: OS#5017 Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c --- M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 34 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/54/22854/1 diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 10b7267..1923c38 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index d970482..50ca926 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 7abf1a9..8ac7cb8 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index ae355d7..4a70c12 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index aee22ff..71494d9 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index e67dc9f..d42ac3e 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 36761a7..8480288 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index bd74f79..087dc09 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 8ce9828..05610a4 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 026a465..45bf69e 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2a35db3..e42bca1 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 0391d0a..caa6da1 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index a818d8b..708a72f 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 2a2e66e..333b5ed 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index bce215a..1324ac0 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 21d77a4..5d27ceb 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 073753b..e36935b 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c Gerrit-Change-Number: 22854 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:38:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 15:38:53 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Move code filling struct to helper function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22826 ) Change subject: nacc_fsm: Move code filling struct to helper function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idfd4db8408f767b1847b04c88047a1c4996e543e Gerrit-Change-Number: 22826 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 15:38:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:44:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 15:44:54 +0000 Subject: Change in libosmo-sccp[master]: xua_snm: Implement handling of DUPU messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 ) Change subject: xua_snm: Implement handling of DUPU messages ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22835/1/src/sccp_scmg.c File src/sccp_scmg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22835/1/src/sccp_scmg.c at 142 PS1, Line 142: break; Looks like the 'default' is missing here? Without it this block does nothing. Wait, 'cause' is not used at all? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 Gerrit-Change-Number: 22835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 15:44:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:45:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 15:45:38 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22847 ) Change subject: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If420b49e437ff02073669522408763e5e84fe477 Gerrit-Change-Number: 22847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 15:45:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:48:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 15:48:11 +0000 Subject: Change in osmo-ci[master]: jobs/registry-update-base-images: fix typos In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22851 ) Change subject: jobs/registry-update-base-images: fix typos ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc6c85e638818113182802841c3e0e4a7e6cfda8 Gerrit-Change-Number: 22851 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:48:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:50:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:50:30 +0000 Subject: Change in osmo-ci[master]: jobs/registry-update-base-images: fix typos In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22851 ) Change subject: jobs/registry-update-base-images: fix typos ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc6c85e638818113182802841c3e0e4a7e6cfda8 Gerrit-Change-Number: 22851 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 15:50:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:50:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:50:33 +0000 Subject: Change in osmo-ci[master]: jobs/registry-update-base-images: fix typos In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22851 ) Change subject: jobs/registry-update-base-images: fix typos ...................................................................... jobs/registry-update-base-images: fix typos Change-Id: Ifc6c85e638818113182802841c3e0e4a7e6cfda8 --- M jobs/registry-update-base-images.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Verified diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index e036799..48e8b59 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -7,10 +7,10 @@ - job: name: registry-update-base-images description: | - Update base docker images in our private reigstry.osmocom.org with those from docker.io + Update base docker images in our private registry.osmocom.org with those from docker.io Related:
node: osmocom-master-debian9 builders: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc6c85e638818113182802841c3e0e4a7e6cfda8 Gerrit-Change-Number: 22851 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 15:54:22 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 15:54:22 +0000 Subject: Change in osmo-ci[master]: jobs/registry-triggers: new jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22853 ) Change subject: jobs/registry-triggers: new jobs ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22853/1/jobs/registry-triggers.yml File jobs/registry-triggers.yml: https://gerrit.osmocom.org/c/osmo-ci/+/22853/1/jobs/registry-triggers.yml at 6 PS1, Line 6: - docker-playground: I just realized, the docker-playground part is redundant. registry-rebuild-upload-titan and -fpga-build are already running if docker-playground.git changes. I'll update the patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 Gerrit-Change-Number: 22853 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Feb 2021 15:54:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 16:00:24 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 16:00:24 +0000 Subject: Change in osmo-ci[master]: jobs/registry-triggers: add for osmo-ttcn3-hacks In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/22853 ) Change subject: jobs/registry-triggers: add for osmo-ttcn3-hacks ...................................................................... jobs/registry-triggers: add for osmo-ttcn3-hacks Trigger registry-rebuild-upload-titan on changes in osmo-ttcn3-hacks.git. Write registry-triggers.yml with a job template, so we could add more triggers from git repos -> registry easily if needed in the future. Related: OS#5017 Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 --- A jobs/registry-triggers.yml 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/53/22853/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 Gerrit-Change-Number: 22853 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 16:00:42 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 16:00:42 +0000 Subject: Change in osmo-ci[master]: jobs/registry-triggers: add for osmo-ttcn3-hacks In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22853 ) Change subject: jobs/registry-triggers: add for osmo-ttcn3-hacks ...................................................................... Patch Set 2: Verified+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22853/1/jobs/registry-triggers.yml File jobs/registry-triggers.yml: https://gerrit.osmocom.org/c/osmo-ci/+/22853/1/jobs/registry-triggers.yml at 6 PS1, Line 6: - docker-playground: > I just realized, the docker-playground part is redundant. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 Gerrit-Change-Number: 22853 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Feb 2021 16:00:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 16:21:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 16:21:34 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... bts.adoc: describe ACCH repetition settings The manual currently does not mention ACCH repetition yet. Lets add some info on how to set up ACCH repetition correctly. Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Related: SYS#5114 --- M doc/manuals/chapters/bts.adoc 1 file changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/22855/1 diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 6e7a308..0adece1 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -511,6 +511,73 @@ <5> The rotate subset size parameter will be increased one ACC slot at a time: len=0 -> len=1 -> len=2 -> len=3 <6> The time until the subset size is further increased will be calculated based on current channel load +=== Configuring FACCH/SACCH repetition + +osmo-bts supports repetition of FACCH, uplink SACCH and downlink SACCH as +described in _3GPP TS 44.006_ <<3gpp-ts-44.006>>. When the feature is enabled +it is applied dynamically, depending on the rf signal quality and MS +capabilities. FACCH/SACCH repetition (or ACCH repetition) repeats the channel +block transmission two times. This allows the transceiver to combine the symbols +from two separate transmissions, which increases the probability that even a +weak signal can be decoded. + +Enabling ACCH repetition is especially recommended when using the AMR speech +codec. AMR already provides a forward error correction that is superior to +the forward error correction used with FACCH or SACCH. ACCH repetition is a +good way to even out this imbalance. + +The VTY configuration allows to enable repetition for all three channel types +separately. For FACCH the operator has the option to restrict the repetition +to LAPDM command frames only. Alternatively it is also possible to allow all +LAPDM frame types for repetition. The following example shows a typical +configuration where ACCH repetition is fully enabled. + +.Example typical configuration of ACCH repetition parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# repeat dl-facch all +OsmoBSC(config-net-bts)# repeat ul-sacch +OsmoBSC(config-net-bts)# repeat dl-sacch +OsmoBSC(config-net-bts)# repeat rxqual 4 +---- + +It should be noted that unless the repetition is enabled explicitly, the +repetition is turned off by default. If no threshold (see <>) is +set, the default value 4 (BER >= 1.6%) will be used. The following example shows +a minimal configuration where the repetition is only activated for FACCH LAPDM +command frames. + +.Example minimal configuration of ACCH repetition parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# repeat dl-facch command +---- + +Since it is not worthwhile to apply any repetition when the signal conditions +are good enough to ensure a reliable transmission in one round, the operator +has the option to set a threshold based on RXQUAL/BER at which the repetition +is switched on. The threshold mechanism implements a hysteresis to prevent +bouncing between repetition on and repetition off. Only when the signal quality +is increased again by two rxqual levels, the repetition is turned off again. It +is even possible to permanently enable repetition, regardless of the signal +quality. + +[[acch_rep_thr]] +.ACCH repetition thresholds +[%header,cols="20%,40%,40%"] +|=== +|rxqual |enable threshold |disable threshold +|0 |(repetition always on) |(repetition always on) +|1 |asciimath:[BER >= 0.2%] |asciimath:[BER = 0%] +|2 |asciimath:[BER >= 0.4%] |asciimath:[BER = 0%] +|3 |asciimath:[BER >= 0.8%] |asciimath:[BER <= 0.2%] +|4 |asciimath:[BER >= 1.6%] |asciimath:[BER <= 0.4%] +|5 |asciimath:[BER >= 3.2%] |asciimath:[BER <= 0.8%] +|6 |asciimath:[BER >= 6.4%] |asciimath:[BER <= 1.6%] +|7 |asciimath:[BER >= 12.8%] |asciimath:[BER <= 3.2%] +|=== + +NOTE: osmo-bsc only sets the ACCH repetition parameters via RSL. If ACCH +repetition can be used depends on the BTS model. + ==== RACH Parameter Configuration The following parameters allow control over how the MS can access the random -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:28:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:28:39 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix heap-use-after-free in error recovery path In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22850 ) Change subject: ns2_fr: Fix heap-use-after-free in error recovery path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c0f1697edd5734085fa18b0a2f253c0f206c53 Gerrit-Change-Number: 22850 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 17:28:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:28:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:28:41 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix null pointer deref in error path In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22849 ) Change subject: ns2_fr: Fix null pointer deref in error path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d2fa50955c5897cd469fee68d4ddc65a9f5688f Gerrit-Change-Number: 22849 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 17:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:28:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:28:44 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix null pointer deref in error path In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22849 ) Change subject: ns2_fr: Fix null pointer deref in error path ...................................................................... ns2_fr: Fix null pointer deref in error path The followign happens if osmo-gbproxy is started without CAP_NET_RAW: <0026> gprs_ns2_fr.c:515 BIND(hdlcnet1) Can not create AF_PACKET socket. Are you root or have CAP_NET_RAW? gprs_ns2_fr.c:176:2: runtime error: member access within null pointer of type 'struct msgb' AddressSanitizer:DEADLYSIGNAL the second line is free_bind() iterating overr the backlog while destroying the not-yet-fully-initialized bind. Let's make sure the backlog llist_head is always initialized properly. Change-Id: I4d2fa50955c5897cd469fee68d4ddc65a9f5688f --- M src/gb/gprs_ns2_fr.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 93b7759..2df5986 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -807,6 +807,7 @@ goto err_bind; } + INIT_LLIST_HEAD(&priv->backlog.list); OSMO_STRLCPY_ARRAY(priv->netif, netif); /* FIXME: move fd handling into socket.c */ @@ -836,7 +837,6 @@ rc = open_socket(priv->ifindex, bind); if (rc < 0) goto err_fr; - INIT_LLIST_HEAD(&priv->backlog.list); priv->backlog.retry_us = 2500; /* start with some non-zero value; this corrsponds to 496 bytes */ osmo_timer_setup(&priv->backlog.timer, fr_backlog_timer_cb, bind); osmo_fd_setup(&priv->backlog.ofd, rc, OSMO_FD_READ, fr_netif_ofd_cb, bind, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d2fa50955c5897cd469fee68d4ddc65a9f5688f Gerrit-Change-Number: 22849 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:28:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:28:44 +0000 Subject: Change in libosmocore[master]: ns2_fr: Fix heap-use-after-free in error recovery path In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22850 ) Change subject: ns2_fr: Fix heap-use-after-free in error recovery path ...................................................................... ns2_fr: Fix heap-use-after-free in error recovery path <0026> gprs_ns2_fr.c:515 BIND(hdlcnet1) Can not create AF_PACKET socket. Are you root or have CAP_NET_RAW? ================================================================= ==3872359==ERROR: AddressSanitizer: heap-use-after-free on address 0x6130000030c0 at pc 0x7fef120aa92e bp 0x7ffebf6b5c20 sp 0x7ffebf6b5c18 READ of size 8 at 0x6130000030c0 thread T0 #0 0x7fef120aa92d in osmo_fr_link_free (/usr/local/lib/libosmogb.so.11+0x16992d) #1 0x7fef1205105a in free_bind (/usr/local/lib/libosmogb.so.11+0x11005a) Change-Id: I23c0f1697edd5734085fa18b0a2f253c0f206c53 --- M src/gb/gprs_ns2_fr.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 2df5986..7e6db2a 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -863,6 +863,7 @@ close(priv->backlog.ofd.fd); err_fr: osmo_fr_link_free(fr_link); + priv->link = NULL; err_bind: gprs_ns2_free_bind(bind); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c0f1697edd5734085fa18b0a2f253c0f206c53 Gerrit-Change-Number: 22850 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:29:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:29:25 +0000 Subject: Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: new job In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22852 ) Change subject: jobs/registry-rebuild-upload-titan: new job ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2c4b264abf760894edb0788054fd987f9346b6ec Gerrit-Change-Number: 22852 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 17:29:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:32:40 +0000 Subject: Change in osmo-ci[master]: jobs/registry-triggers: add for osmo-ttcn3-hacks In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22853 ) Change subject: jobs/registry-triggers: add for osmo-ttcn3-hacks ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 Gerrit-Change-Number: 22853 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Feb 2021 17:32:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:34:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 17:34:07 +0000 Subject: Change in libosmo-sccp[master]: sua: per-ssn DUNA/DAVA notification In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 ) Change subject: sua: per-ssn DUNA/DAVA notification ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c at 278 PS1, Line 278: const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; > Good question, this also looks suspicious to me. I think everything in xUA protocols is always 32bit aligned, but I will double-check the RFCs -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf Gerrit-Change-Number: 22833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 17:34:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:45:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:45:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 to look at the new patch set (#2). Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans ...................................................................... pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans Tests verify MS retransmitting a Pkt cell Chg Notif with different target cell (hence a different NACC procedure) will be handled correctly if PCU state was in the middle of handling a different NACC request. Related: SYS#4909 Change-Id: I68c749aaabe9fe8272fc43045be09a46852359e5 --- M pcu/PCU_Tests.ttcn 1 file changed, 170 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/22842/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 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: I68c749aaabe9fe8272fc43045be09a46852359e5 Gerrit-Change-Number: 22842 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:45:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:45:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements ...................................................................... pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements Change-Id: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 111 insertions(+), 73 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/22856/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 34b7e79..e59c18d 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -533,6 +533,17 @@ } } +altstep as_ms_rx_fail_dummy(inout GprsMS ms, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var BTS_PDTCH_Block data_msg; + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + setverdict(fail, "Unexpected Dummy Ctrl block ", data_msg); + f_shutdown(__BFILE__, __LINE__); + } +} + altstep as_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, template RlcmacDlBlock t_pkt_ass := ?, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, @@ -807,6 +818,101 @@ BTS.send(pcu_msg_cnf); } + +altstep as_ms_rx_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, + inout uint5_t exp_container_idx /* := 0 */, + inout integer si_offset /* := 0 */, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var integer len; + var octetstring exp_si_chunk; + var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + var BTS_PDTCH_Block data_msg; + var boolean do_repeat := true; + + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_NEIGH_CELL_DATA(gtfi, exp_container_idx)) + )) -> value data_msg { + + var PacketNeighbourCellData neigh_data := data_msg.dl_block.ctrl.payload.u.neighbour_cell_data; + var PacketNeighbourCellDataContainer cont := neigh_data.container_list[0]; + + if (cont.cd_length == 31) { /* continues on next message */ + len := lengthof(cont.container_data); + exp_si_chunk := substr(exp_si, si_offset, len); + if (cont.container_data != exp_si_chunk) { + setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", + cont.container_data, " vs exp ", exp_si_chunk); + f_shutdown(__BFILE__, __LINE__); + } + si_offset := si_offset + len; + } else if (cont.cd_length == 0) { + /* we are done */ + if (si_offset != lengthof(exp_si)) { + setverdict(fail, "Rx unexpectd SI length ", si_offset, + " vs exp ", lengthof(exp_si)); + f_shutdown(__BFILE__, __LINE__); + } + do_repeat := false; + } else { /* data length, last message */ + len := cont.cd_length; + exp_si_chunk := substr(exp_si, si_offset, len); + if (cont.container_data != exp_si_chunk) { + setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", + cont.container_data, " vs exp ", exp_si_chunk); + f_shutdown(__BFILE__, __LINE__); + } + si_offset := si_offset + len; + /* we are done */ + if (si_offset != lengthof(exp_si)) { + setverdict(fail, "Rx unexpectd SI length ", si_offset, + " vs exp ", lengthof(exp_si)); + f_shutdown(__BFILE__, __LINE__); + } + do_repeat := false; + } + + exp_container_idx := exp_container_idx + 1; + + if (do_repeat) { + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + } +} + +/* Handle groups of PKT NEIGHBOUR CELL DATA packets */ +function f_ms_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si) +runs on MS_BTS_IFACE_CT { + var uint5_t exp_container_idx := 0; + var integer si_offset := 0; + var BTS_PDTCH_Block data_msg; + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum; + + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + alt { + [exp_container_idx == 0] as_ms_rx_ignore_dummy(ms, nr); + [exp_container_idx > 0] as_ms_rx_fail_dummy(ms, nr); + [] as_ms_rx_pkt_neighbor_cell_data(ms, exp_si, exp_container_idx, si_offset, nr); + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DL_CTRL(?, ?) + )) -> value data_msg { + var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + setverdict(fail, "Rx unexpected DL block: ", data_msg.dl_block, " vs exp ", + tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_NEIGH_CELL_DATA(gtfi, exp_container_idx))); + f_shutdown(__BFILE__, __LINE__); + } + }; + + return; +} + //////////////////////// // Low level APIs //////////////////////// diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index cd7a4ec..a937bf4 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3544,74 +3544,6 @@ return dl_block; } -/* Handle groups of PKT NEIGHBOUR CELL DATA packets */ -private function f_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si) -runs on RAW_PCU_Test_CT { - var RlcmacDlBlock dl_block; - var uint32_t sched_fn; - var integer i := 0; - var uint5_t exp_container_idx := 0; - var integer si_offset := 0; - var integer len; - var octetstring exp_si_chunk; - var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; - - dl_block := f_skip_dummy(50, sched_fn); - - while (true) { - var template RlcmacDlCtrlMsg exp_msg; exp_msg := - tr_RlcMacDlCtrl_PKT_NEIGH_CELL_DATA(gtfi, exp_container_idx); - - /* Make sure last Dl block is a Pkt Neighbour Cell Data */ - if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, exp_msg))) { - setverdict(fail, "Rx unexpected DL block: ", dl_block, " vs exp ", tr_RLCMAC_DL_CTRL(?, exp_msg)); - f_shutdown(__BFILE__, __LINE__); - } - var PacketNeighbourCellData neigh_data := dl_block.ctrl.payload.u.neighbour_cell_data; - var PacketNeighbourCellDataContainer cont := neigh_data.container_list[0]; - - if (cont.cd_length == 31) { /* continues on next message */ - len := lengthof(cont.container_data); - exp_si_chunk := substr(exp_si, si_offset, len); - if (cont.container_data != exp_si_chunk) { - setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", - cont.container_data, " vs exp ", exp_si_chunk); - f_shutdown(__BFILE__, __LINE__); - } - si_offset := si_offset + len; - } else if (cont.cd_length == 0) { - /* we are done */ - if (si_offset != lengthof(exp_si)) { - setverdict(fail, "Rx unexpectd SI length ", si_offset, - " vs exp ", lengthof(exp_si)); - f_shutdown(__BFILE__, __LINE__); - } - break; - } else { /* data length, last message */ - len := cont.cd_length; - exp_si_chunk := substr(exp_si, si_offset, len); - if (cont.container_data != exp_si_chunk) { - setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", - cont.container_data, " vs exp ", exp_si_chunk); - f_shutdown(__BFILE__, __LINE__); - return; - } - si_offset := si_offset + len; - /* we are done */ - if (si_offset != lengthof(exp_si)) { - setverdict(fail, "Rx unexpectd SI length ", si_offset, - " vs exp ", lengthof(exp_si)); - f_shutdown(__BFILE__, __LINE__); - } - break; - } - - exp_container_idx := exp_container_idx + 1; - f_rx_rlcmac_dl_block(dl_block, sched_fn); - } - return; -} - private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) runs on RAW_PCU_Test_CT { var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), @@ -3693,7 +3625,7 @@ } /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4213,7 +4145,7 @@ } /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4296,7 +4228,7 @@ } /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4379,7 +4311,7 @@ as_outbound_nacc_rim_resolve(info_ind); /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4464,7 +4396,7 @@ as_outbound_nacc_rim_resolve(info_ind); /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 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: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:45:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:45:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* These tests verify retransmission of duplicated Pkt Cell Change Notification messages are ignored once the NACC procedure is already ongoig. Related: SYS#4909 Change-Id: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 223 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/22857/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index e59c18d..34406b9 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -822,7 +822,8 @@ altstep as_ms_rx_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, inout uint5_t exp_container_idx /* := 0 */, inout integer si_offset /* := 0 */, - template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, + boolean single_step := false) runs on MS_BTS_IFACE_CT { var integer len; var octetstring exp_si_chunk; @@ -874,7 +875,7 @@ exp_container_idx := exp_container_idx + 1; - if (do_repeat) { + if (not single_step and do_repeat) { BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), @@ -885,12 +886,13 @@ } /* Handle groups of PKT NEIGHBOUR CELL DATA packets */ -function f_ms_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si) +function f_ms_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, + uint5_t exp_container_idx := 0, + integer si_offset := 0, + boolean single_step := false) runs on MS_BTS_IFACE_CT { - var uint5_t exp_container_idx := 0; - var integer si_offset := 0; var BTS_PDTCH_Block data_msg; - template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum; BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -899,7 +901,7 @@ alt { [exp_container_idx == 0] as_ms_rx_ignore_dummy(ms, nr); [exp_container_idx > 0] as_ms_rx_fail_dummy(ms, nr); - [] as_ms_rx_pkt_neighbor_cell_data(ms, exp_si, exp_container_idx, si_offset, nr); + [] as_ms_rx_pkt_neighbor_cell_data(ms, exp_si, exp_container_idx, si_offset, nr, single_step); [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DL_CTRL(?, ?) )) -> value data_msg { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a937bf4..2b6c17f 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4245,6 +4245,217 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while sending Pkt Neigh Data Change */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup3() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Receive first Pkt Neigh data Change, then trigger a new Pkt Cell Change Notif: */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, single_step := true); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* It should be ignored, let's continue fetching Pkt Neigh Data Change */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, f_ms_tx_TsTrxBtsNum(ms), 1, 16); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while sending Pkt Cell Change Continue */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup4() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* trigger a dup Pkt Cell Change Notif, it should be ignored: */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while waiting for Pkt Cell Change Continue CTRL ACK */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup5() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* trigger a dup Pkt Cell Change Notif, it should be ignored: */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + /* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) * while waiting for CTRL resolution */ testcase TC_nacc_outbound_pkt_cell_chg_notif_twice() runs on RAW_PCU_Test_CT { @@ -4642,6 +4853,9 @@ execute( TC_nacc_outbound_si_resolve_timeout() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup2() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup3() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup4() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup5() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice2() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:45:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:45:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* ...................................................................... pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* These tests verify the NACC FSM adapts to MS restarting the NACC procedure at any point when it selects for another tgt cell. Related: SYS#4909 Change-Id: I42908a00f8d076e3559efde298a739d6b26d090e --- M pcu/PCU_Tests.ttcn 1 file changed, 269 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/22858/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 2b6c17f..4699d3e 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4624,6 +4624,272 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) + * while sending Pkt Neigh Data Change */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice3() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Receive first Pkt Neigh data Change, then trigger a new Pkt Cell Change Notif (different ARFCN+BSIC): */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, single_step := true); + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* It should trigger RAC_CI resolution to start again: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + /* Transmit SI back to MS */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (different tgt cell) while sending Pkt Cell Change Continue */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice4() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* trigger a Pkt Cell Change Notif with different tgt cell */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* PCU TBF NACC state changed, so we should next receive a dummy block: */ + f_rx_rlcmac_dl_block_exp_dummy(dl_block, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* It should trigger RAC_CI resolution to start again: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + /* Transmit SI back to MS */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (different tgt cell) while waiting for Pkt Cell Change Continue CTRL ACK*/ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice5() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + + /* trigger a Pkt Cell Change Notif with different tgt cell */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + /* PCU TBF NACC state changed, so we should next receive a dummy block: */ + f_rx_rlcmac_dl_block_exp_dummy(dl_block); + + /* It should trigger RAC_CI resolution to start again: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + /* Transmit SI back to MS */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -4858,6 +5124,9 @@ execute( TC_nacc_outbound_pkt_cell_chg_notif_dup5() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice2() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice3() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice4() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice5() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 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: I42908a00f8d076e3559efde298a739d6b26d090e Gerrit-Change-Number: 22858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:48:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:48:59 +0000 Subject: Change in osmo-pcu[master]: WIP: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some adv... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22859 ) Change subject: WIP: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states ...................................................................... WIP: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states Related: SYS#4909 Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 --- M src/nacc_fsm.c 1 file changed, 31 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/22859/1 diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 5bc9c12..3afa8b5 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -321,7 +321,8 @@ if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) { LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", notif->Target_Cell.UnionType); - nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); + if (ctx->fi->state != NACC_ST_TX_CELL_CHG_CONTINUE) + nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; } /* If tgt cell changed, restart resolving it */ @@ -520,19 +521,29 @@ } } -/* st_tx_neighbour_data_on_enter: - * At this point, we already received all required SI information to send stored +/* At this point, we already received all required SI information to send stored * in struct nacc_fsm_ctx. We now wait for scheduler to ask us to construct * RLCMAC DL CTRL messages to move FSM states forward */ +static void st_tx_neighbour_data_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + ctx->si_info_bytes_sent = 0; + ctx->container_idx = 0; +} static void st_tx_neighbour_data(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; struct nacc_ev_create_rlcmac_msg_ctx *data_ctx; bool all_si_info_sent; switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_CREATE_RLCMAC_MSG: data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data; data_ctx->msg = create_packet_neighbour_cell_data(ctx, data_ctx->tbf, &all_si_info_sent); @@ -557,9 +568,14 @@ static void st_cell_chg_continue(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; struct nacc_ev_create_rlcmac_msg_ctx *data_ctx; switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_CREATE_RLCMAC_MSG: data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data; data_ctx->msg = create_packet_cell_chg_continue(ctx, data_ctx, &ctx->continue_poll_fn); @@ -575,7 +591,14 @@ static void st_wait_cell_chg_continue_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; + switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_TIMEOUT_CELL_CHG_CONTINUE: nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); break; @@ -656,8 +679,10 @@ X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_TX_CELL_CHG_CONTINUE), .name = "TX_NEIGHBOUR_DATA", + .onenter = st_tx_neighbour_data_on_enter, .action = st_tx_neighbour_data, }, [NACC_ST_TX_CELL_CHG_CONTINUE] = { @@ -665,15 +690,18 @@ X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK), .name = "TX_CELL_CHG_CONTINUE", .action = st_cell_chg_continue, }, [NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK] = { .in_event_mask = + X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_RX_CELL_CHG_CONTINUE_ACK) | X(NACC_EV_TIMEOUT_CELL_CHG_CONTINUE), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_TX_CELL_CHG_CONTINUE) | X(NACC_ST_DONE), .name = "WAIT_CELL_CHG_CONTINUE_ACK", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 Gerrit-Change-Number: 22859 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:49:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:49:12 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced... In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/22859 ) Change subject: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states ...................................................................... nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states Related: SYS#4909 Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 --- M src/nacc_fsm.c 1 file changed, 31 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/22859/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 Gerrit-Change-Number: 22859 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:49:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:49:29 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESO... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22827 ) Change subject: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2ed2580bbbdd6d3464833257b0dcb8ec6f8d699 Gerrit-Change-Number: 22827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 17:49:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:49:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:49:32 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22828 ) Change subject: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 Gerrit-Change-Number: 22828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 11 Feb 2021 17:49:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:49:37 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22847 ) Change subject: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If420b49e437ff02073669522408763e5e84fe477 Gerrit-Change-Number: 22847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 17:49:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:49:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:49:42 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Move code filling struct to helper function In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22826 ) Change subject: nacc_fsm: Move code filling struct to helper function ...................................................................... nacc_fsm: Move code filling struct to helper function Same filler will be needed in different places since that message can arrive at different points of time (different states). It also helps supporting newer key types in the future. Change-Id: Idfd4db8408f767b1847b04c88047a1c4996e543e --- M src/nacc_fsm.c 1 file changed, 19 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 6a92f83..f9dea98 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -268,6 +268,22 @@ return 0; } +static int fill_neigh_key_from_bts_pkt_cell_chg_not(struct neigh_cache_entry_key *neigh_key, + const struct gprs_rlcmac_bts *bts, + const Packet_Cell_Change_Notification_t *notif) +{ + switch (notif->Target_Cell.UnionType) { + case 0: /* GSM */ + neigh_key->local_lac = bts->cgi_ps.rai.lac.lac; + neigh_key->local_ci = bts->cgi_ps.cell_identity; + neigh_key->tgt_arfcn = notif->Target_Cell.u.Target_Cell_GSM_Notif.ARFCN; + neigh_key->tgt_bsic = notif->Target_Cell.u.Target_Cell_GSM_Notif.BSIC; + return 0; + default: + return -ENOTSUP; + } +} + #define SI_HDR_LEN 2 static void bts_fill_si_cache_value(const struct gprs_rlcmac_bts *bts, struct si_cache_value *val) { @@ -303,19 +319,12 @@ switch (event) { case NACC_EV_RX_CELL_CHG_NOTIFICATION: notif = (Packet_Cell_Change_Notification_t *)data; - switch (notif->Target_Cell.UnionType) { - case 0: /* GSM */ - ctx->neigh_key.local_lac = bts->cgi_ps.rai.lac.lac; - ctx->neigh_key.local_ci = bts->cgi_ps.cell_identity; - ctx->neigh_key.tgt_arfcn = notif->Target_Cell.u.Target_Cell_GSM_Notif.ARFCN; - ctx->neigh_key.tgt_bsic = notif->Target_Cell.u.Target_Cell_GSM_Notif.BSIC; - nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); - break; - default: + if (fill_neigh_key_from_bts_pkt_cell_chg_not(&ctx->neigh_key, bts, notif) < 0) { LOGPFSML(fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", notif->Target_Cell.UnionType); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); - return; + } else { + nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); } break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idfd4db8408f767b1847b04c88047a1c4996e543e Gerrit-Change-Number: 22826 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 17:49:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 17:49:42 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22847 ) Change subject: nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states ...................................................................... nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states We don't care about those messages anymore if we already transitioned further than NACC_ST_WAIT_REQUEST_SI. Furthermore, RIM code dispatching the event to the FSM is only doing it in the mentioned state above. Related: SYS#4909 Change-Id: If420b49e437ff02073669522408763e5e84fe477 --- M src/nacc_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index f9dea98..99c8164 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -610,7 +610,6 @@ [NACC_ST_TX_NEIGHBOUR_DATA] = { .in_event_mask = X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | - X(NACC_EV_RX_SI) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = X(NACC_ST_TX_CELL_CHG_CONTINUE), @@ -620,7 +619,6 @@ [NACC_ST_TX_CELL_CHG_CONTINUE] = { .in_event_mask = X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | - X(NACC_EV_RX_SI) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = X(NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If420b49e437ff02073669522408763e5e84fe477 Gerrit-Change-Number: 22847 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:03:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 18:03:33 +0000 Subject: Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: new job In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22852 ) Change subject: jobs/registry-rebuild-upload-titan: new job ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2c4b264abf760894edb0788054fd987f9346b6ec Gerrit-Change-Number: 22852 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 11 Feb 2021 18:03:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:03:38 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 18:03:38 +0000 Subject: Change in osmo-ci[master]: jobs/registry-rebuild-upload-titan: new job In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22852 ) Change subject: jobs/registry-rebuild-upload-titan: new job ...................................................................... jobs/registry-rebuild-upload-titan: new job Trigger for this job will be added in follow-up patch. Related: OS#5017 Change-Id: I2c4b264abf760894edb0788054fd987f9346b6ec --- A jobs/registry-rebuild-upload-titan.yml 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/jobs/registry-rebuild-upload-titan.yml b/jobs/registry-rebuild-upload-titan.yml new file mode 100644 index 0000000..7e50aed --- /dev/null +++ b/jobs/registry-rebuild-upload-titan.yml @@ -0,0 +1,37 @@ + +--- +- project: + name: registry-rebuild-upload-titan + jobs: + - registry-rebuild-upload-titan + +- job: + name: registry-rebuild-upload-titan + description: | + Rebuild + push ttcn3 base images (debian-stretch-titan) in our private + registry.osmocom.org +

+ Related:
+ + node: osmocom-master-debian9 + scm: + - git: + url: git://git.osmocom.org/docker-playground + skip-tag: true + branches: + - 'origin/master' + + builders: + - shell: | + REGISTRY="registry.osmocom.org" + make -C debian-stretch-titan REGISTRY_HOST=$REGISTRY + docker push "$REGISTRY/$USER/debian-stretch-titan" + + publishers: + - email: + notify-every-unstable-build: true + recipients: 'jenkins-notifications at lists.osmocom.org' + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2c4b264abf760894edb0788054fd987f9346b6ec Gerrit-Change-Number: 22852 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:03:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 11 Feb 2021 18:03:39 +0000 Subject: Change in osmo-ci[master]: jobs/registry-triggers: add for osmo-ttcn3-hacks In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22853 ) Change subject: jobs/registry-triggers: add for osmo-ttcn3-hacks ...................................................................... jobs/registry-triggers: add for osmo-ttcn3-hacks Trigger registry-rebuild-upload-titan on changes in osmo-ttcn3-hacks.git. Write registry-triggers.yml with a job template, so we could add more triggers from git repos -> registry easily if needed in the future. Related: OS#5017 Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 --- A jobs/registry-triggers.yml 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/jobs/registry-triggers.yml b/jobs/registry-triggers.yml new file mode 100644 index 0000000..0763496 --- /dev/null +++ b/jobs/registry-triggers.yml @@ -0,0 +1,32 @@ +- project: + name: registry-triggers + jobs: + - 'registry-trigger-{repos}' + repos: + - osmo-ttcn3-hacks: + # Cache is invalidated on changes in deps/Makefile (OS#5017) + trigger: > + registry-rebuild-upload-titan + +- job-template: + name: 'registry-trigger-{repos}' + description: | + Update registry.osmocom.org after changes in {repos}. + node: osmocom-master-debian9 + scm: + - git: + url: git://git.osmocom.org/{repos} + branches: + - 'origin/master' + trigger: + email: jenkins-notifications at lists.osmocom.org + triggers: + - pollscm: + cron: "H/5 * * * *" + ignore-post-commit-hooks: false + - timed: "H H * * *" + publishers: + - trigger: + project: '{obj:trigger}' + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib6a27be6351ce821c7023a1f75a82b1ade2ffa49 Gerrit-Change-Number: 22853 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:04:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 18:04:10 +0000 Subject: Change in libosmo-sccp[master]: sua: per-ssn DUNA/DAVA notification In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 ) Change subject: sua: per-ssn DUNA/DAVA notification ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22833/1/src/xua_snm.c at 313 PS1, Line 313: const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; > Same here. it's not any worse than xua_msg_part_get_u32() which we use all the time in this codebase. So We always had the assumption that those IEs are aligned at 32bit boundaries. For sure inside XUA everything is 32bit aligned, as the tag and length values are 16bit themselves (header == 32bit) and they are always padded to 32bit. The message header also is 32bit. Howver, the interesting questin is whether we can make the assumption that the start of the message is aligned with the natural alignment boundary of the underlying architecture. As the M3UA header starts at the beginning of what we get returned from the read/recv/recvmsg/... call on the socket, it's actually up to us what kind of buffer we pass. As long as msgb_alloc_headroom() will result in msgb->data being 32bit aligned, we are good. As 'struct msgb' is not __attribute__((packed), I would expect that the unsignd char _data[0] is properly aligned. So in the end, I think we're good. One could consider adding a related check or even an assert into the library, but that's out of the scope of this change. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf Gerrit-Change-Number: 22833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 18:04:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 18:04:28 +0000 Subject: Change in libosmo-sccp[master]: xua: introduce xua_msg_get_u32p() helper In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 ) Change subject: xua: introduce xua_msg_get_u32p() helper ...................................................................... xua: introduce xua_msg_get_u32p() helper Change-Id: Id7780074b82bc668ae148456750b1a01799decd1 --- M include/osmocom/sigtran/xua_msg.h M src/xua_msg.c 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/sigtran/xua_msg.h b/include/osmocom/sigtran/xua_msg.h index 329ba96..11bce6f 100644 --- a/include/osmocom/sigtran/xua_msg.h +++ b/include/osmocom/sigtran/xua_msg.h @@ -91,6 +91,7 @@ int xua_msg_add_u32(struct xua_msg *xua, uint16_t iei, uint32_t val); uint32_t xua_msg_part_get_u32(const struct xua_msg_part *part); uint32_t xua_msg_get_u32(const struct xua_msg *xua, uint16_t iei); +const uint32_t *xua_msg_get_u32p(const struct xua_msg *xua, uint16_t iei, uint32_t *out); const char *xua_msg_part_get_str(const struct xua_msg_part *part); const char *xua_msg_get_str(const struct xua_msg *xua, uint16_t iei); void xua_part_add_gt(struct msgb *msg, const struct osmo_sccp_gt *gt); diff --git a/src/xua_msg.c b/src/xua_msg.c index 42c580d..1df9abd 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -297,6 +297,16 @@ return xua_msg_part_get_u32(part); } +/* get a U32 IE in host-byte-order, returning whether it exists (!= NULL) or not (== NULL) */ +const uint32_t *xua_msg_get_u32p(const struct xua_msg *xua, uint16_t iei, uint32_t *out) +{ + struct xua_msg_part *part = xua_msg_find_tag(xua, iei); + if (!part) + return NULL; + *out = xua_msg_part_get_u32(part); + return out; +} + const char *xua_msg_part_get_str(const struct xua_msg_part *part) { static char __thread buf[256]; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id7780074b82bc668ae148456750b1a01799decd1 Gerrit-Change-Number: 22832 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 18:04:28 +0000 Subject: Change in libosmo-sccp[master]: sua: per-ssn DUNA/DAVA notification In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 ) Change subject: sua: per-ssn DUNA/DAVA notification ...................................................................... sua: per-ssn DUNA/DAVA notification Unlike M3UA, in SUA a DUNA/DAVA message can contain not just the point code that became available / unavailable, but it can also include a SSN. In that case, it is just the SSN that became available/unavailable, and not the entire point code. Hence, a N-STATE.ind and not a N-PCSTATE.ind must be delivered to the SCCP user. Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf --- M src/sccp_internal.h M src/sccp_scmg.c M src/xua_snm.c 3 files changed, 120 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 6bd2af9..a95b07d 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -137,6 +137,8 @@ const struct osmo_scu_state_param *state); /* SCCP Management (SCMG) */ +void sccp_scmg_rx_ssn_allowed(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi); +void sccp_scmg_rx_ssn_prohibited(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi); void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); int sccp_scmg_init(struct osmo_sccp_instance *inst); diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 0e3905d..ed16fe7 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -36,6 +36,45 @@ #include "xua_internal.h" #include "sccp_internal.h" +/* ITU-T Q.714 5.3.3 Subsystem allowed */ +void sccp_scmg_rx_ssn_allowed(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi) +{ + struct osmo_scu_state_param state; + /* 1) Instruct the translation function to update the translation tables */ + /* 2) Mark as "allowed" the status of that subsystem. */ + /* 3) Initiate a local broadcast of "User-in-service" information for the allowed subsystem */ + state = (struct osmo_scu_state_param) { + .affected_pc = dpc, + .affected_ssn = ssn, + .user_in_service = true, + .ssn_multiplicity_ind = smi, + }; + sccp_lbcs_local_bcast_state(inst, &state); + /* 4) Discontinue the subsystem status test if such a test was in progress */ + /* 5) Initiate a broadcast of Subsystem-Allowed messages to concerned signalling points. */ +} + +/* ITU-T Q.714 5.3.2 Subsystem prohibited */ +void sccp_scmg_rx_ssn_prohibited(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi) +{ + struct osmo_scu_state_param state; + /* 1) instruct the translation function to update the translation tables */ + /* 2) mark as "prohibited" the status of that subsystem */ + /* 3) initiate a local broadcast of "User-out-of-service" information */ + state = (struct osmo_scu_state_param) { + .affected_pc = dpc, + .affected_ssn = ssn, + .user_in_service = false, + .ssn_multiplicity_ind = smi, + }; + sccp_lbcs_local_bcast_state(inst, &state); + + /* 4) initiate the subsystem status test procedure if the prohibited subsystem is not local */ + /* 5) initiate a broadcast of Subsystem-Prohibited messages to concerned SP */ + /* 6) cancel "ignore subsystem status test" and the associated timer if in progress and if + * the newly prohibited subsystem resides at the local node. */ +} + /*! brief MTP -> SNM (MTP-PAUSE.ind) - inability to providing MTP service Q.714 5.2.2 */ void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc) { diff --git a/src/xua_snm.c b/src/xua_snm.c index e3efc8e..2a383c7 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -162,6 +162,53 @@ } } +/* generate SS-PROHIBITED / SS-ALLOWED towards local SCCP users */ +static void sua_snm_ssn_available_to_sccp(struct osmo_sccp_instance *sccp, uint32_t aff_pc, + uint32_t aff_ssn, uint32_t smi, bool available) +{ + if (available) + sccp_scmg_rx_ssn_allowed(sccp, aff_pc, aff_ssn, smi); + else + sccp_scmg_rx_ssn_prohibited(sccp, aff_pc, aff_ssn, smi); +} + +/* advertise availability of a single subsystem */ +static void sua_snm_ssn_available(struct osmo_ss7_as *as, uint32_t aff_pc, uint32_t aff_ssn, + const uint32_t *smi, const char *info_str, bool available) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + uint32_t _smi = smi ? *smi : 0; /* 0 == reserved/unknown in SUA */ + + if (s7i->sccp) + sua_snm_ssn_available_to_sccp(s7i->sccp, aff_pc, aff_ssn, _smi, available); + + /* inform remote SUA ASPs via DUNA/DAVA */ + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send DAVA/DUNA if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + /* DUNA/DAVA for SSN only exists in SUA */ + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_SUA) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + sua_tx_snm_available(asp, rctx, num_rctx, &aff_pc, 1, &aff_ssn, smi, info_str, available); + } +} + + /* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -211,6 +258,7 @@ void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) { struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + struct xua_msg_part *ie_ssn = xua_msg_find_tag(xua, SUA_IEI_SSN); const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); @@ -224,13 +272,28 @@ LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUNA(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); - xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, false); + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA && ie_ssn) { + /* when the SSN is included, DUNA corresponds to the SCCP N-STATE primitive */ + uint32_t ssn = xua_msg_part_get_u32(ie_ssn); + const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; + uint32_t pc, smi; + /* The Affected Point Code can only contain one point code when SSN is present */ + if (ie_aff_pc->len/sizeof(uint32_t) != 1) + return; + pc = ntohl(aff_pc[0]) & 0xffffff; + sua_snm_ssn_available(as, pc, ssn, xua_msg_get_u32p(xua, SUA_IEI_SMI, &smi), info_str, false); + } else { + /* when the SSN is not included, DUNA corresponds to the SCCP N-PCSTATE primitive */ + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, + ie_aff_pc->len / sizeof(uint32_t), info_str, false); + } } /* an incoming xUA DAVA was received from a remote SG */ void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) { struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + struct xua_msg_part *ie_ssn = xua_msg_find_tag(xua, SUA_IEI_SSN); const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); @@ -244,5 +307,19 @@ LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DAVA(%s) for %s\n", info_str ? info_str : "", format_affected_pcs_c(xua, asp->inst, ie_aff_pc)); - xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, ie_aff_pc->len/4, info_str, true); + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA && ie_ssn) { + /* when the SSN is included, DAVA corresponds to the SCCP N-STATE primitive */ + uint32_t ssn = xua_msg_part_get_u32(ie_ssn); + const uint32_t *aff_pc = (const uint32_t *)ie_aff_pc->dat; + uint32_t pc, smi; + /* The Affected Point Code can only contain one point code when SSN is present */ + if (ie_aff_pc->len/sizeof(uint32_t) != 1) + return; + pc = ntohl(aff_pc[0]) & 0xffffff; + sua_snm_ssn_available(as, pc, ssn, xua_msg_get_u32p(xua, SUA_IEI_SMI, &smi), info_str, true); + } else { + /* when the SSN is not included, DAVA corresponds to the SCCP N-PCSTATE primitive */ + xua_snm_pc_available(as, (const uint32_t *)ie_aff_pc->dat, + ie_aff_pc->len / sizeof(uint32_t), info_str, true); + } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie9a45b905bc17e7b695e15fe12ba4bbadcd032bf Gerrit-Change-Number: 22833 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 18:04:28 +0000 Subject: Change in libosmo-sccp[master]: sccp: more SCMG handling: SSA and SSP message handling In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 ) Change subject: sccp: more SCMG handling: SSA and SSP message handling ...................................................................... sccp: more SCMG handling: SSA and SSP message handling When a SSP (Subsystem Prohibited) or SSA (Subsystem Available) SCMG message is received, we must generate the respective primitives towards the SCCP user. Change-Id: I149166a25113f5d3e3536f9297bf89ff3139b9e3 --- M src/sccp_scmg.c 1 file changed, 31 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index ed16fe7..49e09ca 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -167,6 +167,33 @@ } +/* Subsystem Allowed received */ +static int scmg_rx_ssa(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *ssa) +{ + /* Q.714 5.3.3 */ + if (ssa->affected_ssn == SCCP_SSN_MANAGEMENT) + return 0; + + /* if the SSN is not marked as prohibited, ignore */ + + /* Q.714 5.3.2.2 a) */ + sccp_scmg_rx_ssn_allowed(scu->inst, ssa->affected_pc, ssa->affected_ssn, ssa->smi); + + /* If the remote SCCP, at which the subsystem reported in the SSA message resides, is marked + * inaccessible, then the message is treated as an implicit indication of SCCP restart */ + return 0; +} + +/* Subsystem Prohibited received */ +static int scmg_rx_ssp(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, + const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *ssp) +{ + /* Q.714 5.3.2.2 a) */ + sccp_scmg_rx_ssn_prohibited(scu->inst, ssp->affected_pc, ssp->affected_ssn, ssp->smi); + return 0; +} + /* Subsystem Test received */ static int scmg_rx_sst(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *sst) @@ -191,10 +218,12 @@ const struct osmo_sccp_addr *called_addr, const struct sccp_scmg_msg *scmg) { switch (scmg->msg_type) { + case SCCP_SCMG_MSGT_SSA: + return scmg_rx_ssa(scu, calling_addr, called_addr, scmg); + case SCCP_SCMG_MSGT_SSP: + return scmg_rx_ssp(scu, calling_addr, called_addr, scmg); case SCCP_SCMG_MSGT_SST: return scmg_rx_sst(scu, calling_addr, called_addr, scmg); - case SCCP_SCMG_MSGT_SSP: - case SCCP_SCMG_MSGT_SSA: case SCCP_SCMG_MSGT_SOR: case SCCP_SCMG_MSGT_SOG: case SCCP_SCMG_MSGT_SSC: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I149166a25113f5d3e3536f9297bf89ff3139b9e3 Gerrit-Change-Number: 22834 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:05:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 18:05:53 +0000 Subject: Change in libosmo-sccp[master]: xua_snm: Implement handling of DUPU messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 ) Change subject: xua_snm: Implement handling of DUPU messages ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/22835/1/src/sccp_scmg.c File src/sccp_scmg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22835/1/src/sccp_scmg.c at 142 PS1, Line 142: break; > Looks like the 'default' is missing here? Without it this block does nothing. [?] well, all of this is not implemented yet, see the comments above on what neesd to be done. Only Item number "6" is implemented so far. Yes, one could remove that switch statement, too - but the compiler will do so anyway. Once we get around a more full-blown SCMG impleentation, we will implement all those steps. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 Gerrit-Change-Number: 22835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 18:05:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:06:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 11 Feb 2021 18:06:28 +0000 Subject: Change in docker-playground[master]: ttcn3: use REGISTRY arg with debian-stretch-titan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22854 ) Change subject: ttcn3: use REGISTRY arg with debian-stretch-titan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c Gerrit-Change-Number: 22854 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 18:06:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:10:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 18:10:12 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to neighbor_ident.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 to look at the new patch set (#2). Change subject: Move bts_ident_key to neighbor_ident.c ...................................................................... Move bts_ident_key to neighbor_ident.c The function is not really handover specific, and will be used in other places in subsequent patches. Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 --- M include/osmocom/bsc/handover.h M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/handover_logic.c M src/osmo-bsc/neighbor_ident.c 4 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/22813/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 18:10:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 11 Feb 2021 18:10:12 +0000 Subject: Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 to look at the new patch set (#2). Change subject: Fix neigh resolution service on local neighbours ...................................................................... Fix neigh resolution service on local neighbours Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Related: SYS#4909 --- M src/osmo-bsc/neighbor_ident.c M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/ctrl_test_runner.py 3 files changed, 109 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/22814/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 19:36:58 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 19:36:58 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 to look at the new patch set (#2). Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... bts.adoc: describe ACCH repetition settings The manual currently does not mention ACCH repetition yet. Lets add some info on how to set up ACCH repetition correctly. Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Related: SYS#5114 --- M doc/manuals/chapters/bts.adoc 1 file changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/22855/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 20:20:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 20:20:33 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc File doc/manuals/chapters/bts.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 516 PS2, Line 516: of FACCH Uplink or Downlink FACCH? https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 578 PS2, Line 578: NOTE: osmo-bsc only sets the ACCH repetition parameters via RSL. If ACCH I believe it's worth to mention BTS_FEAT_ACCH_REP here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 20:20:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 20:23:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 20:23:40 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: describe general message format, reduce duplication In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 ) Change subject: TRXD: describe general message format, reduce duplication ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620/1/common/chapters/trx_if.adoc File common/chapters/trx_if.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620/1/common/chapters/trx_if.adoc at 344 PS1, Line 344: one radio burst per UDP message > actually, for VAMOS that's not true anymore, right? you would have two bursts (sequences of soft sym [?] Sure, this (and text in some other places) is changed in my still not published follow up path with the complete TRXDv2 description. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If3bd16fdf5abfd67b3822c7199003d6f7cbaff92 Gerrit-Change-Number: 22620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 11 Feb 2021 20:23:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 20:50:08 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 20:50:08 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc File doc/manuals/chapters/bts.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 578 PS2, Line 578: If Whether -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 20:50:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 21:00:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 21:00:57 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 to look at the new patch set (#3). Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... bts.adoc: describe ACCH repetition settings The manual currently does not mention ACCH repetition yet. Lets add some info on how to set up ACCH repetition correctly. Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Related: SYS#5114 --- M doc/manuals/chapters/bts.adoc 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/22855/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 21:01:48 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 21:01:48 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc File doc/manuals/chapters/bts.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 516 PS2, Line 516: of FACCH > Uplink or Downlink FACCH? FACCH exists only in uplink. https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 578 PS2, Line 578: NOTE: osmo-bsc only sets the ACCH repetition parameters via RSL. If ACCH > I believe it's worth to mention BTS_FEAT_ACCH_REP here. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 21:01:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 21:58:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 21:58:57 +0000 Subject: Change in osmo-bts[master]: l1sap: fix repeated_dl_facch_active_decision() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22860 ) Change subject: l1sap: fix repeated_dl_facch_active_decision() ...................................................................... l1sap: fix repeated_dl_facch_active_decision() The function checks meas_res->rxqual_sub against the lower threshold value in order to decide when to turn FACCH repetition off. This is not correct. It should compare against rxqual instead. Change-Id: Id4ab101d52f419583c4f4c8a6cf69af6c9097d25 Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/22860/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 1542c8a..b6970f4 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1025,7 +1025,7 @@ if (rxqual >= upper) lchan->repeated_dl_facch_active = true; - else if (meas_res->rxqual_sub <= lower) + else if (rxqual <= lower) lchan->repeated_dl_facch_active = false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id4ab101d52f419583c4f4c8a6cf69af6c9097d25 Gerrit-Change-Number: 22860 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 21:58:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 21:58:57 +0000 Subject: Change in osmo-bts[master]: l1sap.c: be sure that FACCH repetition is turned off References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22861 ) Change subject: l1sap.c: be sure that FACCH repetition is turned off ...................................................................... l1sap.c: be sure that FACCH repetition is turned off At the beginning of repeated_dl_facch_active_decision() the ACCH repetition capabilitiy flags (command only or all LAPDM frames) are tested. If no FACCH repetition is enabled, the function exists. However, we should also make sure that the struct memeber that enables FACCH repetition on the lower level is set to false as well. Normally that should be the case because it was never set to true before, but it is better to be sure. Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/22861/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b6970f4..3de76ab 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -980,9 +980,15 @@ uint8_t lower; uint8_t rxqual; + /* This is an optimization so that we exit as quickly as possible if + * there are no FACCH repetition capabilities present. However If the + * repeated FACCH capabilities vanish for whatever reason, we must be + * sure that FACCH repetition is disabled. */ if (!lchan->repeated_acch_capability.dl_facch_cmd - && !lchan->repeated_acch_capability.dl_facch_all) + && !lchan->repeated_acch_capability.dl_facch_all) { + lchan->repeated_dl_facch_active = false; return; + } /* Threshold disabled (always on) */ if (lchan->repeated_acch_capability.rxqual == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Gerrit-Change-Number: 22861 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:17:18 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 22:17:18 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 to look at the new patch set (#4). Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... bts.adoc: describe ACCH repetition settings The manual currently does not mention ACCH repetition yet. Lets add some info on how to set up ACCH repetition correctly. Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Related: SYS#5114 --- M doc/manuals/chapters/bts.adoc 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/22855/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:17:29 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 22:17:29 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc File doc/manuals/chapters/bts.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 516 PS2, Line 516: of FACCH > FACCH exists only in uplink. Done https://gerrit.osmocom.org/c/osmo-bsc/+/22855/2/doc/manuals/chapters/bts.adoc at 578 PS2, Line 578: If > Whether Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 22:17:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: daniel Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:36:11 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 22:36:11 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 22:36:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:37:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 22:37:29 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 11 Feb 2021 22:37:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:45:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 11 Feb 2021 22:45:17 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that UL-SACCH repetition is turned off References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22862 ) Change subject: l1sap: be sure that UL-SACCH repetition is turned off ...................................................................... l1sap: be sure that UL-SACCH repetition is turned off At the beginning of repeated_ul_sacch_active_decision() The UL-SACCH repetition capability is tested. If no UL-SACCH repetition is enabled the function exits. However, we should also make sure that the struct member that enabled UL-SACCH repetition on the lower level is set to false as well. Normally that should be the case because it was never set to true before, but it is better to be sure. Change-Id: I76a841514eb955b93f2114470b2c80402cf6883c Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/22862/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 3de76ab..97dd661 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1427,8 +1427,14 @@ uint16_t upper = 0; uint16_t lower = 0; - if (!lchan->repeated_acch_capability.ul_sacch) + /* This is an optimization so that we exit as quickly as possible if + * there are no uplink SACCH repetition capabilities present. + * However If the repeated UL-SACCH capabilities vanish for whatever + * reason, we must be sure that UL-SACCH repetition is disabled. */ + if (!lchan->repeated_acch_capability.ul_sacch) { + lchan->repeated_ul_sacch_active = false; return; + } /* Threshold disabled (repetition is always on) */ if (lchan->repeated_acch_capability.rxqual == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76a841514eb955b93f2114470b2c80402cf6883c Gerrit-Change-Number: 22862 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:57:00 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 22:57:00 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused log categories References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories ...................................................................... Remove unused log categories Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 --- M src/debug.h M src/gb_proxy_main.c 2 files changed, 0 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/63/22863/1 diff --git a/src/debug.h b/src/debug.h index 9a686cb..b3c978d 100644 --- a/src/debug.h +++ b/src/debug.h @@ -8,24 +8,7 @@ /* Debug Areas of the code */ enum { - DMM, - DPAG, - DMEAS, - DREF, DGPRS, - DNS, - DLLC, - DSNDCP, - DSLHC, - DCTRL, - DFILTER, - DGTPHUB, - DRANAP, - DSUA, - DV42BIS, - DIUCS, - DSIGTRAN, - DGTP, DOBJ, Debug_LastEntry, }; diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c index 2e9ff79..0e36c06 100644 --- a/src/gb_proxy_main.c +++ b/src/gb_proxy_main.c @@ -239,11 +239,6 @@ .description = "GPRS Packet Service", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DNS] = { - .name = "DNS", - .description = "GPRS Network Service (NS)", - .enabled = 1, .loglevel = LOGL_INFO, - }, [DOBJ] = { .name = "DOBJ", .description = "GbProxy object allocation/release", -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:57:00 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 22:57:00 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 ) Change subject: Move vty node into gbproxy_vty.c ...................................................................... Move vty node into gbproxy_vty.c This is no longer shared with osmo-sgsn and osmo-gtphub Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 --- M src/gb_proxy_main.c M src/gb_proxy_vty.c D src/vty.h 3 files changed, 5 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/64/22864/1 diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c index 0e36c06..6bd8bd8 100644 --- a/src/gb_proxy_main.c +++ b/src/gb_proxy_main.c @@ -43,7 +43,6 @@ #include #include "debug.h" -#include "vty.h" #include #include diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index f069e88..d62fe5f 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -40,7 +40,6 @@ #include "debug.h" #include -#include "vty.h" #include #include @@ -65,6 +64,11 @@ /* * vty code for gbproxy below */ +enum bsc_vty_node { + GBPROXY_NODE = _LAST_OSMOVTY_NODE + 1, + SGSN_NODE, +}; + static struct cmd_node gbproxy_node = { GBPROXY_NODE, "%s(config-gbproxy)# ", diff --git a/src/vty.h b/src/vty.h deleted file mode 100644 index d2e3d9a..0000000 --- a/src/vty.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include - -enum bsc_vty_node { - GBPROXY_NODE = _LAST_OSMOVTY_NODE + 1, - SGSN_NODE, - GTPHUB_NODE, -}; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 22:57:01 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 11 Feb 2021 22:57:01 +0000 Subject: Change in osmo-gbproxy[master]: Remove trailing whitespace References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 ) Change subject: Remove trailing whitespace ...................................................................... Remove trailing whitespace Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 --- M src/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/65/22865/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 43d819d..34e63e3 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 Gerrit-Change-Number: 22865 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:50:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:50:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 to look at the new patch set (#2). Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... TRXC: add missing description of the 'SETTSC' command Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/10/22610/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:50:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:50:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 to look at the new patch set (#2). Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... TRXC: add proposal for multiple Training Sequences Change-Id: I621e46edac5d748472fd645f81876116904e260c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/11/22611/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:50:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:50:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: Hello Jenkins Builder, Hoernchen, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 to look at the new patch set (#2). Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... TRXD: rework description of the 'Training Sequence Code' field The way how the indicated Training Sequence Code is supposed to be used by the BTS is behind the scope of this protocol specification. Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/18/22618/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:50:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:50:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 to look at the new patch set (#2). Change subject: TRXD: more information on PDU versioning and some highlights ...................................................................... TRXD: more information on PDU versioning and some highlights Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 41 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/22/22622/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:50:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:50:24 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 ) Change subject: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' ...................................................................... TRXC: use monospace formatting (the backticks) for 'SETFORMAT' Change-Id: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/66/22866/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index f15ed7b..3c19da0 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -166,7 +166,7 @@ version number, which can be negotiated on the control interface. By default, the Transceiver will use the legacy header version (0). -The header format negotiation can be initiated by the BTS using 'SETFORMAT' +The header format negotiation can be initiated by the BTS using `SETFORMAT` command. If the requested version is not supported by the transceiver, status code of the response message should indicate a preferred (basically, the latest) version. The format of this message is the following: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Gerrit-Change-Number: 22866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:50:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:50:24 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: add initial proposal for TRXDv2 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22867 ) Change subject: TRXD: add initial proposal for TRXDv2 ...................................................................... TRXD: add initial proposal for TRXDv2 Change-Id: I03b2beeb535848b31fd629ba3cd330b43072c08b Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 217 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/22867/1 diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index d1aa566..c9d502e 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -18,6 +18,9 @@ The corresponding interface for every socket is at `P+100` on the BTS side. +NOTE: Starting from TRXDv2, it's possible to use only one socket for all +channels. See <> for more details. + [[trx_if_clock_ind]] === Indications on the Master Clock Interface @@ -354,7 +357,7 @@ === TRXD protocol -PDUs on the data interface carry one radio burst per one UDP packet. +PDUs on the data interface carry one or multiple radio bursts per one UDP packet. Two kinds of TRXD PDU exist: * `TRX -> L1` (from transceiver to the L1): Uplink messages received from the MS, @@ -386,6 +389,11 @@ ** New field: MTS (Modulation and Training Sequence); ** New field: C/I (Carrier-to-interface) ratio; ** Downlink messages mostly unchanged. +* TRXDv2 (proposed in January 2021): +** Introduced the concept of burst batching (many bursts in one message); +** Changed the field ordering (facilitating aligned access); +** New field: batching indicator; +** New field: SCPIR for VAMOS. ==== Uplink Data Burst @@ -448,6 +456,47 @@ } ---- +.TRXDv2 Uplink message structure +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER(2) + 4: RES + 5-7: TN + 8-15: MTS + 16: BATCH + 17-23: SPARE (0) + 24-31: RSSI + 32-47: TOA256 + 48-63: C/I + 64-95: FN + 96-127: Soft-bits +} +---- + +.TRXDv2 NOPE / IDLE indication message structure +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER(2) + 4: RES + 5-7: TN + 8-15: MTS + 16: BATCH + 17-23: SPARE (0) + 24-31: RSSI + 32-47: TOA256 + 48-63: C/I + 64-95: FN +} +---- + VER: 4 bits:: TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. @@ -557,7 +606,7 @@ ==== Downlink Data Burst -.TRXD Downlink data burst message structure +.TRXDv0 and TRXDv1 Downlink data burst message structure [packetdiag] ---- { @@ -573,6 +622,45 @@ } ---- +.TRXDv2 Downlink data burst message structure +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER + 4: RES + 5-7: TN + 8-15: MTS + 16: BATCH + 17-23: SPARE (0) + 24-31: PWR + 32-63: FN + 64-95: Hard-bits +} +---- + +.TRXDv2 Downlink data burst message structure for AQPSK +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER + 4: RES + 5-7: TN + 8-15: MTS + 16: BATCH + 17-19: SPARE (0) + 20-23: SCPIR + 24-31: PWR + 32-63: FN + 64-95: Hard-bits for V0/V1 +} +---- + VER: 4 bits:: TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. @@ -583,6 +671,10 @@ Reserved, shall be 0. It can be used in the future to extend the TDMA TN range to (0..15), in case anybody would need to transfer UMTS bursts. +MTS: 8 bits (1 byte):: +Contains the Modulation and Training Sequence information. See <> +for more information on the encoding. + FN: 32 bits (4 bytes):: GSM frame number, big endian. @@ -591,6 +683,129 @@ in dB. The absolute value is set on the control interface, so the resulting power is calculated as follows: `full_scale - (absolute_red + relative_red)`. +SCPIR: 4 bits:: +SCPIR (Subchannel Power Imbalance Ratio) - the ratio of power between Q and I +channels for a VAMOS pair. Value range: 0 .. 10. This field shall be present +when `MTC` field indicates the use of _AQPSK_ modulation. Otherwise all bits +shall be set to 0. + Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented using one byte (0x01 or 0x00 respectively). + +Hard-bits for V0/V1: 148 bytes each, 296 bytes total:: +This field contains two sequences of hard-bits (148 bytes each) for an _AQPSK_ +moduleted burst (VAMOS mode). The two sequences are *not* interleaved: one +complete sequence for subscriber `V0` takes the first 148 bytes, then another +complete sequence for subscriber `V1` takes the subsequent 148 bytes. + +[[trx_if_pdu_batching]] +==== Burst batching + +Starting from TRXDv2, it's possible to combine several bursts into a single +PDU - this is called _burst batching_. The purpose of _burst batching_ is +to reduce socket load and eliminate possible PDU reordering, especially in +a multi-TRX setup. + +.TRXDv2 Uplink PDU structure (batched part) +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: TRXNR + 4: RES + 5-7: TN + 8-15: MTS + 16: BATCH + 17-23: SPARE (0) + 24-31: RSSI + 32-47: TOA256 + 48-63: C/I + 64-95: Soft-bits +} +---- + +.TRXDv2 Downlink PDU structure (batched part) +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: TRXNR + 4: RES + 5-7: TN + 8-15: MTS + 16: BATCH + 17-23: SPARE (0) + 24-31: PWR + 32-63: Hard-bits +} +---- + +TRXNR: 4 bits:: +Transceiver number (FIXME). + +BATCH: 1 bit:: +This bit indicates whether a batched burst follows. + +The ordering of bursts may be different with the only requirement that all +_batched_ bursts must belong to the same TDMA frame number indicated in the +first part. Thus the following combinations are possible: + +* a) one PDU contains bursts with the same TDMA timeslot number for all +transceivers (8 PDUs per a TDMA frame); +* one PDU contains complete TDMA frame with bursts for all 8 timeslots: +** b) either for a single transceiver (N PDUs per a TDMA frame), +** c) or for all transceivers (one PDU per a TDMA frame). + +.Example: batched PDU structure for a) +---- ++-------+----------------+----------------------------------+ +| TRX=0 | TDMA FN=F TN=T | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=1 | TDMA FN=F TN=T | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=2 | TDMA FN=F TN=T | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=T | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +---- + +.Example: batched PDU structure for b) +---- ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=0 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=1 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=2 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=7 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +---- + +.Example: batched PDU structure for c) +---- ++-------+----------------+----------------------------------+ +| TRX=0 | TDMA FN=F TN=0 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=0 | TDMA FN=F TN=1 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=0 | TDMA FN=F TN=2 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=5 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=6 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +| TRX=N | TDMA FN=F TN=7 | Hard-/Soft-bits | ++-------+----------------+----------------------------------+ +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I03b2beeb535848b31fd629ba3cd330b43072c08b Gerrit-Change-Number: 22867 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:52:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:52:29 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: describe general message format, reduce duplication In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 ) Change subject: TRXD: describe general message format, reduce duplication ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If3bd16fdf5abfd67b3822c7199003d6f7cbaff92 Gerrit-Change-Number: 22620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:55:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:55:04 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 23:55:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 11 23:55:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 11 Feb 2021 23:55:51 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... Patch Set 2: I am getting tired of that asciidoc mess, it fails for no reason... -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 11 Feb 2021 23:55:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 00:05:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 00:05:10 +0000 Subject: Change in osmo-bts[master]: l1sap: fix repeated_dl_facch_active_decision() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22860 ) Change subject: l1sap: fix repeated_dl_facch_active_decision() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id4ab101d52f419583c4f4c8a6cf69af6c9097d25 Gerrit-Change-Number: 22860 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 12 Feb 2021 00:05:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 00:06:34 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 00:06:34 +0000 Subject: Change in osmo-bts[master]: l1sap.c: be sure that FACCH repetition is turned off In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22861 ) Change subject: l1sap.c: be sure that FACCH repetition is turned off ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Gerrit-Change-Number: 22861 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 12 Feb 2021 00:06:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 00:06:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 00:06:58 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that UL-SACCH repetition is turned off In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22862 ) Change subject: l1sap: be sure that UL-SACCH repetition is turned off ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76a841514eb955b93f2114470b2c80402cf6883c Gerrit-Change-Number: 22862 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 12 Feb 2021 00:06:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 00:10:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 00:10:22 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 ) Change subject: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields ...................................................................... Patch Set 2: Ancient nwdiag version shipped by Debian does not support this attribute. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I604cd85f79a8c21ef536840e017e8af399e935c7 Gerrit-Change-Number: 22621 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 00:10:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 00:21:10 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 00:21:10 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22868 ) Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... gprs_ns2: add signalling & data weights for UDP binds Allow to assign a signalling and date weight to UDP binds. Those weights will be use when doing dynamic configuration over IP-SNS. This is only the first part which only use the assigned weights when doing a new SNS configuration. The outgoing change weight procedure will be supported in a later patch when the SNS fsm support outgoing procedures. Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 7 files changed, 73 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/22868/1 diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 1bf8c7f..07e6c45 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -215,6 +215,8 @@ const struct osmo_sockaddr *remote, struct gprs_ns2_nse *nse, uint16_t nsvci); +void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, + uint8_t signalling, uint8_t data); void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind); void gprs_ns2_free_binds(struct gprs_ns2_inst *nsi); diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index ca47934..f86f3a3 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1409,6 +1409,8 @@ return -ENOMEM; } + bind->sns_signalling_weight = 1; + bind->sns_data_weight = 1; bind->nsi = nsi; INIT_LLIST_HEAD(&bind->nsvc); llist_add(&bind->list, &nsi->binding); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index ff95c81..53f809b 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -257,6 +257,11 @@ void (*dump_vty)(const struct gprs_ns2_vc_bind *bind, struct vty *vty, bool stats); + /*! the IP-SNS signalling weight when doing dynamic configuration */ + uint8_t sns_signalling_weight; + /*! the IP-SNS data weight when doing dynamic configuration */ + uint8_t sns_data_weight; + struct osmo_stat_item_group *statg; }; @@ -352,6 +357,7 @@ const char *id); void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc); void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive); +void ns2_update_weights(struct gprs_ns2_vc_bind *bind); /* vc */ struct osmo_fsm_inst *ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc, diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 7b28754..9e77f2a 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -796,8 +796,8 @@ } ip4_elems->udp_port = sa->u.sin.sin_port; - ip4_elems->sig_weight = 2; - ip4_elems->data_weight = 1; + ip4_elems->sig_weight = bind->sns_signalling_weight; + ip4_elems->data_weight = bind->sns_data_weight; ip4_elems++; } @@ -835,8 +835,8 @@ } ip6_elems->udp_port = sa->u.sin.sin_port; - ip6_elems->sig_weight = 2; - ip6_elems->data_weight = 1; + ip6_elems->sig_weight = bind->sns_signalling_weight; + ip6_elems->data_weight = bind->sns_data_weight; ip6_elems++; } @@ -1810,6 +1810,14 @@ } } +/* Update SNS weights + * \param[in] nsvc the NSVC which should be updated + */ +void ns2_update_weights(struct gprs_ns2_vc_bind *bind) +{ + /* TODO: implement weights after binds per sns implemented */ +} + /* initialize osmo_ctx on main tread */ static __attribute__((constructor)) void on_dso_load_ctx(void) { diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index e07f6d4..cf48f7a 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -104,6 +104,8 @@ } vty_out(vty, "UDP bind: %s:%d DSCP: %d%s", sockstr.ip, sockstr.port, priv->dscp, VTY_NEWLINE); + vty_out(vty, " IP-SNS signalling weight: %u data weight: %u%s", + bind->sns_signalling_weight, bind->sns_data_weight, VTY_NEWLINE); vty_out(vty, " %lu NS-VC: %s", nsvcs, VTY_NEWLINE); llist_for_each_entry(nsvc, &bind->nsvc, blist) { @@ -567,3 +569,16 @@ return NULL; } + +/*! set the signalling and data weight for this bind + * \param[in] bind + * \param[in] signalling the signalling weight + * \param[in] data the data weight + */ +void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, uint8_t signalling, uint8_t data) +{ + OSMO_ASSERT(gprs_ns2_is_ip_bind(bind)); + bind->sns_signalling_weight = signalling; + bind->sns_data_weight = data; + /* TODO: inform the sns fsms of all nsvcs/nse about it */ +} diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 3646080..a5e282e 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -66,6 +66,8 @@ int dscp; bool accept_ipaccess; bool accept_sns; + uint8_t ip_sns_signalling_weight; + uint8_t ip_sns_data_weight; }; /* TODO: this should into osmo timer */ @@ -118,6 +120,8 @@ return NULL; } + vbind->ip_sns_signalling_weight = 1; + vbind->ip_sns_data_weight = 1; llist_add(&vbind->list, &binds); return vbind; } @@ -328,6 +332,8 @@ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); + vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", + vbind->ip_sns_signalling_weight, vbind->ip_sns_data_weight, VTY_NEWLINE); break; default: return; @@ -611,6 +617,34 @@ return CMD_SUCCESS; } +DEFUN(cfg_ns_bind_ip_sns_weight, cfg_ns_bind_ip_sns_weight_cmd, + "ip-sns signalling-weight <0-254> data-weight <0-254>", + "IP SNS\n" + "signalling weight used by IP-SNS dynamic configuration\n" + "signalling weight used by IP-SNS dynamic configuration\n" + "data weight used by IP-SNS dynamic configuration\n" + "data weight used by IP-SNS dynamic configuration\n") +{ + struct vty_bind *vbind = vty->index; + struct gprs_ns2_vc_bind *bind; + + int signalling = atoi(argv[0]); + int data = atoi(argv[1]); + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "ip-sns signalling-weight <0-254> data-weight <0-254> can be only used with UDP bind%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + vbind->ip_sns_data_weight = data; + vbind->ip_sns_signalling_weight = signalling; + bind = gprs_ns2_bind_by_name(vty_nsi, vbind->name); + if (bind) + gprs_ns2_ip_bind_set_sns_weight(bind, signalling, data); + + return CMD_SUCCESS; +} DEFUN(cfg_ns_bind_fr, cfg_ns_bind_fr_cmd, "fr NETIF (fr|frnet)", @@ -1686,6 +1720,7 @@ install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_dscp_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_dscp_cmd); + install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_ip_sns_weight_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_ipaccess_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_ipaccess_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_fr_cmd); diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index 397ec26..a748f13 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -30,4 +30,5 @@ OsmoNSdummy(config-ns-bind)# end OsmoNSdummy# show ns UDP bind: 127.0.0.14:42999 DSCP: 0 + IP-SNS signalling weight: 1 data weight: 1 0 NS-VC: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 00:23:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 00:23:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add bind vty exclude-sns-configuration In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22626 ) Change subject: gprs_ns2: add bind vty exclude-sns-configuration ...................................................................... Abandoned in favour of an upcoming change -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb294d449f084c1ea693c7b99f1a65e99f38ea37 Gerrit-Change-Number: 22626 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 01:16:52 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 01:16:52 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#4). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP need to know the MTU of the BSSGP layer. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contain the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 8 files changed, 119 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 01:17:39 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 01:17:39 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#5). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP need to know the MTU of the BSSGP layer. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contain the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 8 files changed, 120 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 01:19:35 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 01:19:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#6). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP need to know the MTU of the BSSGP layer. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contain the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 8 files changed, 120 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 01:58:26 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 01:58:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22869 ) Change subject: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer ...................................................................... gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer gettimeofday can jump and the comment says it should not be used for elapsed timer. Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22869/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 66ee450..88ce8ae 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -70,7 +70,7 @@ struct osmo_timer_list timer; enum ns2_timeout mode; int N; - struct timeval timer_started; + struct timespec timer_started; } alive; }; @@ -155,7 +155,7 @@ priv->alive.mode = NS_TOUT_TNS_ALIVE; priv->alive.N = 0; - osmo_gettimeofday(&priv->alive.timer_started, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started); ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); } @@ -167,11 +167,15 @@ static int alive_timer_elapsed_ms(struct gprs_ns2_vc_priv *priv) { - struct timeval now, elapsed; - osmo_gettimeofday(&now, NULL); - timersub(&now, &priv->alive.timer_started, &elapsed); + struct timespec now, elapsed; - return 1000 * elapsed.tv_sec + elapsed.tv_usec / 1000; + if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) != 0) + return 0; + + timespecsub(&now, &priv->alive.timer_started, &elapsed); + LOGNSVC(priv->nsvc, LOGL_ERROR, "elapsed: %ld, now: %ld, saved: %ld.\n", + elapsed.tv_sec, now.tv_sec, priv->alive.timer_started.tv_sec); + return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000); } static void recv_test_procedure(struct osmo_fsm_inst *fi) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae Gerrit-Change-Number: 22869 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 01:58:27 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 01:58:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22870 ) Change subject: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime ...................................................................... gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime The alive elapsed timeout was only set it once on the start of the test procedure but not every time an ALIVE PDU was sent. Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/22870/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 88ce8ae..31cfb51 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -205,6 +205,7 @@ case NS_TOUT_TNS_TEST: priv->alive.mode = NS_TOUT_TNS_ALIVE; priv->alive.N = 0; + osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started); ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 Gerrit-Change-Number: 22870 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:04:09 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:04:09 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22869 to look at the new patch set (#2). Change subject: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer ...................................................................... gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer gettimeofday can jump and the comment says it should not be used for elapsed timer. Related: OS#4997 Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22869/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae Gerrit-Change-Number: 22869 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:04:09 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:04:09 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22870 to look at the new patch set (#2). Change subject: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime ...................................................................... gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime The alive elapsed timeout was only set once on the start of the test procedure but not every time an ALIVE PDU was sent. Fixes: OS#4997 Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/22870/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 Gerrit-Change-Number: 22870 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:06:33 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:06:33 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22869 ) Change subject: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae Gerrit-Change-Number: 22869 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 02:06:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:06:53 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:06:53 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22870 ) Change subject: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 Gerrit-Change-Number: 22870 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 02:06:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:16:27 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:16:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22868 ) Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... Patch Set 1: Code-Review-1 (9 comments) https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 9 PS1, Line 9: date data https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 10 PS1, Line 10: use used https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 12 PS1, Line 12: use uses https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 15 PS1, Line 15: support supports https://gerrit.osmocom.org/c/libosmocore/+/22868/1/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/include/osmocom/gprs/gprs_ns2.h at 218 PS1, Line 218: void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, Also add it in libosmogb.map https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h at 261 PS1, Line 261: uint8_t sns_signalling_weight; could be sns_sig_weight to stay consistent with the other variable names (ipx_elems->sig_weight) https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h at 360 PS1, Line 360: void ns2_update_weights(struct gprs_ns2_vc_bind *bind); ns2_sns_update_weights or is this not SNS-specific? https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_vty.c at 69 PS1, Line 69: uint8_t ip_sns_signalling_weight; *_sig_weight https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_vty.c at 335 PS1, Line 335: vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", sig-weight here as well? For the vty commands I'm not so sure. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 02:16:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:22:54 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:22:54 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: use strcmp() instead of strncmp() References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22871 ) Change subject: gprs_ns2_vty: use strcmp() instead of strncmp() ...................................................................... gprs_ns2_vty: use strcmp() instead of strncmp() Otherwise substring wouldn't be detected. E.g. local vs local2 Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/22871/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index a5e282e..53e5572 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -102,7 +102,7 @@ { struct vty_bind *vbind; llist_for_each_entry(vbind, &binds, list) { - if (!strncmp(vbind->name, name, strlen(vbind->name))) + if (!strcmp(vbind->name, name)) return vbind; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 Gerrit-Change-Number: 22871 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:22:54 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:22:54 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only use the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm support outgoing procedures. Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 4 files changed, 420 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 39bbbef..f63c0ad 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1267,6 +1267,7 @@ void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind) { struct gprs_ns2_vc *nsvc, *tmp; + struct gprs_ns2_nse *nse; if (!bind) return; @@ -1274,6 +1275,12 @@ gprs_ns2_free_nsvc(nsvc); } + if (gprs_ns2_is_ip_bind(bind)) { + llist_for_each_entry(nse, &bind->nsi->nse, list) { + ns2_sns_remove_bind(nse, bind); + } + } + if (bind->driver->free_bind) bind->driver->free_bind(bind); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 9dd9421..7da4a7c 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -365,6 +365,10 @@ void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc); void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive); void ns2_update_weights(struct gprs_ns2_vc_bind *bind); +int ns2_sns_add_bind(struct gprs_ns2_nse *nse, + struct gprs_ns2_vc_bind *bind); +int ns2_sns_remove_bind(struct gprs_ns2_nse *nse, + struct gprs_ns2_vc_bind *bind); /* vc */ struct osmo_fsm_inst *ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc, diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 9e77f2a..7e0d5d9 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -103,6 +103,11 @@ struct osmo_sockaddr saddr; }; +struct ns2_sns_bind { + struct llist_head list; + struct gprs_ns2_vc_bind *bind; +}; + struct ns2_sns_state { struct gprs_ns2_nse *nse; @@ -110,6 +115,10 @@ /* holds the list of initial SNS endpoints */ struct llist_head sns_endpoints; + /* list of used struct ns2_sns_bind */ + struct llist_head binds; + /* pointer to the bind which was used to initiate the SNS connection */ + struct ns2_sns_bind *current_bind; /* prevent recursive reselection */ bool reselection_running; @@ -120,8 +129,6 @@ struct sns_endpoint *initial; /* all SNS PDU will be sent over this nsvc */ struct gprs_ns2_vc *sns_nsvc; - /* iterate over the binds after all remote has been tested */ - int bind_offset; /* timer N */ int N; /* true if at least one nsvc is alive */ @@ -741,23 +748,25 @@ remote = &gss->initial->saddr; /* count how many bindings are available (only UDP binds) */ - count = ns2_ip_count_bind(nsi, remote); + count = llist_count(&gss->binds); if (count == 0) { /* TODO: logging */ return; } - bind = ns2_ip_get_bind_by_index(nsi, remote, gss->bind_offset); - if (!bind) { - if (gss->bind_offset) { - gss->bind_offset = 0; - bind = ns2_ip_get_bind_by_index(nsi, remote, gss->bind_offset); + /* take the first bind or take the next bind */ + if (!gss->current_bind) { + gss->current_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list); + } else { + if (gss->current_bind->list.next != &gss->binds) { + gss->current_bind = llist_entry(gss->current_bind->list.next, struct ns2_sns_bind, list); + } else { + gss->current_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list); } - - if (!bind) - return; } + bind = gss->current_bind->bind; + /* setup the NSVC */ if (!gss->sns_nsvc) { gss->sns_nsvc = ns2_ip_bind_connect(bind, gss->nse, remote); @@ -1435,12 +1444,9 @@ return; } else if (!gss->initial) { gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list); - gss->bind_offset = 0; } else if (gss->initial->list.next == &gss->sns_endpoints) { /* last entry, continue with first */ gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list); - gss->bind_offset++; - gss->bind_offset %= ns2_ip_count_bind(nse->nsi, &gss->initial->saddr); } else { /* next element is an entry */ gss->initial = llist_entry(gss->initial->list.next, struct sns_endpoint, list); @@ -1488,6 +1494,7 @@ fi->priv = gss; gss->nse = nse; INIT_LLIST_HEAD(&gss->sns_endpoints); + INIT_LLIST_HEAD(&gss->binds); return fi; err: @@ -1810,6 +1817,88 @@ } } +int ns2_sns_add_bind(struct gprs_ns2_nse *nse, + struct gprs_ns2_vc_bind *bind) +{ + struct ns2_sns_state *gss; + struct ns2_sns_bind *tmp; + bool trigger_reselection = false; + + OSMO_ASSERT(nse->bss_sns_fi); + gss = nse->bss_sns_fi->priv; + + if (!gprs_ns2_is_ip_bind(bind)) { + return -EINVAL; + } + + if (!llist_empty(&gss->binds)) { + llist_for_each_entry(tmp, &gss->binds, list) { + if (tmp->bind == bind) + return -EALREADY; + } + } else { + trigger_reselection = true; + } + + tmp = talloc_zero(gss, struct ns2_sns_bind); + if (!tmp) + return -ENOMEM; + tmp->bind = bind; + llist_add_tail(&tmp->list, &gss->binds); + + if (trigger_reselection) { + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + } else { + /* TODO: do a add SNS-IP procedure & add nsvc() */ + } + + return 0; +} + +/* Remove a bind from the SNS. All assosiated NSVC must be removed. */ +int ns2_sns_remove_bind(struct gprs_ns2_nse *nse, + struct gprs_ns2_vc_bind *bind) +{ + struct ns2_sns_state *gss; + struct ns2_sns_bind *tmp, *tmp2; + struct gprs_ns2_vc *nsvc, *nsvc2; + bool found = false; + + if (!nse->bss_sns_fi) + return 0; + + gss = nse->bss_sns_fi->priv; + if (gss->current_bind && gss->current_bind->bind == bind) { + if (gss->current_bind->list.prev == &gss->binds) + gss->current_bind = NULL; + else + gss->current_bind = llist_entry(gss->current_bind->list.prev, struct ns2_sns_bind, list); + } + + llist_for_each_entry_safe(tmp, tmp2, &gss->binds, list) { + if (tmp->bind == bind) { + llist_del(&tmp->list); + found = true; + talloc_free(tmp); + } + } + + if (!found) + return -ENOENT; + + llist_for_each_entry_safe(nsvc, nsvc2, &nse->nsvc, list) { + if (nsvc->bind == bind) { + gprs_ns2_free_nsvc(nsvc); + } + } + + if (llist_count(&gss->binds)) { + /* TODO: do a remove SNS-IP procedure */ + } + + return 0; +} + /* Update SNS weights * \param[in] nsvc the NSVC which should be updated */ diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 53e5572..881761b 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -58,6 +58,7 @@ static struct gprs_ns2_inst *vty_nsi = NULL; static struct osmo_fr_network *vty_fr_network = NULL; static struct llist_head binds; +static struct llist_head nses; struct vty_bind { struct llist_head list; @@ -70,6 +71,21 @@ uint8_t ip_sns_data_weight; }; +struct vty_nse { + struct llist_head list; + uint16_t nsei; + /* list of binds which are valid for this nse. Only IP-SNS uses this + * to allow `no listen ..` in the bind context. So "half" created binds are valid for + * IP-SNS. This allows changing the bind ip without modifying all NSEs afterwards */ + struct llist_head binds; +}; + +/* used by IP-SNS to connect multiple vty_nse_bind to a vty_nse */ +struct vty_nse_bind { + struct llist_head list; + struct vty_bind *vbind; +}; + /* TODO: this should into osmo timer */ static const struct value_string gprs_ns_timer_strs[] = { { 0, "tns-block" }, @@ -135,6 +151,93 @@ talloc_free(vbind); } +static struct vty_nse *vty_nse_by_nsei(uint16_t nsei) +{ + struct vty_nse *vnse; + llist_for_each_entry(vnse, &nses, list) { + if (vnse->nsei == nsei) + return vnse; + } + return NULL; +} + +static struct vty_nse *vty_nse_alloc(uint16_t nsei) +{ + struct vty_nse *vnse = talloc_zero(vty_nsi, struct vty_nse); + if (!vnse) + return NULL; + + vnse->nsei = nsei; + INIT_LLIST_HEAD(&vnse->binds); + llist_add(&vnse->list, &nses); + return vnse; +} + +static void vty_nse_free(struct vty_nse *vnse) +{ + if (!vnse) + return; + + llist_del(&vnse->list); + talloc_free(vnse); +} + +static int vty_nse_add_vbind(struct vty_nse *vnse, struct vty_bind *vbind) +{ + struct vty_nse_bind *vnse_bind; + + if (vbind->ll != GPRS_NS2_LL_UDP) + return -EINVAL; + + llist_for_each_entry(vnse_bind, &vnse->binds, list) { + if (vnse_bind->vbind == vbind) + return -EALREADY; + } + + vnse_bind = talloc(vnse, struct vty_nse_bind); + if (!vnse_bind) + return -ENOMEM; + vnse_bind->vbind = vbind; + + llist_add_tail(&vnse->list, &vnse->binds); + return 0; +} + +static int vty_nse_remove_vbind(struct vty_nse *vnse, struct vty_bind *vbind) +{ + struct vty_nse_bind *vnse_bind, *tmp; + if (vbind->ll != GPRS_NS2_LL_UDP) + return -EINVAL; + + llist_for_each_entry_safe(vnse_bind, tmp, &vnse->binds, list) { + if (vnse_bind->vbind == vbind) { + llist_del(&vnse_bind->list); + talloc_free(vnse_bind); + } + } + + return -ENOENT; +} + +/* check if the NSE still has SNS configuration */ +static bool vty_nse_check_sns(struct gprs_ns2_nse *nse) { + struct vty_nse *vnse = vty_nse_by_nsei(nse->nsei); + + int count = gprs_ns2_sns_count(nse); + if (count > 0) { + /* there are other sns endpoints */ + return true; + } + + if (!vnse) + return false; + + if (llist_empty(&vnse->binds)) + return false; + + return true; +} + static struct cmd_node ns_node = { L_NS_NODE, "%s(config-ns)# ", @@ -172,14 +275,26 @@ ) { struct gprs_ns2_nse *nse; + struct vty_nse *vnse; uint16_t nsei = atoi(argv[0]); + bool free_vnse = false; + + vnse = vty_nse_by_nsei(nsei); + if (!vnse) { + vnse = vty_nse_alloc(nsei); + if (!vnse) { + vty_out(vty, "Failed to create vty NSE!%s", VTY_NEWLINE); + return CMD_ERR_INCOMPLETE; + } + free_vnse = true; + } nse = gprs_ns2_nse_by_nsei(vty_nsi, nsei); if (!nse) { nse = gprs_ns2_create_nse(vty_nsi, nsei, GPRS_NS2_LL_UNDEF, GPRS_NS2_DIALECT_UNDEF); if (!nse) { vty_out(vty, "Failed to create NSE!%s", VTY_NEWLINE); - return CMD_ERR_INCOMPLETE; + goto err; } nse->persistent = true; } @@ -187,13 +302,19 @@ if (!nse->persistent) { /* TODO: should the dynamic NSE removed? */ vty_out(vty, "A dynamic NSE with the specified NSEI already exists%s", VTY_NEWLINE); - return CMD_ERR_INCOMPLETE; + goto err; } vty->node = L_NS_NSE_NODE; vty->index = nse; return CMD_SUCCESS; + +err: + if (free_vnse) + talloc_free(vnse); + + return CMD_ERR_INCOMPLETE; } DEFUN(cfg_no_ns_nsei, cfg_no_ns_nsei_cmd, @@ -204,6 +325,7 @@ ) { struct gprs_ns2_nse *nse; + struct vty_nse *vnse; uint16_t nsei = atoi(argv[0]); nse = gprs_ns2_nse_by_nsei(vty_nsi, nsei); @@ -219,6 +341,10 @@ vty_out(vty, "Deleting NS Entity %u%s", nse->nsei, VTY_NEWLINE); gprs_ns2_free_nse(nse); + + vnse = vty_nse_by_nsei(nsei); + vty_nse_free(vnse); + return CMD_SUCCESS; } @@ -472,7 +598,7 @@ { struct vty_bind *vbind = vty->index; struct gprs_ns2_vc_bind *bind; - + int rc; const char *addr_str = argv[0]; unsigned int port = atoi(argv[1]); struct osmo_sockaddr_str sockaddr_str; @@ -494,8 +620,9 @@ return CMD_WARNING; } - if (gprs_ns2_ip_bind(vty_nsi, vbind->name, &sockaddr, vbind->dscp, &bind) != 0) { - vty_out(vty, "Failed to create the bind!%s", VTY_NEWLINE); + rc = gprs_ns2_ip_bind(vty_nsi, vbind->name, &sockaddr, vbind->dscp, &bind); + if (rc != 0) { + vty_out(vty, "Failed to create the bind (rc %d)!%s", rc, VTY_NEWLINE); return CMD_WARNING; } @@ -1320,7 +1447,6 @@ struct osmo_sockaddr_str remote_str; /* argv[0] */ struct osmo_sockaddr remote; uint16_t port = atoi(argv[1]); - int count; if (nse->ll != GPRS_NS2_LL_UDP) { vty_out(vty, "This NSE doesn't support UDP.%s", VTY_NEWLINE); @@ -1347,12 +1473,9 @@ return CMD_WARNING; } - count = gprs_ns2_sns_count(nse); - if (count > 0) { - /* there are other sns endpoints */ + if (vty_nse_check_sns(nse)) { + /* there is still sns configuration valid */ return CMD_SUCCESS; - } else if (count < 0) { - OSMO_ASSERT(0); } else { /* clean up nse to allow other nsvc commands */ osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); @@ -1364,6 +1487,175 @@ return CMD_SUCCESS; } +DEFUN(cfg_ns_nse_ip_sns_bind, cfg_ns_nse_ip_sns_bind_cmd, + "ip-sns-bind BINDID", + "IP SNS binds\n" + "A udp bind which this SNS will be used. The bind must be already exists. Can be given multiple times.\n") +{ + struct gprs_ns2_nse *nse = vty->index; + struct gprs_ns2_vc_bind *bind; + struct vty_bind *vbind; + struct vty_nse *vnse; + const char *name = argv[0]; + bool ll_modified = false; + bool dialect_modified = false; + int rc; + + if (nse->ll == GPRS_NS2_LL_UNDEF) { + nse->ll = GPRS_NS2_LL_UDP; + ll_modified = true; + } + + if (nse->dialect == GPRS_NS2_DIALECT_UNDEF) { + char sns[16]; + snprintf(sns, sizeof(sns), "NSE%05u-SNS", nse->nsei); + nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, sns); + if (!nse->bss_sns_fi) + goto err; + nse->dialect = GPRS_NS2_DIALECT_SNS; + dialect_modified = true; + } + + if (nse->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "Can not mix NS-VC with different link layer%s", VTY_NEWLINE); + goto err; + } + + if (nse->dialect != GPRS_NS2_DIALECT_SNS) { + vty_out(vty, "Can not mix NS-VC with different dialects%s", VTY_NEWLINE); + goto err; + } + + vbind = vty_bind_by_name(name); + if (!vbind) { + vty_out(vty, "Can not find the given bind '%s'%s", name, VTY_NEWLINE); + goto err; + } + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "ip-sns-bind can only be used with UDP bind%s", + VTY_NEWLINE); + goto err; + } + + /* the vnse has been created together when creating the nse node. The parent node should check this already! */ + vnse = vty_nse_by_nsei(nse->nsei); + OSMO_ASSERT(vnse); + + rc = vty_nse_add_vbind(vnse, vbind); + switch (rc) { + case 0: + break; + case -EALREADY: + vty_out(vty, "Failed to add ip-sns-bind %s already present%s", name, VTY_NEWLINE); + goto err; + case -ENOMEM: + vty_out(vty, "Failed to add ip-sns-bind %s out of memory%s", name, VTY_NEWLINE); + goto err; + default: + vty_out(vty, "Failed to add ip-sns-bind %s! %d%s", name, rc, VTY_NEWLINE); + goto err; + } + + /* the bind might not yet created because "listen" is missing. */ + bind = gprs_ns2_bind_by_name(vty_nsi, name); + if (!bind) + return CMD_SUCCESS; + + rc = ns2_sns_add_bind(nse, bind); + switch (rc) { + case 0: + break; + case -EALREADY: + vty_out(vty, "Failed to add ip-sns-bind %s already present%s", name, VTY_NEWLINE); + goto err; + case -ENOMEM: + vty_out(vty, "Failed to add ip-sns-bind %s out of memory%s", name, VTY_NEWLINE); + goto err; + default: + vty_out(vty, "Failed to add ip-sns-bind %s! %d%s", name, rc, VTY_NEWLINE); + goto err; + } + + return CMD_SUCCESS; +err: + if (ll_modified) + nse->ll = GPRS_NS2_LL_UNDEF; + if (dialect_modified) + nse->dialect = GPRS_NS2_DIALECT_UNDEF; + + return CMD_WARNING; +} + +DEFUN(cfg_no_ns_nse_ip_sns_bind, cfg_no_ns_nse_ip_sns_bind_cmd, + "no ip-sns-bind BINDID", + NO_STR + "IP SNS binds\n" + "A udp bind which this SNS will be used.\n") +{ + struct gprs_ns2_nse *nse = vty->index; + struct gprs_ns2_vc_bind *bind; + struct vty_bind *vbind; + struct vty_nse *vnse; + const char *name = argv[0]; + int rc; + + if (nse->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "This NSE doesn't support UDP.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (nse->dialect != GPRS_NS2_DIALECT_SNS) { + vty_out(vty, "This NSE doesn't support UDP with dialect ip-sns.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + vbind = vty_bind_by_name(name); + if (!vbind) { + vty_out(vty, "Can not find the given bind '%s'%s", name, VTY_NEWLINE); + return CMD_WARNING; + } + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "no ip-sns-bind can only be used with UDP bind%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + /* the vnse has been created together when creating the nse node. The parent node should check this already! */ + vnse = vty_nse_by_nsei(nse->nsei); + OSMO_ASSERT(vnse); + + rc = vty_nse_remove_vbind(vnse, vbind); + switch(rc) { + case 0: + break; + case -ENOENT: + vty_out(vty, "Bind %s is not part of this NSE%s", name, VTY_NEWLINE); + return CMD_WARNING; + case -EINVAL: + vty_out(vty, "no ip-sns-bind can only be used with UDP bind%s", + VTY_NEWLINE); + return CMD_WARNING; + default: + return CMD_WARNING; + } + + /* the bind might not exists yet */ + bind = gprs_ns2_bind_by_name(vty_nsi, name); + if (bind) + ns2_sns_remove_bind(nse, bind); + + if (!vty_nse_check_sns(nse)) { + /* clean up nse to allow other nsvc commands */ + osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); + nse->bss_sns_fi = NULL; + nse->ll = GPRS_NS2_LL_UNDEF; + nse->dialect = GPRS_NS2_DIALECT_UNDEF; + } + + return CMD_SUCCESS; +} /* non-config commands */ static void dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats) @@ -1676,6 +1968,7 @@ { vty_nsi = nsi; INIT_LLIST_HEAD(&binds); + INIT_LLIST_HEAD(&nses); vty_fr_network = osmo_fr_network_alloc(nsi); if (!vty_fr_network) @@ -1737,6 +2030,8 @@ install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_ipa_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_remote_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_remote_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_bind_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_bind_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:25:35 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:25:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 6: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22343/6//COMMIT_MSG at 9 PS6, Line 9: The BSSGP need to know the MTU of the BSSGP layer. The BSSGP layer needs to know [...] https://gerrit.osmocom.org/c/libosmocore/+/22343/6//COMMIT_MSG at 12 PS6, Line 12: contain contains https://gerrit.osmocom.org/c/libosmocore/+/22343/6/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/6/include/osmocom/gprs/gprs_ns2.h at 138 PS6, Line 138: BSSGP PDU >From NS view it's probably "more correct" to talk about NS SDU https://gerrit.osmocom.org/c/libosmocore/+/22343/6/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/6/src/gb/gprs_ns2_fr.c at 804 PS6, Line 804: bind->nsi = nsi; Unrelated change? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 02:25:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:33:43 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:33:43 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Add MTU support References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Add MTU support ...................................................................... bssgp_bvc_fsm: Add MTU support Add functions to get/set the current MTU Default to max MTU size Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Related: OS#4889 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c M src/gb/libosmogb.map 3 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/22873/1 diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h b/include/osmocom/gprs/bssgp_bvc_fsm.h index e69c205..d5096b9 100644 --- a/include/osmocom/gprs/bssgp_bvc_fsm.h +++ b/include/osmocom/gprs/bssgp_bvc_fsm.h @@ -64,3 +64,6 @@ uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi); uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi); uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi); + +void bssgp_bvc_fsm_set_mtu(struct osmo_fsm_inst *fi, uint16_t mtu); +uint16_t bssgp_bvc_fsm_get_mtu(const struct osmo_fsm_inst *fi); \ No newline at end of file diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index 6b8bd14..a1edf58 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -116,6 +116,8 @@ /* NSEI of the underlying NS Entity */ uint16_t nsei; + /* MTU of the underlying NS Entity */ + uint16_t mtu; /* BVCI of this BVC */ uint16_t bvci; @@ -666,6 +668,7 @@ bfp->role_sgsn = role_sgsn; bfp->nsei = nsei; bfp->bvci = bvci; + bfp->mtu = UINT16_MAX; return fi; } @@ -817,6 +820,25 @@ return bfp->features.negotiated; } +/*! Set the maximum size of a BSSGP PDU */ +void bssgp_bvc_fsm_set_mtu(struct osmo_fsm_inst *fi, uint16_t mtu) +{ + struct bvc_fsm_priv *bfp = fi->priv; + + OSMO_ASSERT(fi->fsm == &bssgp_bvc_fsm); + bfp->mtu = mtu; +} + +/*! Return the maximum size of a BSSGP PDU */ +uint16_t bssgp_bvc_fsm_get_mtu(const struct osmo_fsm_inst *fi) +{ + const struct bvc_fsm_priv *bfp = fi->priv; + + OSMO_ASSERT(fi->fsm == &bssgp_bvc_fsm); + return bfp->mtu; +} + + static __attribute__((constructor)) void on_dso_load_bvc_fsm(void) { OSMO_ASSERT(osmo_fsm_register(&bssgp_bvc_fsm) == 0); diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index a3171d0..fe7c4ec 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -96,6 +96,8 @@ bssgp_bvc_get_features_advertised; bssgp_bvc_get_features_received; bssgp_bvc_get_features_negotiated; +bssgp_bvc_fsm_set_mtu; +bssgp_bvc_fsm_get_mtu; osmo_fr_network_alloc; osmo_fr_link_alloc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:33:43 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:33:43 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS to MTU if necessary References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS to MTU if necessary ...................................................................... bssgp2_enc_status: Truncate STATUS to MTU if necessary Related: OS#4889 Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a --- M include/osmocom/gprs/gprs_bssgp2.h M src/gb/bssgp_bvc_fsm.c M src/gb/gprs_bssgp2.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/22874/1 diff --git a/include/osmocom/gprs/gprs_bssgp2.h b/include/osmocom/gprs/gprs_bssgp2.h index bf814cb..46186fa 100644 --- a/include/osmocom/gprs/gprs_bssgp2.h +++ b/include/osmocom/gprs/gprs_bssgp2.h @@ -59,7 +59,7 @@ struct msgb *bssgp2_enc_bvc_reset_ack(uint16_t bvci, const struct gprs_ra_id *ra_id, uint16_t cell_id, const uint8_t *feat_bm, const uint8_t *ext_feat_bm); -struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg); +struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg, uint16_t mtu); int bssgp2_dec_fc_bvc(struct bssgp2_flow_ctrl *fc, const struct tlv_parsed *tp); diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index a1edf58..9ac4250 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -238,7 +238,7 @@ if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) bvci = &bfp->bvci; - tx = bssgp2_enc_status(cause, bvci, rx); + tx = bssgp2_enc_status(cause, bvci, rx, bfp->mtu); if (msgb_bvci(rx) == 0) fi_tx_sig(fi, tx); diff --git a/src/gb/gprs_bssgp2.c b/src/gb/gprs_bssgp2.c index 0f519ad..1a7874c 100644 --- a/src/gb/gprs_bssgp2.c +++ b/src/gb/gprs_bssgp2.c @@ -217,8 +217,9 @@ /*! Encode BSSGP STATUS PDU as per TS 48.018 Section 10.4.14. * \param[in] cause BSSGP Cause value * \param[in] bvci optional BVCI - only encoded if non-NULL - * \param[in] msg optional message buffer containing PDU in error - only encoded if non-NULL */ -struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg) + * \param[in] msg optional message buffer containing PDU in error - only encoded if non-NULL + * \param[in] mtu Maximum size the NS layer accepts as payload */ +struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg, uint16_t mtu) { struct msgb *msg = bssgp_msgb_alloc(); struct bssgp_normal_hdr *bgph; @@ -229,12 +230,22 @@ bgph = (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph)); bgph->pdu_type = BSSGP_PDUT_STATUS; msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause); + /* FIXME: Require/encode BVCI only if cause is BVCI unknown/blocked + * See 3GPP TS 48.018 Ch. 10.4.14 */ if (bvci) { uint16_t _bvci = osmo_htons(*bvci); msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); } - if (orig_msg) - msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR, msgb_bssgp_len(orig_msg), msgb_bssgph(orig_msg)); + if (orig_msg) { + uint32_t orig_len, max_orig_len; + /* Calculate how big the reply would be: the BSSGP msg so far + size of the PDU IN ERROR including tvl */ + max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(msgb_bssgp_len(orig_msg)); + orig_len = msgb_bssgp_len(orig_msg); + /* Truncate the difference between max_orig_len and mtu */ + if (max_orig_len > mtu) + orig_len -= max_orig_len - mtu; + msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR, orig_len, msgb_bssgph(orig_msg)); + } return msg; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:34:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:34:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22868 to look at the new patch set (#2). Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... gprs_ns2: add signalling & data weights for UDP binds Allow to assign a signalling and data weight to UDP binds. Those weights will be used when doing dynamic configuration over IP-SNS. This is only the first part which only uses the assigned weights when doing a new SNS configuration. The outgoing change weight procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M tests/gb/gprs_ns2_vty.vty 8 files changed, 74 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/22868/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:34:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:34:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22872 to look at the new patch set (#2). Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 4 files changed, 420 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22868 to look at the new patch set (#3). Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... gprs_ns2: add signalling & data weights for UDP binds Allow to assign a signalling and data weight to UDP binds. Those weights will be used when doing dynamic configuration over IP-SNS. This is only the first part which only uses the assigned weights when doing a new SNS configuration. The outgoing change weight procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. Related: SYS#5354 Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M tests/gb/gprs_ns2_vty.vty 8 files changed, 74 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/22868/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#8). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP need to know the MTU of the BSSGP layer. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contain the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 8 files changed, 120 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22869 to look at the new patch set (#4). Change subject: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer ...................................................................... gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer gettimeofday can jump and the comment says it should not be used for elapsed timer. Related: OS#4997 Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/22869/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae Gerrit-Change-Number: 22869 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22870 to look at the new patch set (#4). Change subject: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime ...................................................................... gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime The alive elapsed timeout was only set once on the start of the test procedure but not every time an ALIVE PDU was sent. Fixes: OS#4997 Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/22870/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 Gerrit-Change-Number: 22870 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: use strcmp() instead of strncmp() In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22871 to look at the new patch set (#3). Change subject: gprs_ns2_vty: use strcmp() instead of strncmp() ...................................................................... gprs_ns2_vty: use strcmp() instead of strncmp() Otherwise substring wouldn't be detected. E.g. local vs local2 Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/22871/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 Gerrit-Change-Number: 22871 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22872 to look at the new patch set (#3). Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c 4 files changed, 420 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:35:18 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:35:18 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22868 ) Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... Patch Set 3: (8 comments) https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 9 PS1, Line 9: date > data Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 10 PS1, Line 10: use > used Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 12 PS1, Line 12: use > uses Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1//COMMIT_MSG at 15 PS1, Line 15: support > supports Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/include/osmocom/gprs/gprs_ns2.h at 218 PS1, Line 218: void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, > Also add it in libosmogb. [?] Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h at 261 PS1, Line 261: uint8_t sns_signalling_weight; > could be sns_sig_weight to stay consistent with the other variable names (ipx_elems->sig_weight) Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_vty.c at 69 PS1, Line 69: uint8_t ip_sns_signalling_weight; > *_sig_weight Done https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_vty.c at 335 PS1, Line 335: vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", > sig-weight here as well? For the vty commands I'm not so sure. I would leave it as signalling weight. Maybe @laforge has a different opinion? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 02:35:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:39:13 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:39:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22868 ) Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22868/1/src/gb/gprs_ns2_internal.h at 360 PS1, Line 360: void ns2_update_weights(struct gprs_ns2_vc_bind *bind); > ns2_sns_update_weights or is this not SNS-specific? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 02:39:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:39:53 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:39:53 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 8: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22343/6//COMMIT_MSG at 9 PS6, Line 9: The BSSGP need to know the MTU of the BSSGP layer. > The BSSGP layer needs to know [... [?] Done https://gerrit.osmocom.org/c/libosmocore/+/22343/6//COMMIT_MSG at 12 PS6, Line 12: contain > contains Done https://gerrit.osmocom.org/c/libosmocore/+/22343/6/include/osmocom/gprs/gprs_ns2.h File include/osmocom/gprs/gprs_ns2.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/6/include/osmocom/gprs/gprs_ns2.h at 138 PS6, Line 138: BSSGP PDU > From NS view it's probably "more correct" to talk about NS SDU Done https://gerrit.osmocom.org/c/libosmocore/+/22343/6/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/6/src/gb/gprs_ns2_fr.c at 804 PS6, Line 804: bind->nsi = nsi; > Unrelated change? rebase artefact. will remove it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 02:39:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:40:16 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 02:40:16 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#9). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP layer needs to know the MTU of the NS UNIDATA payload. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contains the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 8 files changed, 119 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/9 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:41:07 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:41:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: use strcmp() instead of strncmp() In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22871 ) Change subject: gprs_ns2_vty: use strcmp() instead of strncmp() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 Gerrit-Change-Number: 22871 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 02:41:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 02:42:26 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 02:42:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 02:42:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 03:31:11 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 03:31:11 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Add MTU support In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Add MTU support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 03:31:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 03:39:43 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 12 Feb 2021 03:39:43 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS to MTU if necessary In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS to MTU if necessary ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 03:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 12 03:56:27 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 12 Feb 2021 03:56:27 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6025fc7962264_1d02aba9dfd45f86969d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 193s] [COMPILING apps/dfu/main.c] [ 193s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 193s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 193s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 194s] Memory region Used Size Region Size %age Used [ 194s] rom: 16580 B 16 KB 101.20% [ 194s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 194s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 194s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 194s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 194s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 194s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 194s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 194s] collect2: error: ld returned 1 exit status [ 194s] % [ 194s] make[2]: *** [Makefile:234: flash] Error 1 [ 194s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 194s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 194s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 194s] dh_auto_build: error: make -j1 returned exit code 2 [ 194s] make: *** [debian/rules:16: build] Error 25 [ 194s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 194s] ### VM INTERACTION START ### [ 197s] [ 147.957566] sysrq: Power Off [ 197s] [ 147.964971] reboot: Power down [ 197s] ### VM INTERACTION END ### [ 197s] [ 197s] lamb23 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 12 03:56:14 UTC 2021. [ 197s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 12 04:06:43 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 04:06:43 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 to look at the new patch set (#2). Change subject: Move vty node into gbproxy_vty.c ...................................................................... Move vty node into gbproxy_vty.c This is no longer shared with osmo-sgsn and osmo-gtphub Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 --- M src/Makefile.am M src/gb_proxy_main.c M src/gb_proxy_vty.c D src/vty.h 4 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/64/22864/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 04:06:43 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 04:06:43 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 ) Change subject: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse ...................................................................... gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse Use the function provided by bssgp2 instead of setting up the ns2 prim request ourself. Related: OS#4889 Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564 --- M src/gb_proxy.c 1 file changed, 3 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/75/22875/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 34e63e3..8b57315 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -185,17 +185,13 @@ /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ struct gprs_ns2_inst *nsi = nse->cfg->nsi; - struct osmo_gprs_ns2_prim nsp = {}; struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2nse"); - uint32_t tlli; + uint32_t tlli = 0; int rc; DEBUGP(DGPRS, "NSE(%05u/%s)-BVC(%05u/??) proxying to NSE(%05u/%s)\n", msgb_nsei(msg), !nse->sgsn_facing ? "SGSN" : "BSS", ns_bvci, nse->nsei, nse->sgsn_facing ? "SGSN" : "BSS"); - nsp.bvci = ns_bvci; - nsp.nsei = nse->nsei; - /* Strip the old NS header, it will be replaced with a new one */ strip_ns_hdr(msg); @@ -204,12 +200,9 @@ * all BSSGP UNITDATA PDUs related to an MS shall be passed with * the same LSP, e.g. the LSP contains the MS's TLLI, to the * underlying network service. */ - if (gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli) == 1) - nsp.u.unitdata.link_selector = tlli; + gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli); - osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, - PRIM_OP_REQUEST, msg); - rc = gprs_ns2_recv_prim(nsi, &nsp.oph); + rc = bssgp2_nsi_tx_ptp(nsi, nse->nsei, ns_bvci, msg, tlli); /* FIXME: We need a counter group for gbproxy_nse */ //if (rc < 0) // rate_ctr_inc(&bvc->ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564 Gerrit-Change-Number: 22875 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 04:06:44 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 04:06:44 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 ) Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... gbproxy: Use bssgp2_enc_status when sending STATUS bssgp_tx_status() is not aware of the MTU and cannot truncate the PDU if needed. Use the newer bssgp2_enc_status() which supports truncating the PDU. Related: OS#4889 Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 --- M src/gb_proxy.c 1 file changed, 66 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/76/22876/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 8b57315..a226b93 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -84,9 +84,25 @@ static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_bvc *bvc, uint16_t ns_bvci); +int tx_status(struct gbproxy_nse *nse, uint16_t ns_bvci, enum gprs_bssgp_cause cause, const uint16_t *bvci, const struct msgb *old_msg) +{ + int rc; -/* generate BVC-STATUS message with cause value derived from TLV-parser error */ -static int tx_status_from_tlvp(enum osmo_tlv_parser_error tlv_p_err, struct msgb *orig_msg) + struct msgb *msg = bssgp2_enc_status(cause, bvci, old_msg, nse->mtu); + if (!msg) { + LOGPNSE(nse, LOGL_NOTICE, "Unable to encode STATUS message\n"); + return -ENOMEM; + } + + rc = bssgp2_nsi_tx_ptp(nse->cfg->nsi, nse->nsei, ns_bvci, msg, 0); + if (rc < 0) + LOGPNSE(nse, LOGL_NOTICE, "Unable to send STATUS message\n"); + return rc; +} + +/* generate BVC-STATUS mess +age with cause value derived from TLV-parser error */ +static int tx_status_from_tlvp(struct gbproxy_nse *nse, enum osmo_tlv_parser_error tlv_p_err, struct msgb *orig_msg) { uint8_t bssgp_cause; switch (tlv_p_err) { @@ -96,7 +112,7 @@ default: bssgp_cause = BSSGP_CAUSE_PROTO_ERR_UNSPEC; } - return bssgp_tx_status(bssgp_cause, NULL, orig_msg); + return tx_status(nse, msgb_bvci(orig_msg), bssgp_cause, NULL, orig_msg); } /* strip off the NS header */ @@ -380,31 +396,31 @@ if (ns_bvci == 0 || ns_bvci == 1) { LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not PTP\n", log_pfx, ns_bvci); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_PTP)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in PTP BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_UL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in uplink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } bss_bvc = gbproxy_bvc_by_bvci(nse, ns_bvci); if (!bss_bvc) { LOGP(DGPRS, LOGL_NOTICE, "%s %s - Didn't find BVC for PTP message, discarding\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); } /* UL_UNITDATA has a different header than all other uplink PDUs */ if (bgph->pdu_type == BSSGP_PDUT_UL_UNITDATA) { const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg); if (msgb_bssgp_len(msg) < sizeof(*budh)) - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data, msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx); /* populate TLLI from the fixed headser into the TLV-parsed array so later code @@ -417,7 +433,7 @@ } if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); - return tx_status_from_tlvp(rc, msg); + return tx_status_from_tlvp(nse, rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ msgb_bcid(msg) = (void *)&tp; @@ -505,17 +521,17 @@ if (ns_bvci == 0 || ns_bvci == 1) { LOGP(DGPRS, LOGL_NOTICE, "%s BVCI is not PTP\n", log_pfx); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_PTP)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in PTP BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_DL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } sgsn_bvc = gbproxy_bvc_by_bvci(nse, ns_bvci); @@ -523,20 +539,20 @@ LOGP(DGPRS, LOGL_NOTICE, "%s %s - Didn't find BVC for for PTP message, discarding\n", log_pfx, pdut_name); rate_ctr_inc(&nse->cfg->ctrg-> ctr[GBPROX_GLOB_CTR_INV_BVCI]); - return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); } if (!bssgp_bvc_fsm_is_unblocked(sgsn_bvc->fi)) { LOGPBVC(sgsn_bvc, LOGL_NOTICE, "Rx %s: Dropping on blocked BVC\n", pdut_name); rate_ctr_inc(&sgsn_bvc->ctrg->ctr[GBPROX_PEER_CTR_DROPPED]); - return bssgp_tx_status(BSSGP_CAUSE_BVCI_BLOCKED, &ns_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_BVCI_BLOCKED, &ns_bvci, msg); } /* DL_UNITDATA has a different header than all other uplink PDUs */ if (bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) { const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg); if (msgb_bssgp_len(msg) < sizeof(*budh)) - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data, msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx); /* populate TLLI from the fixed headser into the TLV-parsed array so later code @@ -549,7 +565,7 @@ } if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); - return tx_status_from_tlvp(rc, msg); + return tx_status_from_tlvp(nse, rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ msgb_bcid(msg) = (void *)&tp; @@ -855,7 +871,7 @@ if (!nse_new) { LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) Got PtP BVC reset before signalling reset for " "BVCI=%05u\n", bvci, nsei); - bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_STATE, NULL, msg); + tx_status(nse, ns_bvci, BSSGP_CAUSE_PDU_INCOMP_STATE, NULL, msg); return 0; } @@ -892,25 +908,26 @@ int rc; char ri_src_str[64]; char ri_dest_str[64]; + uint16_t ns_bvci = msgb_bvci(msg); rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Since gbproxy is 2G only we do not expect to get RIM messages only from GERAN cells. */ if (src_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { LOGP(DGPRS, LOGL_ERROR, "%s %s source RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* Lookup source cell to make sure that the source RIM routing information actually belongs @@ -919,7 +936,7 @@ if (!src_cell) { LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for source RIM routing info (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* TODO: Use bssgp_bvc_get_features_negotiated(src_cell->bss_bvc->fi) to check if the the BSS sided BVC actually @@ -949,7 +966,7 @@ LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot route RIM message (%s to %s) since no RIM capable SGSN is found!\n", log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name, @@ -979,24 +996,24 @@ if (ns_bvci != 0 && ns_bvci != 1) { LOGP(DGPRS, LOGL_NOTICE, "%s %s BVCI=%05u is not signalling\n", log_pfx, pdut_name, ns_bvci); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_UL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in uplink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); - return tx_status_from_tlvp(rc, msg); + return tx_status_from_tlvp(nse, rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ msgb_bcid(msg) = (void *)tp; @@ -1079,7 +1096,7 @@ osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); nse = gbproxy_nse_by_imsi(nse->cfg, mi.imsi); if (!nse) { - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } OSMO_ASSERT(nse->sgsn_facing); rc = gbprox_relay2nse(msg, nse, 0); @@ -1094,7 +1111,7 @@ err_no_bvc: LOGPNSE(nse, LOGL_ERROR, "Rx %s: cannot find BVC for BVCI=%05u\n", pdut_name, ptp_bvci); rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_NSEI]); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Receive paging request from SGSN, we need to relay to proper BSS */ @@ -1198,7 +1215,7 @@ if (!from_bvc) { LOGPNSE(nse, LOGL_ERROR, "Rx BVC-RESET BVCI=%05u: Cannot find BVC\n", ptp_bvci); rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_BVCI]); - return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &ptp_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ptp_bvci, msg); } osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_RESET, msg); } @@ -1217,6 +1234,7 @@ int rc; char ri_src_str[64]; char ri_dest_str[64]; + uint16_t ns_bvci = msgb_bvci(msg); /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in gbprox_rx_rim_from_bss() */ @@ -1225,20 +1243,20 @@ TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Since gbproxy is 2G only we do not expect to get RIM messages that target non-GERAN cells. */ if (dest_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { LOGP(DGPRS, LOGL_ERROR, "%s %s destination RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&dest_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* Lookup destination cell */ @@ -1246,7 +1264,7 @@ if (!dest_cell) { LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for destination RIM routing info (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&dest_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* TODO: Check if the BVC of the destination cell actually did negotiate RIM support, see also comments @@ -1285,17 +1303,17 @@ if (ns_bvci != 0 && ns_bvci != 1) { LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not signalling\n", log_pfx, ns_bvci); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_DL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } data_len = msgb_bssgp_len(msg) - sizeof(*bgph); @@ -1303,7 +1321,7 @@ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { - rc = tx_status_from_tlvp(rc, msg); + rc = tx_status_from_tlvp(nse, rc, msg); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); return rc; } @@ -1393,7 +1411,7 @@ if (!nse_peer) { LOGPNSE(nse, LOGL_ERROR, "Rx %s: Cannot find NSE\n", pdut_name); /* TODO: Counter */ - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Delete the entry after we're done */ gbproxy_tlli_cache_remove(cfg, tlli); @@ -1418,7 +1436,7 @@ default: LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); - rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + rc = tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); break; } @@ -1427,7 +1445,7 @@ err_no_bvc: LOGPNSE(nse, LOGL_ERROR, "Rx %s: Cannot find BVC\n", pdut_name); rate_ctr_inc(&cfg->ctrg-> ctr[GBPROX_GLOB_CTR_INV_RAI]); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } @@ -1459,12 +1477,12 @@ uint16_t nsei = msgb_nsei(msg); struct gbproxy_nse *nse; - /* ensure minimum length to decode PCU type */ - if (msgb_bssgp_len(msg) < sizeof(struct bssgp_normal_hdr)) - return bssgp_tx_status(BSSGP_CAUSE_SEM_INCORR_PDU, NULL, msg); - nse = gbproxy_nse_by_nsei(cfg, nsei, NSE_F_SGSN); if (nse) { + /* ensure minimum length to decode PDU type */ + if (msgb_bssgp_len(msg) < sizeof(struct bssgp_normal_hdr)) + return tx_status(nse, ns_bvci, BSSGP_CAUSE_SEM_INCORR_PDU, NULL, msg); + if (ns_bvci == 0 || ns_bvci == 1) return gbprox_rx_sig_from_sgsn(nse, msg, ns_bvci); else @@ -1477,6 +1495,10 @@ nse = gbproxy_nse_alloc(cfg, nsei, false); } if (nse) { + /* ensure minimum length to decode PDU type */ + if (msgb_bssgp_len(msg) < sizeof(struct bssgp_normal_hdr)) + return tx_status(nse, ns_bvci, BSSGP_CAUSE_SEM_INCORR_PDU, NULL, msg); + if (ns_bvci == 0 || ns_bvci == 1) return gbprox_rx_sig_from_bss(nse, msg, ns_bvci); else -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 04:06:44 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 04:06:44 +0000 Subject: Change in osmo-gbproxy[master]: WIP: Set BSSGP PDU MTU from NS SDU MTU References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: WIP: Set BSSGP PDU MTU from NS SDU MTU ...................................................................... WIP: Set BSSGP PDU MTU from NS SDU MTU Related: OS#4889 Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c M src/gb_proxy_vty.c 4 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/77/22877/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index a36f305..9f07503 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -21,6 +21,9 @@ #define GBPROXY_INIT_VU_GEN_TX 256 #define GBPROXY_MAX_NR_SGSN 16 +/* Set the FR MTU as default (IP can fragment) - FR Header - NS-UNITDATA Header */ +#define DEFAULT_NSE_MTU (1600 - 2 - 4) + /* BVCI uses 16 bits */ #define BVC_LOG_CTX_FLAG (1<<17) @@ -160,6 +163,8 @@ /* NSEI of the NSE */ uint16_t nsei; + /* MTU of the NSE */ + uint16_t mtu; /* Are we facing towards a SGSN (true) or BSS (false) */ bool sgsn_facing; diff --git a/src/gb_proxy.c b/src/gb_proxy.c index a226b93..c4062fd 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -700,6 +700,7 @@ sgsn_bvc->fi = bssgp_bvc_fsm_alloc_ptp_bss(sgsn_bvc, cfg->nsi, sgsn_nse->nsei, bvci, ra_id, cell_id); OSMO_ASSERT(sgsn_bvc->fi); + bssgp_bvc_fsm_set_mtu(sgsn_bvc->fi, sgsn_nse->mtu); bssgp_bvc_fsm_set_ops(sgsn_bvc->fi, &sgsn_ptp_bvc_fsm_ops, sgsn_bvc); gbproxy_cell_add_sgsn_bvc(bvc->cell, sgsn_bvc); @@ -844,6 +845,7 @@ gbproxy_bvc_free(from_bvc); return -ENOMEM; } + bssgp_bvc_fsm_set_mtu(from_bvc->fi, nse->mtu); bssgp_bvc_fsm_set_ops(from_bvc->fi, &bss_sig_bvc_fsm_ops, from_bvc); } } else { @@ -860,6 +862,7 @@ gbproxy_bvc_free(from_bvc); return -ENOMEM; } + bssgp_bvc_fsm_set_mtu(from_bvc->fi, nse->mtu); bssgp_bvc_fsm_set_ops(from_bvc->fi, &bss_ptp_bvc_fsm_ops, from_bvc); } #if 0 @@ -1522,6 +1525,7 @@ { /* TODO: bss nsei available/unavailable bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_BLOCK, nsvc->nsei, bvc->bvci, 0); * TODO: sgsn nsei available/unavailable + * TODO: Update MTU */ struct gbproxy_bvc *bvc; diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 27d73b8..6aed38c 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -447,6 +447,7 @@ return NULL; nse->nsei = nsei; + nse->mtu = DEFAULT_NSE_MTU; nse->cfg = cfg; nse->sgsn_facing = sgsn_facing; diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index d62fe5f..11a1215 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -241,6 +241,7 @@ bvc->fi = bssgp_bvc_fsm_alloc_sig_bss(bvc, nse->cfg->nsi, nsei, features); if (!bvc->fi) goto free_bvc; + bssgp_bvc_fsm_set_mtu(bvc->fi, nse->mtu); bssgp_bvc_fsm_set_ops(bvc->fi, &sgsn_sig_bvc_fsm_ops, bvc); osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 04:15:05 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 04:15:05 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 to look at the new patch set (#2). Change subject: Add MTU field for BSSGP ...................................................................... Add MTU field for BSSGP Prepare tracking the MTU from NS. Initialize the MTU with a conservative default. The MTU is not yet updated, that will happen in a later patch. Related: OS#4889 Depends: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 (libosmocore.git) Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c M src/gb_proxy_vty.c 4 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/77/22877/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 04:15:05 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 04:15:05 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 to look at the new patch set (#2). Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... gbproxy: Use bssgp2_enc_status when sending STATUS bssgp_tx_status() is not aware of the MTU and cannot truncate the PDU if needed. Use the newer bssgp2_enc_status() which supports truncating the PDU. Related: OS#4889 Depends: Ic39d918c56399ceb0431299ce938e3bf276f678a (libosmocore.git) Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 --- M src/gb_proxy.c 1 file changed, 66 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/76/22876/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 12 05:53:57 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 12 Feb 2021 05:53:57 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6026180a5d69b_1d02aba9dfd45f8722322@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 165s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 165s] [COMPILING libboard/qmod/source/card_pres.c] [ 165s] [COMPILING libboard/qmod/source/wwan_led.c] [ 165s] [COMPILING libboard/qmod/source/i2c.c] [ 166s] [COMPILING libboard/qmod/source/board_qmod.c] [ 166s] [COMPILING apps/dfu/main.c] [ 166s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 166s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 166s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 166s] Memory region Used Size Region Size %age Used [ 166s] rom: 16588 B 16 KB 101.25% [ 166s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 166s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 166s] collect2: error: ld returned 1 exit status [ 166s] % [ 166s] make[2]: *** [Makefile:234: flash] Error 1 [ 166s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 166s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 166s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 166s] dh_auto_build: error: make -j1 returned exit code 2 [ 166s] make: *** [debian/rules:16: build] Error 25 [ 166s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 166s] ### VM INTERACTION START ### [ 170s] [ 154.575985] sysrq: Power Off [ 170s] [ 154.580173] reboot: Power down [ 170s] ### VM INTERACTION END ### [ 170s] [ 170s] lamb11 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 12 05:53:48 UTC 2021. [ 170s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:38:09 2021 From: gerrit-no-reply at lists.osmocom.org (Gabriel Ganne) Date: Fri, 12 Feb 2021 08:38:09 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 to look at the new patch set (#2). Change subject: install gtp-tunnel and gtp-link tools ...................................................................... install gtp-tunnel and gtp-link tools This eases quick setup for demonstration purposes. Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df --- M contrib/libgtpnl.spec.in M debian/control A debian/libgtpnl-tools.install M tools/Makefile.am 4 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/43/22843/2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 2 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:41:27 2021 From: gerrit-no-reply at lists.osmocom.org (Gabriel Ganne) Date: Fri, 12 Feb 2021 08:41:27 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: Gabriel Ganne has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... Patch Set 2: Hi, Thanks for the review. I called the new package "libgtpnl-tools", please tell me it it suits you. Best regards, -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 2 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 08:41:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:46:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:46:53 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22868 ) Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 08:46:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:54:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:54:33 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 9: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_fr.c at 804 PS9, Line 804: /* 48.016 ? 6.1.4.2 default maximum information field size of 1600 octets : * FR has 2 byte header */ : bind->mtu = 1600 - 2; I think the "information field" is what comes after the header, so (without checking the specs again) my assumption was that on the wire it is 1600 bytes plus FR header plus CRC plus flag octets. And hence here mtu = 1600. I just checked FRF.1.2 and Q.922 and I think it supports my position here. Nevertheless, the actual device MTU should be read from the net-device once we actually bind to it. I guess you're doing this in a follow-up patch in this series (haven't looked throuhg it yet). https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_frgre.c at 577 PS9, Line 577: bind->mtu = 1600 - 2; same here. Also, probably worth adding a #define in the frame_relay.h file for this? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 08:54:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:56:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:56:20 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22869 ) Change subject: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae Gerrit-Change-Number: 22869 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 08:56:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:56:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:56:40 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22870 ) Change subject: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 Gerrit-Change-Number: 22870 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 08:56:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:57:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:57:08 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: use strcmp() instead of strncmp() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22871 ) Change subject: gprs_ns2_vty: use strcmp() instead of strncmp() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 Gerrit-Change-Number: 22871 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 08:57:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:57:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:57:16 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add signalling & data weights for UDP binds In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22868 ) Change subject: gprs_ns2: add signalling & data weights for UDP binds ...................................................................... gprs_ns2: add signalling & data weights for UDP binds Allow to assign a signalling and data weight to UDP binds. Those weights will be used when doing dynamic configuration over IP-SNS. This is only the first part which only uses the assigned weights when doing a new SNS configuration. The outgoing change weight procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. Related: SYS#5354 Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M tests/gb/gprs_ns2_vty.vty 8 files changed, 74 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 1bf8c7f..07e6c45 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -215,6 +215,8 @@ const struct osmo_sockaddr *remote, struct gprs_ns2_nse *nse, uint16_t nsvci); +void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, + uint8_t signalling, uint8_t data); void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind); void gprs_ns2_free_binds(struct gprs_ns2_inst *nsi); diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index ca47934..99a7415 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1409,6 +1409,8 @@ return -ENOMEM; } + bind->sns_sig_weight = 1; + bind->sns_data_weight = 1; bind->nsi = nsi; INIT_LLIST_HEAD(&bind->nsvc); llist_add(&bind->list, &nsi->binding); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index ff95c81..88e352a 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -257,6 +257,11 @@ void (*dump_vty)(const struct gprs_ns2_vc_bind *bind, struct vty *vty, bool stats); + /*! the IP-SNS signalling weight when doing dynamic configuration */ + uint8_t sns_sig_weight; + /*! the IP-SNS data weight when doing dynamic configuration */ + uint8_t sns_data_weight; + struct osmo_stat_item_group *statg; }; @@ -352,6 +357,7 @@ const char *id); void ns2_sns_replace_nsvc(struct gprs_ns2_vc *nsvc); void ns2_sns_notify_alive(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, bool alive); +void ns2_sns_update_weights(struct gprs_ns2_vc_bind *bind); /* vc */ struct osmo_fsm_inst *ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc, diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 7b28754..d061eed 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -796,8 +796,8 @@ } ip4_elems->udp_port = sa->u.sin.sin_port; - ip4_elems->sig_weight = 2; - ip4_elems->data_weight = 1; + ip4_elems->sig_weight = bind->sns_sig_weight; + ip4_elems->data_weight = bind->sns_data_weight; ip4_elems++; } @@ -835,8 +835,8 @@ } ip6_elems->udp_port = sa->u.sin.sin_port; - ip6_elems->sig_weight = 2; - ip6_elems->data_weight = 1; + ip6_elems->sig_weight = bind->sns_sig_weight; + ip6_elems->data_weight = bind->sns_data_weight; ip6_elems++; } @@ -1810,6 +1810,14 @@ } } +/* Update SNS weights + * \param[in] nsvc the NSVC which should be updated + */ +void ns2_sns_update_weights(struct gprs_ns2_vc_bind *bind) +{ + /* TODO: implement weights after binds per sns implemented */ +} + /* initialize osmo_ctx on main tread */ static __attribute__((constructor)) void on_dso_load_ctx(void) { diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index e07f6d4..0f22458 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -104,6 +104,8 @@ } vty_out(vty, "UDP bind: %s:%d DSCP: %d%s", sockstr.ip, sockstr.port, priv->dscp, VTY_NEWLINE); + vty_out(vty, " IP-SNS signalling weight: %u data weight: %u%s", + bind->sns_sig_weight, bind->sns_data_weight, VTY_NEWLINE); vty_out(vty, " %lu NS-VC: %s", nsvcs, VTY_NEWLINE); llist_for_each_entry(nsvc, &bind->nsvc, blist) { @@ -567,3 +569,16 @@ return NULL; } + +/*! set the signalling and data weight for this bind + * \param[in] bind + * \param[in] signalling the signalling weight + * \param[in] data the data weight + */ +void gprs_ns2_ip_bind_set_sns_weight(struct gprs_ns2_vc_bind *bind, uint8_t signalling, uint8_t data) +{ + OSMO_ASSERT(gprs_ns2_is_ip_bind(bind)); + bind->sns_sig_weight = signalling; + bind->sns_data_weight = data; + ns2_sns_update_weights(bind); +} diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 3646080..55f88b1 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -66,6 +66,8 @@ int dscp; bool accept_ipaccess; bool accept_sns; + uint8_t ip_sns_sig_weight; + uint8_t ip_sns_data_weight; }; /* TODO: this should into osmo timer */ @@ -118,6 +120,8 @@ return NULL; } + vbind->ip_sns_sig_weight = 1; + vbind->ip_sns_data_weight = 1; llist_add(&vbind->list, &binds); return vbind; } @@ -328,6 +332,8 @@ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); + vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", + vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE); break; default: return; @@ -611,6 +617,34 @@ return CMD_SUCCESS; } +DEFUN(cfg_ns_bind_ip_sns_weight, cfg_ns_bind_ip_sns_weight_cmd, + "ip-sns signalling-weight <0-254> data-weight <0-254>", + "IP SNS\n" + "signalling weight used by IP-SNS dynamic configuration\n" + "signalling weight used by IP-SNS dynamic configuration\n" + "data weight used by IP-SNS dynamic configuration\n" + "data weight used by IP-SNS dynamic configuration\n") +{ + struct vty_bind *vbind = vty->index; + struct gprs_ns2_vc_bind *bind; + + int signalling = atoi(argv[0]); + int data = atoi(argv[1]); + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "ip-sns signalling-weight <0-254> data-weight <0-254> can be only used with UDP bind%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + vbind->ip_sns_data_weight = data; + vbind->ip_sns_sig_weight = signalling; + bind = gprs_ns2_bind_by_name(vty_nsi, vbind->name); + if (bind) + gprs_ns2_ip_bind_set_sns_weight(bind, signalling, data); + + return CMD_SUCCESS; +} DEFUN(cfg_ns_bind_fr, cfg_ns_bind_fr_cmd, "fr NETIF (fr|frnet)", @@ -1686,6 +1720,7 @@ install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_dscp_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_dscp_cmd); + install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_ip_sns_weight_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_ipaccess_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_ipaccess_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_fr_cmd); diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index a3171d0..7da11cd 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -158,6 +158,7 @@ gprs_ns2_ip_bind; gprs_ns2_ip_bind_by_sockaddr; gprs_ns2_ip_bind_set_dscp; +gprs_ns2_ip_bind_set_sns_weight; gprs_ns2_ip_bind_sockaddr; gprs_ns2_ip_connect; gprs_ns2_ip_connect2; diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index 397ec26..a748f13 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -30,4 +30,5 @@ OsmoNSdummy(config-ns-bind)# end OsmoNSdummy# show ns UDP bind: 127.0.0.14:42999 DSCP: 0 + IP-SNS signalling weight: 1 data weight: 1 0 NS-VC: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5133e4229377d44772a9af28628a2bc420fea34b Gerrit-Change-Number: 22868 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 08:58:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 08:58:36 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 2 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 08:58:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:00:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:00:00 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused log categories In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863/1/src/debug.h File src/debug.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863/1/src/debug.h at a12 PS1, Line 12: DPAG we could use DPAG for paging related handling ing gbproxy, but not sure if it's worth it? -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:00:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:00:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:00:35 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 ) Change subject: Move vty node into gbproxy_vty.c ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864/2/src/gb_proxy_vty.c File src/gb_proxy_vty.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864/2/src/gb_proxy_vty.c at 67 PS2, Line 67: enum bsc_vty_node { bsc? I think we could probably rename it, too. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:00:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:00:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:00:40 +0000 Subject: Change in osmo-gbproxy[master]: Remove trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 ) Change subject: Remove trailing whitespace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 Gerrit-Change-Number: 22865 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:00:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:00:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:00:58 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 ) Change subject: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564 Gerrit-Change-Number: 22875 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:00:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:02:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:02:23 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add MTU field for BSSGP ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/2/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/2/include/osmocom/sgsn/gb_proxy.h at 25 PS2, Line 25: DEFAULT_NSE_MTU see my feedback to lynxis' patches. The _information_ field maximum length is specified as 1600 bytes. the control/address fields (headers) are outside / in addition to the 1600 bytes. So only the NS-UNITDATA header or anything above FR should be subtracted, not the FR header itself. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:02:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:02:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:02:59 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 ) Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 09:02:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:06:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:06:23 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Add MTU support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Add MTU support ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22873/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22873/1//COMMIT_MSG at 5 PS1, Line 5: CommitDate: 2021-02-12 03:33:30 +0100 I think we should somehow specify what it means specifically. Does this track the maximum BSSGP payload size, or does it include the NS header? I would think it makes sense for the BSSGP layer to direclty only care with the size of its own messages, and not have to know how much overhead NS or any other layers below add. So maye consider renaming it to something != MTU (as that always has that "ethernet" notion of being the physical transport size MTU) and have something like max_bssgp_size or the like. In any case, ther are many options. The importance of my message is that the code should contain a clear definition (in comment / api doc / ...) what exact size including/excluding which headers at what layer is specified. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:06:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:08:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:08:39 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS to MTU if necessary In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS to MTU if necessary ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22874/1/src/gb/gprs_bssgp2.c File src/gb/gprs_bssgp2.c: https://gerrit.osmocom.org/c/libosmocore/+/22874/1/src/gb/gprs_bssgp2.c at 243 PS1, Line 243: ori if you would swap the two lines above, you could use TVLV_GROSS_LEN(orig_len) instead of calling msgb_bssgp_len() twice. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 09:08:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:08:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:08:53 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 ) Change subject: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Gerrit-Change-Number: 22866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:08:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:09:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:09:08 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 09:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:09:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:09:54 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 09:09:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:10:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:10:24 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 09:10:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:11:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:11:01 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 09:11:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:11:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:11:35 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 09:11:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:27:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:27:01 +0000 Subject: Change in osmo-bts[master]: l1sap: fix repeated_dl_facch_active_decision() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22860 ) Change subject: l1sap: fix repeated_dl_facch_active_decision() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id4ab101d52f419583c4f4c8a6cf69af6c9097d25 Gerrit-Change-Number: 22860 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:27:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:30:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:30:13 +0000 Subject: Change in osmo-bts[master]: l1sap.c: be sure that FACCH repetition is turned off In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22861 ) Change subject: l1sap.c: be sure that FACCH repetition is turned off ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Gerrit-Change-Number: 22861 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:30:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:30:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:30:19 +0000 Subject: Change in osmo-bts[master]: l1sap: fix repeated_dl_facch_active_decision() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22860 ) Change subject: l1sap: fix repeated_dl_facch_active_decision() ...................................................................... l1sap: fix repeated_dl_facch_active_decision() The function checks meas_res->rxqual_sub against the lower threshold value in order to decide when to turn FACCH repetition off. This is not correct. It should compare against rxqual instead. Change-Id: Id4ab101d52f419583c4f4c8a6cf69af6c9097d25 Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 1542c8a..b6970f4 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1025,7 +1025,7 @@ if (rxqual >= upper) lchan->repeated_dl_facch_active = true; - else if (meas_res->rxqual_sub <= lower) + else if (rxqual <= lower) lchan->repeated_dl_facch_active = false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id4ab101d52f419583c4f4c8a6cf69af6c9097d25 Gerrit-Change-Number: 22860 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:32:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:32:18 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that UL-SACCH repetition is turned off In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22862 ) Change subject: l1sap: be sure that UL-SACCH repetition is turned off ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76a841514eb955b93f2114470b2c80402cf6883c Gerrit-Change-Number: 22862 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:32:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:32:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:32:22 +0000 Subject: Change in osmo-bts[master]: l1sap.c: be sure that FACCH repetition is turned off In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22861 ) Change subject: l1sap.c: be sure that FACCH repetition is turned off ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Gerrit-Change-Number: 22861 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 09:32:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:32:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:32:26 +0000 Subject: Change in osmo-bts[master]: l1sap.c: be sure that FACCH repetition is turned off In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22861 ) Change subject: l1sap.c: be sure that FACCH repetition is turned off ...................................................................... l1sap.c: be sure that FACCH repetition is turned off At the beginning of repeated_dl_facch_active_decision() the ACCH repetition capabilitiy flags (command only or all LAPDM frames) are tested. If no FACCH repetition is enabled, the function exists. However, we should also make sure that the struct memeber that enables FACCH repetition on the lower level is set to false as well. Normally that should be the case because it was never set to true before, but it is better to be sure. Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b6970f4..3de76ab 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -980,9 +980,15 @@ uint8_t lower; uint8_t rxqual; + /* This is an optimization so that we exit as quickly as possible if + * there are no FACCH repetition capabilities present. However If the + * repeated FACCH capabilities vanish for whatever reason, we must be + * sure that FACCH repetition is disabled. */ if (!lchan->repeated_acch_capability.dl_facch_cmd - && !lchan->repeated_acch_capability.dl_facch_all) + && !lchan->repeated_acch_capability.dl_facch_all) { + lchan->repeated_dl_facch_active = false; return; + } /* Threshold disabled (always on) */ if (lchan->repeated_acch_capability.rxqual == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id07091cc89352281b41532d583a8bc004477c71a Gerrit-Change-Number: 22861 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:32:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:32:26 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that UL-SACCH repetition is turned off In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22862 ) Change subject: l1sap: be sure that UL-SACCH repetition is turned off ...................................................................... l1sap: be sure that UL-SACCH repetition is turned off At the beginning of repeated_ul_sacch_active_decision() The UL-SACCH repetition capability is tested. If no UL-SACCH repetition is enabled the function exits. However, we should also make sure that the struct member that enabled UL-SACCH repetition on the lower level is set to false as well. Normally that should be the case because it was never set to true before, but it is better to be sure. Change-Id: I76a841514eb955b93f2114470b2c80402cf6883c Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 3de76ab..97dd661 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1427,8 +1427,14 @@ uint16_t upper = 0; uint16_t lower = 0; - if (!lchan->repeated_acch_capability.ul_sacch) + /* This is an optimization so that we exit as quickly as possible if + * there are no uplink SACCH repetition capabilities present. + * However If the repeated UL-SACCH capabilities vanish for whatever + * reason, we must be sure that UL-SACCH repetition is disabled. */ + if (!lchan->repeated_acch_capability.ul_sacch) { + lchan->repeated_ul_sacch_active = false; return; + } /* Threshold disabled (repetition is always on) */ if (lchan->repeated_acch_capability.rxqual == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76a841514eb955b93f2114470b2c80402cf6883c Gerrit-Change-Number: 22862 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:37:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:37:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22869 ) Change subject: gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer ...................................................................... gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer gettimeofday can jump and the comment says it should not be used for elapsed timer. Related: OS#4997 Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 66ee450..88ce8ae 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -70,7 +70,7 @@ struct osmo_timer_list timer; enum ns2_timeout mode; int N; - struct timeval timer_started; + struct timespec timer_started; } alive; }; @@ -155,7 +155,7 @@ priv->alive.mode = NS_TOUT_TNS_ALIVE; priv->alive.N = 0; - osmo_gettimeofday(&priv->alive.timer_started, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started); ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); } @@ -167,11 +167,15 @@ static int alive_timer_elapsed_ms(struct gprs_ns2_vc_priv *priv) { - struct timeval now, elapsed; - osmo_gettimeofday(&now, NULL); - timersub(&now, &priv->alive.timer_started, &elapsed); + struct timespec now, elapsed; - return 1000 * elapsed.tv_sec + elapsed.tv_usec / 1000; + if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) != 0) + return 0; + + timespecsub(&now, &priv->alive.timer_started, &elapsed); + LOGNSVC(priv->nsvc, LOGL_ERROR, "elapsed: %ld, now: %ld, saved: %ld.\n", + elapsed.tv_sec, now.tv_sec, priv->alive.timer_started.tv_sec); + return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000); } static void recv_test_procedure(struct osmo_fsm_inst *fi) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae Gerrit-Change-Number: 22869 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:37:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:37:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22870 ) Change subject: gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime ...................................................................... gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime The alive elapsed timeout was only set once on the start of the test procedure but not every time an ALIVE PDU was sent. Fixes: OS#4997 Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 88ce8ae..31cfb51 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -205,6 +205,7 @@ case NS_TOUT_TNS_TEST: priv->alive.mode = NS_TOUT_TNS_ALIVE; priv->alive.N = 0; + osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started); ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I029696dfff21919f97ac4c33cdd82162b5ab1555 Gerrit-Change-Number: 22870 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 09:37:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 09:37:52 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: use strcmp() instead of strncmp() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22871 ) Change subject: gprs_ns2_vty: use strcmp() instead of strncmp() ...................................................................... gprs_ns2_vty: use strcmp() instead of strncmp() Otherwise substring wouldn't be detected. E.g. local vs local2 Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 55f88b1..0a0a5d3 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -102,7 +102,7 @@ { struct vty_bind *vbind; llist_for_each_entry(vbind, &binds, list) { - if (!strncmp(vbind->name, name, strlen(vbind->name))) + if (!strcmp(vbind->name, name)) return vbind; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I183b5176a1d8a295b7551ad186b3565adeb3d5e7 Gerrit-Change-Number: 22871 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:13:57 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:13:57 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS to MTU if necessary In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS to MTU if necessary ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22874/1/src/gb/gprs_bssgp2.c File src/gb/gprs_bssgp2.c: https://gerrit.osmocom.org/c/libosmocore/+/22874/1/src/gb/gprs_bssgp2.c at 243 PS1, Line 243: ori > if you would swap the two lines above, you could use TVLV_GROSS_LEN(orig_len) instead of calling msg [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 11:13:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:14:07 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:14:07 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length In-Reply-To: References: Message-ID: Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22873 to look at the new patch set (#2). Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length ...................................................................... bssgp_bvc_fsm: Set/get maximum BSSGP PDU length Add functions to get/set the maximum supported BSSGP PDU size by the NS layer. IPv4 and IPv6 should not matter since we can just enable IP fragmentation and send NS PDUs up to 2**16 + bytes. Frame relay does not support fragmentation and this is the reason we need to be aware of the maximum PDU size. Luckily with 1600 bytes the MTU in frame relay can hold a regular IP packet including NS/BSSGP overhead. On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA (3GPP TS 48.016 Ch. 9.2.10) Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Related: OS#4889 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c M src/gb/libosmogb.map 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/22873/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:14:07 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:14:07 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22874 to look at the new patch set (#2). Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length ...................................................................... bssgp2_enc_status: Truncate STATUS message to maximum PDU length Related: OS#4889 Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a --- M include/osmocom/gprs/gprs_bssgp2.h M src/gb/bssgp_bvc_fsm.c M src/gb/gprs_bssgp2.c 3 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/22874/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:18:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 11:18:20 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 11:18:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:18:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 11:18:55 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 12 Feb 2021 11:18:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:26:07 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:26:07 +0000 Subject: Change in libosmocore[master]: ns2: Fix incompatible VTY configs when writing config References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22878 ) Change subject: ns2: Fix incompatible VTY configs when writing config ...................................................................... ns2: Fix incompatible VTY configs when writing config It seems like we still don't have NS2 VTY tests running in libosmocore so this only got caught once osmo-sgsn/osmo-gbproxy builds failed. Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Related: OS#4887 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/22878/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 0a0a5d3..7a6b3ba 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -332,7 +332,7 @@ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); - vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", + vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE); break; default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Gerrit-Change-Number: 22878 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:51:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:51:09 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 2 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:51:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:51:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:51:27 +0000 Subject: Change in libgtpnl[master]: install gtp-tunnel and gtp-link tools In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/22843 ) Change subject: install gtp-tunnel and gtp-link tools ...................................................................... install gtp-tunnel and gtp-link tools This eases quick setup for demonstration purposes. Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df --- M contrib/libgtpnl.spec.in M debian/control A debian/libgtpnl-tools.install M tools/Makefile.am 4 files changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/contrib/libgtpnl.spec.in b/contrib/libgtpnl.spec.in index 8453612..0399d5d 100644 --- a/contrib/libgtpnl.spec.in +++ b/contrib/libgtpnl.spec.in @@ -51,6 +51,18 @@ This subpackage contains libraries and header files for developing applications that want to make use of libgtpnl. +%package tools +Summary: Libgtpnl user tools +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Group: Applications/System +Requires: libgtpnl0 = %{version} + +%description tools +libgtpnl wraps the genetlink-based GPRS tunnel configuration of the +Linux kernel into a C API. + +This subpackage contains sample tools to manage gtp interfaces and tunnels. + %prep %setup -q @@ -79,4 +91,8 @@ %{_libdir}/libgtpnl.so %{_libdir}/pkgconfig/*.pc +%files tools +%{_bindir}/gtp-link +%{_bindir}/gtp-tunnel + %changelog diff --git a/debian/control b/debian/control index 3128f3e..5c8ed03 100644 --- a/debian/control +++ b/debian/control @@ -43,3 +43,12 @@ Depends: libgtpnl0 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for Linux kernel GTP-U netlink library + +Package: libgtpnl-tools +Architecture: any +Multi-Arch: same +Section: net +Priority: extra +Depends: libgtpnl0 (= ${binary:Version}), + ${misc:Depends} +Description: Tools to manage gtp interfaces and tunnels. diff --git a/debian/libgtpnl-tools.install b/debian/libgtpnl-tools.install new file mode 100644 index 0000000..49983e4 --- /dev/null +++ b/debian/libgtpnl-tools.install @@ -0,0 +1,2 @@ +/usr/bin/gtp-link +/usr/bin/gtp-tunnel diff --git a/tools/Makefile.am b/tools/Makefile.am index ec2eb66..7beae57 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Make_global.am -noinst_PROGRAMS = gtp-link \ +bin_PROGRAMS = gtp-link \ gtp-tunnel gtp_link_SOURCES = gtp-link.c -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/22843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I674c463989bc1529bfe132b7ec0df7a0052169df Gerrit-Change-Number: 22843 Gerrit-PatchSet: 2 Gerrit-Owner: Gabriel Ganne Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:51:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:51:53 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused log categories In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:51:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:53:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:53:15 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:53:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:53:52 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:53:52 +0000 Subject: Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg ...................................................................... tests/gb: Add more complex osmo-ns-dummy.cfg write config will not print out any configuration for bind/nse unless we configure some. This way we can catch more issues with incompatible configs such as https://gerrit.osmocom.org/c/libosmocore/+/22878 Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Related: OS#4887 --- M tests/gb/osmo-ns-dummy.cfg 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/22879/1 diff --git a/tests/gb/osmo-ns-dummy.cfg b/tests/gb/osmo-ns-dummy.cfg index e69de29..1e6dc76 100644 --- a/tests/gb/osmo-ns-dummy.cfg +++ b/tests/gb/osmo-ns-dummy.cfg @@ -0,0 +1,24 @@ +! +! OsmoNSdummy (1.4.0.495-64db) configuration saved from vty +!! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 + bind udp local + listen 127.0.0.1 2158 + accept-ipaccess + ip-sns signalling-weight 1 data-weight 1 + nse 1236 + nsvc ipa local 127.0.0.4 23000 nsvci 101 + nse 1235 + nsvc udp local 127.0.0.3 23000 + nse 1234 + ip-sns-remote 127.0.0.2 2158 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:54:24 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:54:24 +0000 Subject: Change in libosmocore[master]: ns2: Fix incompatible VTY configs when writing config In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22878 ) Change subject: ns2: Fix incompatible VTY configs when writing config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Gerrit-Change-Number: 22878 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 11:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:54:31 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 11:54:31 +0000 Subject: Change in libosmocore[master]: ns2: Fix incompatible VTY configs when writing config In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22878 ) Change subject: ns2: Fix incompatible VTY configs when writing config ...................................................................... ns2: Fix incompatible VTY configs when writing config It seems like we still don't have NS2 VTY tests running in libosmocore so this only got caught once osmo-sgsn/osmo-gbproxy builds failed. Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Related: OS#4887 --- M src/gb/gprs_ns2_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 0a0a5d3..7a6b3ba 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -332,7 +332,7 @@ vty_out(vty, " accept-ipaccess%s", VTY_NEWLINE); if (vbind->dscp) vty_out(vty, " dscp %u%s", vbind->dscp, VTY_NEWLINE); - vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", + vty_out(vty, " ip-sns signalling-weight %u data-weight %u%s", vbind->ip_sns_sig_weight, vbind->ip_sns_data_weight, VTY_NEWLINE); break; default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3cd407b05457a4703ee38c4b1b1b65800bbd30e Gerrit-Change-Number: 22878 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:55:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:55:25 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 2: I think using the params you suggest is inconsistent with most of the other protocol commands, but feel free to merge if you still consider this is better, I'm not going to block it. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:55:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:56:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:56:36 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:56:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:57:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:57:18 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... Patch Set 2: letting Hoernchen add the +2 here -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:57:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 11:59:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 11:59:01 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 11:59:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 12:03:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 12:03:04 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:03:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 12:04:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 12:04:30 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:04:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 12:05:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 12:05:00 +0000 Subject: Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:05:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 12:49:45 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 12 Feb 2021 12:49:45 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:49:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 12:52:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 12:52:36 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 12:52:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 13:02:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 13:02:51 +0000 Subject: Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 13:02:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 13:02:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 13:02:53 +0000 Subject: Change in libosmocore[master]: tests/gb: Add more complex osmo-ns-dummy.cfg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22879 ) Change subject: tests/gb: Add more complex osmo-ns-dummy.cfg ...................................................................... tests/gb: Add more complex osmo-ns-dummy.cfg write config will not print out any configuration for bind/nse unless we configure some. This way we can catch more issues with incompatible configs such as https://gerrit.osmocom.org/c/libosmocore/+/22878 Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Related: OS#4887 --- M tests/gb/osmo-ns-dummy.cfg 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/gb/osmo-ns-dummy.cfg b/tests/gb/osmo-ns-dummy.cfg index e69de29..1e6dc76 100644 --- a/tests/gb/osmo-ns-dummy.cfg +++ b/tests/gb/osmo-ns-dummy.cfg @@ -0,0 +1,24 @@ +! +! OsmoNSdummy (1.4.0.495-64db) configuration saved from vty +!! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 + bind udp local + listen 127.0.0.1 2158 + accept-ipaccess + ip-sns signalling-weight 1 data-weight 1 + nse 1236 + nsvc ipa local 127.0.0.4 23000 nsvci 101 + nse 1235 + nsvc udp local 127.0.0.3 23000 + nse 1234 + ip-sns-remote 127.0.0.2 2158 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iad422ee013c82a6cb96af8ce4eb3af8b0936a4c9 Gerrit-Change-Number: 22879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 13:17:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 13:17:34 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 2: > Patch Set 2: > > I think using the params you suggest is inconsistent with most of the other protocol commands, but feel free to merge if you still consider this is better, I'm not going to block it. I also find it inconsistent with the existing commands, but similarly don't think it's an absolute blocker -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 13:17:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 13:44:08 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 13:44:08 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to neighbor_ident.c In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to neighbor_ident.c ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 13:44:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 13:47:47 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 13:47:47 +0000 Subject: Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22814 ) Change subject: Fix neigh resolution service on local neighbours ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 13:47:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:00:56 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:00:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 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: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 Gerrit-Change-Number: 22829 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 14:00:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:04:25 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:04:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 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: I68c749aaabe9fe8272fc43045be09a46852359e5 Gerrit-Change-Number: 22842 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 14:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:10:02 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:10:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 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: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 14:10:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:17:05 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:17:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn at 4285 PS1, Line 4285: cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); I know next to nothing of NACC but it seems to me like you could refactor the code above into a separate nacc_init function or similar. The tests in the following commit could also use it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 14:17:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:18:27 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:18:27 +0000 Subject: Change in osmo-gbproxy[master]: Remove trailing whitespace In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 ) Change subject: Remove trailing whitespace ...................................................................... Remove trailing whitespace Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 --- M src/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 43d819d..34e63e3 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: If8fe9e65056e458e946ff202cf7ae93efc8abf17 Gerrit-Change-Number: 22865 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:18:28 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:18:28 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 ) Change subject: gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse ...................................................................... gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse Use the function provided by bssgp2 instead of setting up the ns2 prim request ourself. Related: OS#4889 Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564 --- M src/gb_proxy.c 1 file changed, 3 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 34e63e3..8b57315 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -185,17 +185,13 @@ /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ struct gprs_ns2_inst *nsi = nse->cfg->nsi; - struct osmo_gprs_ns2_prim nsp = {}; struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2nse"); - uint32_t tlli; + uint32_t tlli = 0; int rc; DEBUGP(DGPRS, "NSE(%05u/%s)-BVC(%05u/??) proxying to NSE(%05u/%s)\n", msgb_nsei(msg), !nse->sgsn_facing ? "SGSN" : "BSS", ns_bvci, nse->nsei, nse->sgsn_facing ? "SGSN" : "BSS"); - nsp.bvci = ns_bvci; - nsp.nsei = nse->nsei; - /* Strip the old NS header, it will be replaced with a new one */ strip_ns_hdr(msg); @@ -204,12 +200,9 @@ * all BSSGP UNITDATA PDUs related to an MS shall be passed with * the same LSP, e.g. the LSP contains the MS's TLLI, to the * underlying network service. */ - if (gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli) == 1) - nsp.u.unitdata.link_selector = tlli; + gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli); - osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, - PRIM_OP_REQUEST, msg); - rc = gprs_ns2_recv_prim(nsi, &nsp.oph); + rc = bssgp2_nsi_tx_ptp(nsi, nse->nsei, ns_bvci, msg, tlli); /* FIXME: We need a counter group for gbproxy_nse */ //if (rc < 0) // rate_ctr_inc(&bvc->ctrg->ctr[GBPROX_PEER_CTR_TX_ERR]); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0b8926eb903ed972edb2ed7ba3edbb3d77889564 Gerrit-Change-Number: 22875 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:19:21 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:19:21 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length ...................................................................... bssgp_bvc_fsm: Set/get maximum BSSGP PDU length Add functions to get/set the maximum supported BSSGP PDU size by the NS layer. IPv4 and IPv6 should not matter since we can just enable IP fragmentation and send NS PDUs up to 2**16 + bytes. Frame relay does not support fragmentation and this is the reason we need to be aware of the maximum PDU size. Luckily with 1600 bytes the MTU in frame relay can hold a regular IP packet including NS/BSSGP overhead. On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA (3GPP TS 48.016 Ch. 9.2.10) Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Related: OS#4889 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c M src/gb/libosmogb.map 3 files changed, 28 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h b/include/osmocom/gprs/bssgp_bvc_fsm.h index e69c205..824cdec 100644 --- a/include/osmocom/gprs/bssgp_bvc_fsm.h +++ b/include/osmocom/gprs/bssgp_bvc_fsm.h @@ -64,3 +64,6 @@ uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi); uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi); uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi); + +void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t max_pdu_len); +uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi); \ No newline at end of file diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index 6b8bd14..d2ee146 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -116,6 +116,8 @@ /* NSEI of the underlying NS Entity */ uint16_t nsei; + /* Maximum size of the BSSGP PDU */ + uint16_t max_pdu_len; /* BVCI of this BVC */ uint16_t bvci; @@ -666,6 +668,7 @@ bfp->role_sgsn = role_sgsn; bfp->nsei = nsei; bfp->bvci = bvci; + bfp->max_pdu_len = UINT16_MAX; return fi; } @@ -817,6 +820,26 @@ return bfp->features.negotiated; } +/*! Set the maximum size of a BSSGP PDU. + *! On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA (3GPP TS 48.016 Ch. 9.2.10) */ +void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t max_pdu_len) { + struct bvc_fsm_priv *bfp = fi->priv; + + OSMO_ASSERT(fi->fsm == &bssgp_bvc_fsm); + bfp->max_pdu_len = max_pdu_len; +} + +/*! Return the maximum size of a BSSGP PDU + *! On the NS layer this corresponds to the size of an NS SDU in NS-UNITDATA (3GPP TS 48.016 Ch. 9.2.10) */ +uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi) +{ + const struct bvc_fsm_priv *bfp = fi->priv; + + OSMO_ASSERT(fi->fsm == &bssgp_bvc_fsm); + return bfp->max_pdu_len; +} + + static __attribute__((constructor)) void on_dso_load_bvc_fsm(void) { OSMO_ASSERT(osmo_fsm_register(&bssgp_bvc_fsm) == 0); diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 7da11cd..2327815 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -96,6 +96,8 @@ bssgp_bvc_get_features_advertised; bssgp_bvc_get_features_received; bssgp_bvc_get_features_negotiated; +bssgp_bvc_fsm_set_max_pdu_len; +bssgp_bvc_fsm_get_max_pdu_len; osmo_fr_network_alloc; osmo_fr_link_alloc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:19:21 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 14:19:21 +0000 Subject: Change in libosmocore[master]: bssgp2_enc_status: Truncate STATUS message to maximum PDU length In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22874 ) Change subject: bssgp2_enc_status: Truncate STATUS message to maximum PDU length ...................................................................... bssgp2_enc_status: Truncate STATUS message to maximum PDU length Related: OS#4889 Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a --- M include/osmocom/gprs/gprs_bssgp2.h M src/gb/bssgp_bvc_fsm.c M src/gb/gprs_bssgp2.c 3 files changed, 17 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/gprs_bssgp2.h b/include/osmocom/gprs/gprs_bssgp2.h index bf814cb..3b5b6e8 100644 --- a/include/osmocom/gprs/gprs_bssgp2.h +++ b/include/osmocom/gprs/gprs_bssgp2.h @@ -59,7 +59,7 @@ struct msgb *bssgp2_enc_bvc_reset_ack(uint16_t bvci, const struct gprs_ra_id *ra_id, uint16_t cell_id, const uint8_t *feat_bm, const uint8_t *ext_feat_bm); -struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg); +struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg, uint16_t max_pdu_len); int bssgp2_dec_fc_bvc(struct bssgp2_flow_ctrl *fc, const struct tlv_parsed *tp); diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index d2ee146..a035938 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -238,7 +238,7 @@ if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) bvci = &bfp->bvci; - tx = bssgp2_enc_status(cause, bvci, rx); + tx = bssgp2_enc_status(cause, bvci, rx, bfp->max_pdu_len); if (msgb_bvci(rx) == 0) fi_tx_sig(fi, tx); diff --git a/src/gb/gprs_bssgp2.c b/src/gb/gprs_bssgp2.c index 0f519ad..8e2ba66 100644 --- a/src/gb/gprs_bssgp2.c +++ b/src/gb/gprs_bssgp2.c @@ -217,8 +217,9 @@ /*! Encode BSSGP STATUS PDU as per TS 48.018 Section 10.4.14. * \param[in] cause BSSGP Cause value * \param[in] bvci optional BVCI - only encoded if non-NULL - * \param[in] msg optional message buffer containing PDU in error - only encoded if non-NULL */ -struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg) + * \param[in] msg optional message buffer containing PDU in error - only encoded if non-NULL + * \param[in] max_pdu_len Maximum BSSGP PDU size the NS layer accepts */ +struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const struct msgb *orig_msg, uint16_t max_pdu_len) { struct msgb *msg = bssgp_msgb_alloc(); struct bssgp_normal_hdr *bgph; @@ -229,12 +230,22 @@ bgph = (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph)); bgph->pdu_type = BSSGP_PDUT_STATUS; msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause); + /* FIXME: Require/encode BVCI only if cause is BVCI unknown/blocked + * See 3GPP TS 48.018 Ch. 10.4.14 */ if (bvci) { uint16_t _bvci = osmo_htons(*bvci); msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); } - if (orig_msg) - msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR, msgb_bssgp_len(orig_msg), msgb_bssgph(orig_msg)); + if (orig_msg) { + uint32_t orig_len, max_orig_len; + /* Calculate how big the reply would be: the BSSGP msg so far + size of the PDU IN ERROR including tvl */ + orig_len = msgb_bssgp_len(orig_msg); + max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(orig_len); + /* Truncate the difference between max_orig_len and mtu */ + if (max_orig_len > max_pdu_len) + orig_len -= max_orig_len - max_pdu_len; + msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR, orig_len, msgb_bssgph(orig_msg)); + } return msg; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic39d918c56399ceb0431299ce938e3bf276f678a Gerrit-Change-Number: 22874 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:40:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 14:40:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn at 4285 PS1, Line 4285: cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); > I know next to nothing of NACC but it seems to me like you could refactor the code above into a sepa [?] I already thought about it but in general most of the stuf above is already test specific stuff like initing different parts for the test (RLCMAC, BSSGP, etc.) and hence it's not something really to be applied for this bunch of new tests but to most of the tests, so I'd leave it for a different patch. Moreover, one finds that some variables here are later on used by the code below, so it also makes some stuff more complex because then one needs to retrieve the variable back from the new propose _nacc_init function. Also some nacc test have slight differences here since for instance the neigh cache is initialized differently on some tests. So I'm not sure it's a super benefit, and in any case I think it can be done at a later step for all tests in general if required. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 14:40:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:40:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 14:40:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans ...................................................................... pcu: Introduce tests checking Pkt Cell Chg Notif dup retrans Tests verify dup retrans triggered by MS timer are ignored if the target cell is still the same (and hence no logic/behavior change is required, current process can proceed onwards). Related: SYS#4909 Change-Id: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 --- M pcu/PCU_Tests.ttcn 1 file changed, 219 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 0b887db..f7687f5 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -57,6 +57,7 @@ import from StatsD_Checker all; import from IPA_Emulation all; +import from Osmocom_CTRL_Types all; import from Osmocom_CTRL_Adapter all; import from Osmocom_CTRL_Functions all; @@ -3611,6 +3612,55 @@ return; } +private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) +runs on RAW_PCU_Test_CT { + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), + info_ind.lac), + info_ind.rac), + info_ind.cell_id)); + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ + 423), + 2), + 5)); + var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); + var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); + var template (value) RAN_Information_RIM_Container res_cont := + ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), + ts_RIM_Sequence_Number(2), + ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), + ts_RIM_Protocol_Version_Number(1), + tsu_ApplContainer_or_ApplErrContainer_NACC(tsu_ApplContainer_NACC(dst, false, 3, si_default)), + omit); + RIM.send(ts_PDU_BSSGP_RAN_INFORMATION(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + res_cont)); +} + +altstep as_outbound_nacc_rim_resolve(PCUIF_info_ind info_ind, boolean do_answer := true, boolean do_repeat := false) +runs on RAW_PCU_Test_CT { + /* RIM procedure: */ + var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), + info_ind.lac), + info_ind.rac), + info_ind.cell_id)); + var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ + 423), + 2), + 5)); + var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); + var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); + [] RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), + tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), + tr_RAN_Information_Request_RIM_Container)) { + if (do_answer) { + f_outbound_nacc_rim_tx_resp(info_ind); + } + if (do_repeat) { + repeat; + } + } +} + /* Start NACC from MS side */ private function f_outbound_nacc_success(inout GprsMS ms, PCUIF_info_ind info_ind, boolean exp_rac_ci_query := true, boolean exp_si_query := true, @@ -3639,29 +3689,7 @@ if (exp_si_query == true) { /* RIM procedure: */ - var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */ - info_ind.lac), - info_ind.rac), - info_ind.cell_id)); - var BssgpCellId dst := valueof(ts_BssgpCellId(ts_RAI(ts_LAI('023F43'H, /* Decided by test itself (emulating BSC) */ - 423), - 2), - 5)); - var RIM_Routing_Address src_addr := valueof(t_RIM_Routing_Address_cid(src)); - var RIM_Routing_Address dst_addr := valueof(t_RIM_Routing_Address_cid(dst)); - var template (value) RAN_Information_RIM_Container res_cont; - res_cont := ts_RAN_Information_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), - ts_RIM_Sequence_Number(2), - ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), - ts_RIM_Protocol_Version_Number(1), - tsu_ApplContainer_or_ApplErrContainer_NACC(tsu_ApplContainer_NACC(dst, false, 3, si_default)), - omit); - RIM.receive(tr_RAN_INFORMATION_REQUEST(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), - tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), - tr_RAN_Information_Request_RIM_Container)); - RIM.send(ts_PDU_BSSGP_RAN_INFORMATION(ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), - ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, dst_addr), - res_cont)); + as_outbound_nacc_rim_resolve(info_ind); } /* Announce SI back to MS, continue NACC procedure */ @@ -4119,6 +4147,172 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notify twice (duplicate msg) while waiting for CTRL resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl; + /* Before receiving CTRL response, MS retransmits Pkt cell Chg Notif */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + IPA_CTRL.send(ts_CtrlMsgGetRepl(rx_ctrl.cmd.id, valueof(ctrl_var), valueof("023-43-423-2-5"))); + timer T := 2.0; + T.start; + alt { + [] as_outbound_nacc_rim_resolve(info_ind, do_repeat := true); + [] IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl { + setverdict(fail, "Received unexpected CTRL resolution after duplicate Pkt Cell Change Notification:", rx_ctrl); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(pass); + } + } + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + +/* Test MS sending Pkt Cell Change Notify twice (duplicate msg) while waiting for SI resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup2() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + as_outbound_nacc_rim_resolve(info_ind, do_answer := false); + /* Before receiving RIM response, MS retransmits Pkt cell Chg Notif */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + f_outbound_nacc_rim_tx_resp(info_ind); + timer T := 1.0; + T.start; + alt { + [] RIM.receive { + setverdict(fail, "Received unexpected RIM message"); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(pass); + } + } + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -4346,6 +4540,8 @@ execute( TC_nacc_outbound_rac_ci_resolve_timeout() ); execute( TC_nacc_outbound_rac_ci_resolve_fail_parse_response() ); execute( TC_nacc_outbound_si_resolve_timeout() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup2() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22829 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: I00e8c1a63392bf8753f58f7d9d2d0e903ac5c529 Gerrit-Change-Number: 22829 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:40:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 14:40:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 ) Change subject: pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans ...................................................................... pcu: Introduce tests checking Pkt Cell Chg Notif different msg retrans Tests verify MS retransmitting a Pkt cell Chg Notif with different target cell (hence a different NACC procedure) will be handled correctly if PCU state was in the middle of handling a different NACC request. Related: SYS#4909 Change-Id: I68c749aaabe9fe8272fc43045be09a46852359e5 --- M pcu/PCU_Tests.ttcn 1 file changed, 170 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index f7687f5..cd7a4ec 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4313,6 +4313,174 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) + * while waiting for CTRL resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + IPA_CTRL.receive(tr_CtrlMsgGet(?, ctrl_var)) -> value rx_ctrl; + /* Before receiving CTRL response, MS retransmits Pkt cell Chg Notif with different tgt arfcn */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + IPA_CTRL.send(ts_CtrlMsgGetRepl(rx_ctrl.cmd.id, valueof(ctrl_var), valueof("023-43-423-2-5"))); + /* We should now receive a 2nd CTRL request with the new ARFCN+BSIC */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + + /* And finally everything continues as usual with RIN procedure */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + +/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) + * while waiting for SI resolution */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice2() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + as_outbound_nacc_rim_resolve(info_ind, do_answer := false); + /* Before receiving RIM response, MS retransmits Pkt cell Chg Notif with different tgt cell: */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + f_sleep(0.2); /* let some time to avoid race conditons between CTRL and RLCMAC */ + f_outbound_nacc_rim_tx_resp(info_ind); + + /* As a result, CTRL + RIM resolution for new tgt cell should now be done: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + + /* And finally everything continues as usual with RIN procedure */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -4542,6 +4710,8 @@ execute( TC_nacc_outbound_si_resolve_timeout() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup2() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice2() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22842 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: I68c749aaabe9fe8272fc43045be09a46852359e5 Gerrit-Change-Number: 22842 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:56:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 14:56:55 +0000 Subject: Change in docker-playground[master]: ttcn3: use REGISTRY arg with debian-stretch-titan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22854 ) Change subject: ttcn3: use REGISTRY arg with debian-stretch-titan ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c Gerrit-Change-Number: 22854 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 14:56:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 14:56:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 14:56:57 +0000 Subject: Change in docker-playground[master]: ttcn3: use REGISTRY arg with debian-stretch-titan In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22854 ) Change subject: ttcn3: use REGISTRY arg with debian-stretch-titan ...................................................................... ttcn3: use REGISTRY arg with debian-stretch-titan Allow jenkins to fetch the image from our private docker registry. Outside of jenkins, the image is built locally just like before. Related: OS#5017 Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c --- M ttcn3-bsc-test/Dockerfile M ttcn3-bscnat-test/Dockerfile M ttcn3-bts-test/Dockerfile M ttcn3-fr-test/Dockerfile M ttcn3-gbproxy-test/Dockerfile M ttcn3-ggsn-test/Dockerfile M ttcn3-hlr-test/Dockerfile M ttcn3-mgw-test/Dockerfile M ttcn3-msc-test/Dockerfile M ttcn3-nitb-sysinfo/Dockerfile M ttcn3-pcu-test/Dockerfile M ttcn3-remsim-test/Dockerfile M ttcn3-sccp-test/Dockerfile M ttcn3-sgsn-test/Dockerfile M ttcn3-sip-test/Dockerfile M ttcn3-smlc-test/Dockerfile M ttcn3-stp-test/Dockerfile 17 files changed, 34 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Verified diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 10b7267..1923c38 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index d970482..50ca926 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 7abf1a9..8ac7cb8 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index ae355d7..4a70c12 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index aee22ff..71494d9 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index e67dc9f..d42ac3e 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 36761a7..8480288 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index bd74f79..087dc09 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 8ce9828..05610a4 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 026a465..45bf69e 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2a35db3..e42bca1 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 0391d0a..caa6da1 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index a818d8b..708a72f 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 2a2e66e..333b5ed 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index bce215a..1324ac0 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 21d77a4..5d27ceb 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 073753b..e36935b 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,5 +1,6 @@ +ARG REGISTRY ARG USER -FROM $USER/debian-stretch-titan +FROM $REGISTRY/$USER/debian-stretch-titan ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I46cc176ea09d8badc359b627d7ce2f459211258c Gerrit-Change-Number: 22854 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:23:25 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:23:25 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused log categories In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863/1/src/debug.h File src/debug.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863/1/src/debug.h at a12 PS1, Line 12: DPAG > we could use DPAG for paging related handling ing gbproxy, but not sure if it's worth it? We can (re)-add it if it seems useful. DPAG was never usable because it wasn't defined in gprs_categories -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 15:23:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:23:27 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:23:27 +0000 Subject: Change in osmo-gbproxy[master]: Remove unused log categories In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 ) Change subject: Remove unused log categories ...................................................................... Remove unused log categories Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 --- M src/debug.h M src/gb_proxy_main.c 2 files changed, 0 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/debug.h b/src/debug.h index 9a686cb..b3c978d 100644 --- a/src/debug.h +++ b/src/debug.h @@ -8,24 +8,7 @@ /* Debug Areas of the code */ enum { - DMM, - DPAG, - DMEAS, - DREF, DGPRS, - DNS, - DLLC, - DSNDCP, - DSLHC, - DCTRL, - DFILTER, - DGTPHUB, - DRANAP, - DSUA, - DV42BIS, - DIUCS, - DSIGTRAN, - DGTP, DOBJ, Debug_LastEntry, }; diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c index 2e9ff79..0e36c06 100644 --- a/src/gb_proxy_main.c +++ b/src/gb_proxy_main.c @@ -239,11 +239,6 @@ .description = "GPRS Packet Service", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DNS] = { - .name = "DNS", - .description = "GPRS Network Service (NS)", - .enabled = 1, .loglevel = LOGL_INFO, - }, [DOBJ] = { .name = "DOBJ", .description = "GbProxy object allocation/release", -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I519a687c07410fa3c1a0fa9a903d6c3ed9cbba45 Gerrit-Change-Number: 22863 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:25:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 15:25:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 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: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 15:25:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:26:58 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:26:58 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 to look at the new patch set (#4). Change subject: Move vty node into gbproxy_vty.c ...................................................................... Move vty node into gbproxy_vty.c This is no longer shared with osmo-sgsn and osmo-gtphub Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 --- M src/Makefile.am M src/gb_proxy_main.c M src/gb_proxy_vty.c D src/vty.h 4 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/64/22864/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:27:14 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:27:14 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 ) Change subject: Move vty node into gbproxy_vty.c ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864/2/src/gb_proxy_vty.c File src/gb_proxy_vty.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864/2/src/gb_proxy_vty.c at 67 PS2, Line 67: enum bsc_vty_node { > bsc? I think we could probably rename it, too. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 15:27:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:28:30 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:28:30 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add MTU field for BSSGP ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/2/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/2/include/osmocom/sgsn/gb_proxy.h at 25 PS2, Line 25: DEFAULT_NSE_MTU > see my feedback to lynxis' patches. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 15:28:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:29:50 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:29:50 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 to look at the new patch set (#3). Change subject: Add MTU field for BSSGP ...................................................................... Add MTU field for BSSGP Prepare tracking the MTU from NS. Initialize the MTU with a conservative default. The MTU is not yet updated, that will happen in a later patch. Related: OS#4889 Depends: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 (libosmocore.git) Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c M src/gb_proxy_vty.c 4 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/77/22877/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:29:50 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:29:50 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 to look at the new patch set (#3). Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... gbproxy: Use bssgp2_enc_status when sending STATUS bssgp_tx_status() is not aware of the MTU and cannot truncate the PDU if needed. Use the newer bssgp2_enc_status() which supports truncating the PDU. Related: OS#4889 Depends: Ic39d918c56399ceb0431299ce938e3bf276f678a (libosmocore.git) Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 --- M src/gb_proxy.c 1 file changed, 66 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/76/22876/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:38:40 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 15:38:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... Patch Set 2: -Code-Review (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857/1/pcu/PCU_Tests.ttcn at 4285 PS1, Line 4285: cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); > I already thought about it but in general most of the stuf above is already test specific stuff like [?] Well, ok, but from a review perspective as someone who dislikes reading TTCN3 and is not really familiar with NACC reading these lines over and over and figuring out what if any is the difference and if it makes sense or not is quite straining. Could be just me an my (love-) hate relationship with ttcn3, though. :-) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 15:38:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 15:40:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 15:40:39 +0000 Subject: Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22880 ) Change subject: gsm: Fix bitfield order in dtap_header ...................................................................... gsm: Fix bitfield order in dtap_header This bitfield was added later and all osmocom code still uses the old field contain 1 byte "link_id". There's only one known user of the new bitfield which only uses it to log the SAPI name in osmocom, so no logical breakage is expected with this change (other than fixing a log line). While at it, fix a typo in comment describing related enum. Related: SYS#4909 Fixes: 392f607f2d42eb2839ccfc4c1b9e2c7cfaf3bcc2 Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/22880/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index fe7776b..7ef7a29 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -49,12 +49,12 @@ uint8_t link_id; /* Backward compatibility */ struct { #if OSMO_IS_LITTLE_ENDIAN - uint8_t dlci_cc:2, + uint8_t dlci_sapi:3, /* enum gsm0406_dlci_sapi */ dlci_spare:3, - dlci_sapi:3; /* enum gsm0406_dlc_sapi */ + dlci_cc:2; #elif OSMO_IS_BIG_ENDIAN /* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t dlci_sapi:3, dlci_spare:3, dlci_cc:2; + uint8_t dlci_cc:2, dlci_spare:3, dlci_sapi:3; #endif }; }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 Gerrit-Change-Number: 22880 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 16:13:09 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 16:13:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... Patch Set 2: Code-Review+1 I agree that it would probably be much easier to review if there was less duplicate code. But you already stated your reasons. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 16:13:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 16:17:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 16:17:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 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: I42908a00f8d076e3559efde298a739d6b26d090e Gerrit-Change-Number: 22858 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 12 Feb 2021 16:17:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 17:48:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 17:48:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_cellid_to_RAI References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 ) Change subject: sgsn: Fix f_cellid_to_RAI ...................................................................... sgsn: Fix f_cellid_to_RAI Change-Id: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/22881/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 7d47a1f..4c0a8ab 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -236,8 +236,8 @@ mncDigit3 := mcc_mnc[3], mncDigit1 := mcc_mnc[4], mncDigit2 := mcc_mnc[5], - lac := int2oct(cell_id.ra_id.lai.lac, 16), - rac := int2oct(cell_id.ra_id.rac, 8) + lac := int2oct(cell_id.ra_id.lai.lac, 2), + rac := int2oct(cell_id.ra_id.rac, 1) } return ret; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 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: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 Gerrit-Change-Number: 22881 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 18:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 18:37:57 +0000 Subject: Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases" References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" ...................................................................... Revert "RFC: allow to set configuration and/or specific testcases" Fix error message reported by Pau: docker: invalid reference format: repository name must be lowercase. This happens in the "docker run" command after the "Starting container to merge logs" message, because the arguments to --entrypoint are not in quotation marks. The command fails. Logs were merged anyway, because If03422bb8fb126fe6f204a4f8bc6edf0cbb7f194 had already reverted half the patch and added the log merging back to the Dockerfile. This reverts commit 73663b01f21e9a01cf3e5048d802270c482852cf. Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/82/22882/1 diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 623f468..35eaf2e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -56,17 +56,6 @@ -v $VOL_BASE_DIR/sgsn-tester:/data \ --name ${BUILD_TAG}-ttcn3-sgsn-test \ $DOCKER_ARGS \ - $REPO_USER/ttcn3-sgsn-test $@ - -echo Starting container to merge logs -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/sgsn-tester:/data \ - --name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \ - --entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \ - $DOCKER_ARGS \ $REPO_USER/ttcn3-sgsn-test echo Stopping containers -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 18:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 12 Feb 2021 18:37:57 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22883 ) Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd ...................................................................... ttcn3-gbproxy-test: remove broken merge logs cmd Remove commands that result in a docker error message, like in Ie6f8270230e1f0372b63d610b7868ea8719b18ad. Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 --- M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh 2 files changed, 0 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/83/22883/1 diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 863e8ef..4ef2ace 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -78,18 +78,6 @@ # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-gbproxy-test - -echo Starting container to merge logs -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/gbproxy-tester:/data \ - --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \ - --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-gbproxy-test - echo Stopping containers docker container kill ${BUILD_TAG}-gbproxy diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 9605608..b063c7f 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -45,17 +45,6 @@ $DOCKER_ARGS \ $REPO_USER/ttcn3-gbproxy-test $@ -echo Starting container to merge logs -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/gbproxy-tester:/data \ - --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \ - --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-gbproxy-test - echo Stopping containers docker container kill ${BUILD_TAG}-gbproxy -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 Gerrit-Change-Number: 22883 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 18:39:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 18:39:37 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22883 ) Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 Gerrit-Change-Number: 22883 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 18:39:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 18:39:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 12 Feb 2021 18:39:41 +0000 Subject: Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 18:39:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 18:53:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 18:53:17 +0000 Subject: Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 18:53:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 19:15:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 12 Feb 2021 19:15:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_process_attach_accept on ran_index != 0 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 ) Change subject: sgsn: Fix f_process_attach_accept on ran_index != 0 ...................................................................... sgsn: Fix f_process_attach_accept on ran_index != 0 Change-Id: I7d859fd710dba96eb9b46c428243281183e1be12 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/22884/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 4c0a8ab..4e35144 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -765,12 +765,12 @@ } } -function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { +function f_process_attach_accept(PDU_GMM_AttachAccept aa, integer ran_index := 0) runs on BSSGP_ConnHdlr { /* mandatory IE */ var hexstring aa_plmn := f_RAI_to_plmn_hexstr(aa.routingAreaIdentification); - if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) { + if (not (g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc == aa_plmn)) { setverdict(fail, "mismatching PLMN in Attach Accept: " & hex2str(aa_plmn) - & "; expected " & hex2str(g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc)); + & "; expected " & hex2str(g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc)); mtc.stop; } g_pars.ra := aa.routingAreaIdentification; @@ -779,7 +779,8 @@ setverdict(fail, "unexpected P-TMSI allocation"); mtc.stop; } - f_upd_ptmsi_and_tlli(aa.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets); + f_upd_ptmsi_and_tlli(aa.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, + ran_index); } if (ispresent(aa.msIdentity)) { setverdict(fail, "unexpected TMSI allocation in non-combined attach"); @@ -802,7 +803,8 @@ setverdict(fail, "unexpected P-TMSI allocation"); mtc.stop; } - f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, ran_index); + f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, + ran_index); } if (ispresent(ra.msIdentity)) { setverdict(fail, "unexpected TMSI allocation in non-combined attach"); @@ -860,7 +862,7 @@ f_gmm_gsup_lu_isd(); l3_mt := f_receive_l3(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?), ran_index); - f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept, ran_index); /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ f_send_l3(ts_GMM_ATTACH_COMPL, ran_index); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 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: I7d859fd710dba96eb9b46c428243281183e1be12 Gerrit-Change-Number: 22884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:13:26 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 12 Feb 2021 20:13:26 +0000 Subject: Change in osmo-bts[master]: l1sap: fix comment: sapi number is missing References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22886 ) Change subject: l1sap: fix comment: sapi number is missing ...................................................................... l1sap: fix comment: sapi number is missing Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/22886/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 97dd661..be50ed2 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1066,7 +1066,7 @@ msg = pp.oph.msg; sapi = (msg->data[0] >> 2) & 0x07; - /* Only LAPDm frames for SAPI may become a repetition + /* Only LAPDm frames for SAPI 0 may become a repetition * candidate. */ if (sapi == 0) lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 Gerrit-Change-Number: 22886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:13:26 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 12 Feb 2021 20:13:26 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated ...................................................................... l1sap: be sure that the DL-SACCH l1 header is also repeated When the MS requests DL-SACCH repetition, an exact copy of the previously transmitted SACCH block is expected. At the moment osmo-bts does only save the payload of the DL-SACCH without the two byte L1 header for repetition. Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Related: SYS#5114 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/22887/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 05b6cf2..22099a1 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -409,6 +409,7 @@ /* Message buffer to store DL-SACCH repeation candidate */ struct msgb *rep_sacch; + uint8_t rep_sacch_l1_hdr[2]; }; static inline uint8_t lchan_get_ta(const struct gsm_lchan *lchan) diff --git a/src/common/l1sap.c b/src/common/l1sap.c index be50ed2..025982a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1037,7 +1037,7 @@ } /* Special dequeueing function with SACCH repetition (3GPP TS 44.006, section 11) */ -static inline struct msgb *lapdm_phsap_dequeue_msg_sacch(struct gsm_lchan *lchan, struct lapdm_entity *le) +static inline struct msgb *lapdm_phsap_dequeue_msg_sacch(struct gsm_lchan *lchan, struct lapdm_entity *le, uint8_t *p) { struct osmo_phsap_prim pp; struct msgb *msg; @@ -1056,6 +1056,8 @@ /* Use previous repetition candidate */ msg = lchan->rep_sacch; lchan->rep_sacch = NULL; + p[0] = lchan->rep_sacch_l1_hdr[0]; + p[1] = lchan->rep_sacch_l1_hdr[1]; return msg; } } @@ -1068,8 +1070,11 @@ /* Only LAPDm frames for SAPI 0 may become a repetition * candidate. */ - if (sapi == 0) + if (sapi == 0) { lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); + lchan->rep_sacch_l1_hdr[0] = p[0]; + lchan->rep_sacch_l1_hdr[1] = p[1]; + } return msg; } @@ -1158,7 +1163,7 @@ p[1] = lchan->rqd_ta; le = &lchan->lapdm_ch.lapdm_acch; if (lchan->repeated_acch_capability.dl_sacch) - pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le); + pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le, p); else pp_msg = lapdm_phsap_dequeue_msg(le); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:13:27 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 12 Feb 2021 20:13:27 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging for ACCH repetition References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging for ACCH repetition ...................................................................... l1sap: add logging for ACCH repetition At the moment osmo-bts is not looging much ACCH repetition related information. This makes testing ACCH repetition difficult. Lets add some debug output that informs the user when ACCH repetition is turned on or off. Also log when a repetition candidate is stored or when a channel is repeated. Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Related: SYS#5114 --- M src/common/l1sap.c 1 file changed, 44 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/22888/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 025982a..05c4f08 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -935,10 +935,12 @@ /* Re-use stored FACCH message buffer from SLOT #0 for repetition. */ msg = lchan->tch.rep_facch[0].msg; lchan->tch.rep_facch[0].msg = NULL; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: repeating FACCH channel\n"); } else if (lchan->tch.rep_facch[1].msg && GSM_TDMA_FN_SUB(fn, lchan->tch.rep_facch[1].fn) >= 8) { /* Re-use stored FACCH message buffer from SLOT #1 for repetition. */ msg = lchan->tch.rep_facch[1].msg; lchan->tch.rep_facch[1].msg = NULL; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: repeating FACCH channel\n"); } else { /* Fetch new FACCH from queue ... */ if (lapdm_phsap_dequeue_prim(le, &pp) < 0) @@ -957,9 +959,11 @@ if (lchan->tch.rep_facch[0].msg == NULL) { lchan->tch.rep_facch[0].msg = msgb_copy(msg, "rep_facch_0"); lchan->tch.rep_facch[0].fn = fn; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: stored repetition candidate\n"); } else if (lchan->tch.rep_facch[1].msg == NULL) { lchan->tch.rep_facch[1].msg = msgb_copy(msg, "rep_facch_1"); lchan->tch.rep_facch[1].fn = fn; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: stored repetition candidate\n"); } else { /* By definition 3GPP TS 05.02 does not allow more than two (for TCH/H only one) FACCH blocks * to be transmitted simultaniously. */ @@ -987,12 +991,19 @@ if (!lchan->repeated_acch_capability.dl_facch_cmd && !lchan->repeated_acch_capability.dl_facch_all) { lchan->repeated_dl_facch_active = false; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: disabled by BSC\n"); return; } + if (lchan->repeated_dl_facch_active) + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: active\n"); + else + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: inactive\n"); + /* Threshold disabled (always on) */ if (lchan->repeated_acch_capability.rxqual == 0) { lchan->repeated_dl_facch_active = true; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: no threshold => DL-FACCH repetition active\n"); return; } @@ -1000,6 +1011,7 @@ * (repeated SACCH requested) then it makes sense to enable * FACCH repetition too. */ if ((lchan->meas.l1_info[0] >> 1) & 1) { + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: MS requests DL-SACCH repetition => DL-FACCH repetition also active\n"); lchan->repeated_dl_facch_active = true; return; } @@ -1029,10 +1041,15 @@ else rxqual = meas_res->rxqual_full; - if (rxqual >= upper) + if (rxqual >= upper) { lchan->repeated_dl_facch_active = true; - else if (rxqual <= lower) + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: rxqual (%u) >= upper rxqual threshold (%u) => DL-FACCH repetition active\n", + rxqual, upper); + } else if (rxqual <= lower) { lchan->repeated_dl_facch_active = false; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: rxqual (%u) <= lower rxqual threshold (%u) => DL-FACCH repetition inactive\n", + rxqual, lower); + } } @@ -1043,6 +1060,11 @@ struct msgb *msg; uint8_t sapi; + if ((lchan->meas.l1_info[0] >> 1) & 1) + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: MS requests DL-SACCH repetition (SRR=1)\n"); + else + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: MS does not request DL-SACCH repetition (SRR=0)\n"); + /* Note: When the MS disables SACCH repetition, we still must collect * possible candidates in order to have one ready in case the MS enables * SACCH repetition. */ @@ -1058,6 +1080,7 @@ lchan->rep_sacch = NULL; p[0] = lchan->rep_sacch_l1_hdr[0]; p[1] = lchan->rep_sacch_l1_hdr[1]; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: repeating SACCH channel\n"); return msg; } } @@ -1065,6 +1088,7 @@ /* Fetch new repetition candidate from queue */ if (lapdm_phsap_dequeue_prim(le, &pp) < 0) return NULL; + msg = pp.oph.msg; sapi = (msg->data[0] >> 2) & 0x07; @@ -1074,6 +1098,7 @@ lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); lchan->rep_sacch_l1_hdr[0] = p[0]; lchan->rep_sacch_l1_hdr[1] = p[1]; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: stored repetition candidate\n"); } return msg; @@ -1164,8 +1189,10 @@ le = &lchan->lapdm_ch.lapdm_acch; if (lchan->repeated_acch_capability.dl_sacch) pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le, p); - else + else { + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: disabled by BSC\n"); pp_msg = lapdm_phsap_dequeue_msg(le); + } } else { if (lchan->ts->trx->bts->dtxd) dtxd_facch = true; @@ -1438,12 +1465,19 @@ * reason, we must be sure that UL-SACCH repetition is disabled. */ if (!lchan->repeated_acch_capability.ul_sacch) { lchan->repeated_ul_sacch_active = false; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: disabled by BSC\n"); return; } + if (lchan->repeated_dl_facch_active) + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: active\n"); + else + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: inactive\n"); + /* Threshold disabled (repetition is always on) */ if (lchan->repeated_acch_capability.rxqual == 0) { lchan->repeated_ul_sacch_active = true; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: no threshold => UL-SACCH repetition active\n"); return; } @@ -1461,10 +1495,15 @@ lower = ber10k_by_rxqual_lower[lchan->repeated_acch_capability.rxqual]; /* If upper/rxqual == 0, then repeated UL-SACCH is always on */ - if (ber10k >= upper) + if (ber10k >= upper) { lchan->repeated_ul_sacch_active = true; - else if (ber10k <= lower) + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: ber10k (%u) >= upper ber10k threshold (%u) => UL-SACCH repetition active\n", + ber10k, upper); + } else if (ber10k <= lower) { lchan->repeated_ul_sacch_active = false; + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: ber10k (%u) <= upper ber10k threshold (%u) => UL-SACCH repetition inactive\n", + ber10k, lower); + } } /* DATA received from bts model */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:47:25 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 20:47:25 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESO... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22827 ) Change subject: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2ed2580bbbdd6d3464833257b0dcb8ec6f8d699 Gerrit-Change-Number: 22827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 20:47:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:52:08 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 20:52:08 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22828 ) Change subject: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 Gerrit-Change-Number: 22828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 20:52:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:57:13 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 20:57:13 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22859 ) Change subject: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 Gerrit-Change-Number: 22859 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 12 Feb 2021 20:57:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 20:58:27 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 20:58:27 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22873 ) Change subject: bssgp_bvc_fsm: Set/get maximum BSSGP PDU length ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22873/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22873/1//COMMIT_MSG at 5 PS1, Line 5: CommitDate: 2021-02-12 03:33:30 +0100 > I think we should somehow specify what it means specifically. [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 Gerrit-Change-Number: 22873 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 12 Feb 2021 20:58:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 21:11:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 21:11:29 +0000 Subject: Change in osmo-bts[master]: l1sap: fix comment: sapi number is missing In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22886 ) Change subject: l1sap: fix comment: sapi number is missing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 Gerrit-Change-Number: 22886 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 12 Feb 2021 21:11:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 21:20:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 21:20:00 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated ...................................................................... Patch Set 1: Are you sure the lower layers will not override the L1 SACCH header? I am afraid they (most likely) will. Not sure if I already mentioned or not, but ACCH repetition in general seems to lack proper unit/conformance test coverage. If there were tests, I would not even ask this question... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 21:20:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 21:29:51 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 21:29:51 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22889 ) Change subject: bssgp_bvc_fsm: Consistent naming ...................................................................... bssgp_bvc_fsm: Consistent naming bssgp_bvc_get_features_* are fsm "methods" and the name should indicate that just lika all other function names in bssgp_bvc_fsm.h Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c M src/gb/libosmogb.map 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/22889/1 diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h b/include/osmocom/gprs/bssgp_bvc_fsm.h index 824cdec..446dda8 100644 --- a/include/osmocom/gprs/bssgp_bvc_fsm.h +++ b/include/osmocom/gprs/bssgp_bvc_fsm.h @@ -61,9 +61,9 @@ uint8_t bssgp_bvc_fsm_get_block_cause(struct osmo_fsm_inst *fi); -uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi); -uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi); -uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi); +uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi); +uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi); +uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi); void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t max_pdu_len); uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi); \ No newline at end of file diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index a035938..8d284d1 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -794,7 +794,7 @@ } /*! Return the advertised features / extended features. */ -uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi) +uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi) { struct bvc_fsm_priv *bfp = fi->priv; @@ -803,7 +803,7 @@ } /*! Return the received features / extended features. */ -uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi) +uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi) { struct bvc_fsm_priv *bfp = fi->priv; @@ -812,7 +812,7 @@ } /*! Return the negotiated features / extended features. */ -uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi) +uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi) { struct bvc_fsm_priv *bfp = fi->priv; diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 2327815..699ed1b 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -93,9 +93,9 @@ bssgp_bvc_fsm_set_ops; bssgp_bvc_fsm_is_unblocked; bssgp_bvc_fsm_get_block_cause; -bssgp_bvc_get_features_advertised; -bssgp_bvc_get_features_received; -bssgp_bvc_get_features_negotiated; +bssgp_bvc_fsm_get_features_advertised; +bssgp_bvc_fsm_get_features_received; +bssgp_bvc_fsm_get_features_negotiated; bssgp_bvc_fsm_set_max_pdu_len; bssgp_bvc_fsm_get_max_pdu_len; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 Gerrit-Change-Number: 22889 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 21:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 12 Feb 2021 21:32:40 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22889 ) Change subject: bssgp_bvc_fsm: Consistent naming ...................................................................... Patch Set 1: These functions don't seem to be used by any of our programs (according to grep) so this commit doesn't depend on anything. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 Gerrit-Change-Number: 22889 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 12 Feb 2021 21:32:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 22:39:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 22:39:42 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging for ACCH repetition In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging for ACCH repetition ...................................................................... Patch Set 1: (9 comments) IMHO, this amount of logging is only suitable for development stage. For a regular user/customer trying to understand what's going on it's too verbose. https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 938 PS1, Line 938: DL1C Pau was complaining about unreadable DL1C (https://osmocom.org/issues/5007), maybe DL1P? The 'L1C' stands for "Layer 1 Control", 'DL1P' stands for "Layer 1 Primitives". https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 938 PS1, Line 938: DL-FACCH repetition: repeating FACCH channel How can you 'repeat FACCH channel'? You actually repeat a 'FACCH block', or more precisely 'retransmit' it. https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 943 PS1, Line 943: channel Same here. https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 994 PS1, Line 994: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: disabled by BSC\n"); This looks redundant to me, if it's disabled that I would not expect any logging. https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1044 PS1, Line 1044: if (rxqual >= upper) { How about storing the current 'repeated_dl_facch_active' value and logging only if it changes from true to false and vice versa? https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1066 PS1, Line 1066: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-SACCH repetition: MS does not request DL-SACCH repetition (SRR=0)\n"); This also looks redundant, and would probably make 'DL1C' unreadable. https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1083 PS1, Line 1083: channel block https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1091 PS1, Line 1091: ws, unrelated https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1468 PS1, Line 1468: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: disabled by BSC\n"); Same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 12 Feb 2021 22:39:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 12 23:39:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 12 Feb 2021 23:39:53 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated ...................................................................... Patch Set 1: > Patch Set 1: > > Are you sure the lower layers will not override the L1 SACCH header? I am afraid they (most likely) will. Nevermind. This only applies to DSP based models and when DSP based power control is enabled. The L1 SACCH header is composed in l1sap.c regardless of the model, and may be overwritten by DSP based models. Since they do not support ACCH repetition, this is not a problem. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 12 Feb 2021 23:39:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Feb 13 02:21:55 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 13 Feb 2021 02:21:55 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602737cdda139_6c892abbc860c5f83139e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] [COMPILING apps/dfu/main.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 161s] Memory region Used Size Region Size %age Used [ 161s] rom: 16580 B 16 KB 101.20% [ 161s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 161s] collect2: error: ld returned 1 exit status [ 161s] % [ 161s] make[2]: *** [Makefile:234: flash] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 161s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: error: make -j1 returned exit code 2 [ 161s] make: *** [debian/rules:16: build] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 150.796290] sysrq: Power Off [ 164s] [ 150.803898] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb57 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 13 02:21:39 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 13 02:25:21 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 13 Feb 2021 02:25:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6027389c5a02e_6c892abbc860c5f831423@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 166s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 166s] [COMPILING libboard/qmod/source/card_pres.c] [ 166s] [COMPILING libboard/qmod/source/wwan_led.c] [ 167s] [COMPILING libboard/qmod/source/i2c.c] [ 167s] [COMPILING libboard/qmod/source/board_qmod.c] [ 167s] [COMPILING apps/dfu/main.c] [ 167s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 167s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 167s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 168s] Memory region Used Size Region Size %age Used [ 168s] rom: 16588 B 16 KB 101.25% [ 168s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 168s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 168s] collect2: error: ld returned 1 exit status [ 168s] % [ 168s] make[2]: *** [Makefile:234: flash] Error 1 [ 168s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 168s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 168s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 168s] dh_auto_build: error: make -j1 returned exit code 2 [ 168s] make: *** [debian/rules:16: build] Error 25 [ 168s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 168s] ### VM INTERACTION START ### [ 171s] [ 158.915191] sysrq: Power Off [ 171s] [ 158.918258] reboot: Power down [ 171s] ### VM INTERACTION END ### [ 171s] [ 171s] old-atreju3 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 13 02:25:18 UTC 2021. [ 171s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Feb 13 04:31:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 04:31:25 +0000 Subject: Change in osmo-bts[master]: main: cosmetic: tweak deprecation warning messages References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22890 ) Change subject: main: cosmetic: tweak deprecation warning messages ...................................................................... main: cosmetic: tweak deprecation warning messages Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 --- M src/common/main.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/22890/1 diff --git a/src/common/main.c b/src/common/main.c index f54a5ca..76e0d43 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -181,15 +181,15 @@ break; case 'r': rt_prio = atoi(optarg); - fprintf(stderr, "Parameter -r is deprecated, use VTY cpu-sched " - "node setting 'policy rr %d' instead\n", rt_prio); + fprintf(stderr, "Command line argument '-r' is deprecated, use VTY " + "cpu-sched node setting 'policy rr %d' instead.\n", rt_prio); break; case 'i': gsmtap_ip = optarg; break; case 't': - fprintf(stderr, "Parameter -t is deprecated and does nothing, " - "TRX num is calculated from VTY\n"); + fprintf(stderr, "Command line argument '-t' is deprecated and does nothing, " + "TRX number is calculated from the VTY automatically.\n"); break; case '?': case 1: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 Gerrit-Change-Number: 22890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 04:31:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 04:31:26 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22891 ) Change subject: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c ...................................................................... GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c There is no point in having it there, as VTY is the only user. Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/vty.c 3 files changed, 17 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/22891/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 85fe548..af58d5e 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -127,7 +127,6 @@ extern uint16_t l1sap_log_ctx_sapi; extern const struct value_string l1sap_common_sapi_names[]; -extern const struct value_string gsmtap_sapi_names[]; extern struct gsmtap_inst *gsmtap; extern uint32_t gsmtap_sapi_mask; extern uint8_t gsmtap_sapi_acch; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 97dd661..9b3b087 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -350,23 +350,6 @@ uint32_t gsmtap_sapi_mask = 0; uint8_t gsmtap_sapi_acch = 0; -const struct value_string gsmtap_sapi_names[] = { - { GSMTAP_CHANNEL_BCCH, "BCCH" }, - { GSMTAP_CHANNEL_CCCH, "CCCH" }, - { GSMTAP_CHANNEL_RACH, "RACH" }, - { GSMTAP_CHANNEL_AGCH, "AGCH" }, - { GSMTAP_CHANNEL_PCH, "PCH" }, - { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, - { GSMTAP_CHANNEL_TCH_F, "TCH/F" }, - { GSMTAP_CHANNEL_TCH_H, "TCH/H" }, - { GSMTAP_CHANNEL_PACCH, "PACCH" }, - { GSMTAP_CHANNEL_PDCH, "PDTCH" }, - { GSMTAP_CHANNEL_PTCCH, "PTCCH" }, - { GSMTAP_CHANNEL_CBCH51,"CBCH" }, - { GSMTAP_CHANNEL_ACCH, "SACCH" }, - { 0, NULL } -}; - /* send primitive as gsmtap */ static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap, uint8_t *chan_type, uint8_t *ss, uint32_t fn, diff --git a/src/common/vty.c b/src/common/vty.c index f36c09e..84e3968 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -71,6 +71,23 @@ int g_vty_port_num = OSMO_VTY_PORT_BTS; +static const struct value_string gsmtap_sapi_names[] = { + { GSMTAP_CHANNEL_BCCH, "BCCH" }, + { GSMTAP_CHANNEL_CCCH, "CCCH" }, + { GSMTAP_CHANNEL_RACH, "RACH" }, + { GSMTAP_CHANNEL_AGCH, "AGCH" }, + { GSMTAP_CHANNEL_PCH, "PCH" }, + { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, + { GSMTAP_CHANNEL_TCH_F, "TCH/F" }, + { GSMTAP_CHANNEL_TCH_H, "TCH/H" }, + { GSMTAP_CHANNEL_PACCH, "PACCH" }, + { GSMTAP_CHANNEL_PDCH, "PDTCH" }, + { GSMTAP_CHANNEL_PTCCH, "PTCCH" }, + { GSMTAP_CHANNEL_CBCH51,"CBCH" }, + { GSMTAP_CHANNEL_ACCH, "SACCH" }, + { 0, NULL } +}; + struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr) { struct phy_link *plink = phy_link_by_num(phy_nr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c Gerrit-Change-Number: 22891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 04:31:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 04:31:26 +0000 Subject: Change in osmo-bts[master]: GSMTAP: fix wrong naming of per-BTS SAPI commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22892 ) Change subject: GSMTAP: fix wrong naming of per-BTS SAPI commands ...................................................................... GSMTAP: fix wrong naming of per-BTS SAPI commands Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 --- M src/common/vty.c 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/22892/1 diff --git a/src/common/vty.c b/src/common/vty.c index 84e3968..976ccfa 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1826,7 +1826,7 @@ "logical channel commands\n" \ "logical channel number\n" -DEFUN(cfg_trx_gsmtap_sapi_all, cfg_trx_gsmtap_sapi_all_cmd, +DEFUN(cfg_bts_gsmtap_sapi_all, cfg_bts_gsmtap_sapi_all_cmd, "gsmtap-sapi (enable-all|disable-all)", "Enable/disable sending of UL/DL messages over GSMTAP\n" "Enable all kinds of messages (all SAPI)\n" @@ -1843,7 +1843,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_trx_gsmtap_sapi, cfg_trx_gsmtap_sapi_cmd, +DEFUN(cfg_bts_gsmtap_sapi, cfg_bts_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { int sapi; @@ -1859,7 +1859,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_trx_no_gsmtap_sapi, cfg_trx_no_gsmtap_sapi_cmd, +DEFUN(cfg_trx_no_gsmtap_sapi, cfg_bts_no_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { int sapi; @@ -2165,17 +2165,17 @@ int bts_vty_init(void *ctx) { - cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, "gsmtap-sapi (", "|",")", VTY_DO_LOWER); - cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, "Enable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); - cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, "no gsmtap-sapi (", "|",")", VTY_DO_LOWER); - cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, NO_STR "Disable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); @@ -2233,9 +2233,9 @@ install_element(BTS_NODE, &cfg_bts_smscb_tgt_qlen_cmd); install_element(BTS_NODE, &cfg_bts_smscb_qhyst_cmd); - install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_all_cmd); - install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_cmd); - install_element(BTS_NODE, &cfg_trx_no_gsmtap_sapi_cmd); + install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_all_cmd); + install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_cmd); + install_element(BTS_NODE, &cfg_bts_no_gsmtap_sapi_cmd); /* add and link to TRX config node */ install_element(BTS_NODE, &cfg_bts_trx_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 Gerrit-Change-Number: 22892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 04:31:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 04:31:26 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22893 ) Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' ...................................................................... GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 --- M include/osmo-bts/bts.h M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/main.c M src/common/vty.c 5 files changed, 29 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/22893/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index f6389ad..3adafcc 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -343,6 +343,13 @@ char *sock_path; } pcu; + /* GSMTAP Um logging (disabled by default) */ + struct { + struct gsmtap_inst *inst; + uint32_t sapi_mask; + uint8_t sapi_acch; + } gsmtap; + struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ struct osmo_tdef *T_defs; /* Timer defines */ diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index af58d5e..fe77431 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -127,10 +127,6 @@ extern uint16_t l1sap_log_ctx_sapi; extern const struct value_string l1sap_common_sapi_names[]; -extern struct gsmtap_inst *gsmtap; -extern uint32_t gsmtap_sapi_mask; -extern uint8_t gsmtap_sapi_acch; - int add_l1sap_header(struct gsm_bts_trx *trx, struct msgb *rmsg, struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn, uint16_t ber10k, int16_t lqual_cb, int8_t rssi, diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 9b3b087..eb652db 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -346,10 +346,6 @@ } } -struct gsmtap_inst *gsmtap = NULL; -uint32_t gsmtap_sapi_mask = 0; -uint8_t gsmtap_sapi_acch = 0; - /* send primitive as gsmtap */ static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap, uint8_t *chan_type, uint8_t *ss, uint32_t fn, @@ -491,7 +487,8 @@ int8_t signal_dbm; int rc; - if (!gsmtap) + struct gsmtap_inst *inst = trx->bts->gsmtap.inst; + if (!inst) return 0; switch (OSMO_PRIM_HDR(&l1sap->oph)) { @@ -524,10 +521,10 @@ if (len == 0) return 0; if ((chan_type & GSMTAP_CHANNEL_ACCH)) { - if (!gsmtap_sapi_acch) + if (!trx->bts->gsmtap.sapi_acch) return 0; } else { - if (!((1 << (chan_type & 31)) & gsmtap_sapi_mask)) + if (!((1 << (chan_type & 31)) & trx->bts->gsmtap.sapi_mask)) return 0; } @@ -536,7 +533,7 @@ if (is_fill_frame(chan_type, data, len)) return 0; - gsmtap_send(gsmtap, trx->arfcn | uplink, tn, chan_type, ss, fn, + gsmtap_send(inst, trx->arfcn | uplink, tn, chan_type, ss, fn, signal_dbm, 0 /* TODO: SNR */, data, len); return 0; diff --git a/src/common/main.c b/src/common/main.c index 76e0d43..38f517c 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -321,12 +321,12 @@ } if (gsmtap_ip) { - gsmtap = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); - if (!gsmtap) { + g_bts->gsmtap.inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); + if (g_bts->gsmtap.inst == NULL) { fprintf(stderr, "Failed during gsmtap_init()\n"); exit(1); } - gsmtap_source_add_sink(gsmtap); + gsmtap_source_add_sink(g_bts->gsmtap.inst); } if (bts_init(g_bts) < 0) { diff --git a/src/common/vty.c b/src/common/vty.c index 976ccfa..f2c7954 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -316,7 +316,7 @@ bts->agch_queue.high_level, VTY_NEWLINE); for (i = 0; i < sizeof(uint32_t) * 8; i++) { - if (gsmtap_sapi_mask & ((uint32_t) 1 << i)) { + if (bts->gsmtap.sapi_mask & ((uint32_t) 1 << i)) { sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i); if (sapi_buf == NULL) continue; @@ -324,7 +324,7 @@ vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } } - if (gsmtap_sapi_acch) { + if (bts->gsmtap.sapi_acch) { sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH)); vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } @@ -1832,12 +1832,14 @@ "Enable all kinds of messages (all SAPI)\n" "Disable all kinds of messages (all SAPI)\n") { + struct gsm_bts *bts = vty->index; + if (argv[0][0] == 'e') { - gsmtap_sapi_mask = UINT32_MAX; - gsmtap_sapi_acch = 1; + bts->gsmtap.sapi_mask = UINT32_MAX; + bts->gsmtap.sapi_acch = 1; } else { - gsmtap_sapi_mask = 0x00; - gsmtap_sapi_acch = 0; + bts->gsmtap.sapi_mask = 0x00; + bts->gsmtap.sapi_acch = 0; } return CMD_SUCCESS; @@ -1846,15 +1848,16 @@ DEFUN(cfg_bts_gsmtap_sapi, cfg_bts_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { + struct gsm_bts *bts = vty->index; int sapi; sapi = get_string_value(gsmtap_sapi_names, argv[0]); OSMO_ASSERT(sapi >= 0); if (sapi == GSMTAP_CHANNEL_ACCH) - gsmtap_sapi_acch = 1; + bts->gsmtap.sapi_acch = 1; else - gsmtap_sapi_mask |= (1 << sapi); + bts->gsmtap.sapi_mask |= (1 << sapi); return CMD_SUCCESS; } @@ -1862,15 +1865,16 @@ DEFUN(cfg_trx_no_gsmtap_sapi, cfg_bts_no_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { + struct gsm_bts *bts = vty->index; int sapi; sapi = get_string_value(gsmtap_sapi_names, argv[0]); OSMO_ASSERT(sapi >= 0); if (sapi == GSMTAP_CHANNEL_ACCH) - gsmtap_sapi_acch = 0; + bts->gsmtap.sapi_acch = 0; else - gsmtap_sapi_mask &= ~(1 << sapi); + bts->gsmtap.sapi_mask &= ~(1 << sapi); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 Gerrit-Change-Number: 22893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 04:48:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 04:48:59 +0000 Subject: Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22880 ) Change subject: gsm: Fix bitfield order in dtap_header ...................................................................... Patch Set 1: Code-Review+2 ... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 Gerrit-Change-Number: 22880 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 13 Feb 2021 04:48:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:03:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:03:26 +0000 Subject: Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22747 ) Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request ...................................................................... Patch Set 3: Code-Review+2 Let's get this merged. 1 + 1 = 2. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:03:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:03:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:03:42 +0000 Subject: Change in osmo-msc[master]: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22747 ) Change subject: fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request ...................................................................... fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request Calling gsm48_cc_tx_release() before mncc_release_ind() has a side effect: the former may change CC state to GSM_CSTATE_RELEASE_REQ. This makes the later send MNCC_REL_CNF instead of MNCC_REL_IND, so if one of the call leg disconnects due to RF failure, the other one will not be terminated correctly. Makes both TC_{mo,mt}_call_clear_request TTCN-3 test cases pass. Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Related: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Related: SYS#5340 --- M src/libmsc/gsm_04_08_cc.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 3 files changed, 10 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index ed29e84..704e596 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -272,6 +272,13 @@ /* send release to L4, if callref still exists */ if (trans->callref) { + /* Send MNCC REL.ind (cause='Resource unavailable') */ + if (trans->cc.mncc_initiated) { + mncc_release_ind(trans->net, trans, trans->callref, + GSM48_CAUSE_LOC_PRN_S_LU, + GSM48_CC_CAUSE_RESOURCE_UNAVAIL); + } + /* FIXME: currently, a CC trans that would not yet be in state GSM_CSTATE_RELEASE_REQ fails to send a * CC Release to the MS if it gets freed here. Hack it to do so. */ if (trans->cc.state != GSM_CSTATE_RELEASE_REQ) { @@ -280,11 +287,6 @@ mncc_set_cause(&rel, GSM48_CAUSE_LOC_PRN_S_LU, GSM48_CC_CAUSE_RESOURCE_UNAVAIL); gsm48_cc_tx_release(trans, &rel); } - /* Resource unavailable */ - if (trans->cc.mncc_initiated) - mncc_release_ind(trans->net, trans, trans->callref, - GSM48_CAUSE_LOC_PRN_S_LU, - GSM48_CC_CAUSE_RESOURCE_UNAVAIL); /* This is a final freeing of the transaction. The MNCC release may have triggered the * T308 release timer, but we don't have the luxury of graceful CC Release here. */ gsm48_stop_cc_timer(trans); diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index b4e20be..9ab1066 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -457,11 +457,7 @@ fake_time_passes(15, 23); btw("The call failed, the BSC sends a BSSMAP Clear Request"); - /* FIXME: in this scenario, we send an MNCC_REL_CNF even though MNCC never asked us to MNCC_REL_REQ. Legacy - * behavior did get to both MNCC_REL_IND, then an MNCC_REL_REQ from MNCC as well as a final MNCC_REL_CNF, but - * this only worked synchronously, i.e. only with internal MNCC. Instead of mimicking that, we need a proper - * async solution that also works with a PBX. */ - cc_to_mncc_expect_tx("", MNCC_REL_CNF); + cc_to_mncc_expect_tx("", MNCC_REL_IND); dtap_expect_tx("032d0802e1af"); /* CC: Release */ expect_iu_release(); msc_a_release_cn(msub_msc_a(g_msub)); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 1bcc489..e8e3880 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1302,6 +1302,8 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - vlr_subscr_cancel_attach_fsm: now used by 4 (attached,CC,active-conn,msc_a_fsm_releasing_onenter) DCC trans(CC:CALL_RECEIVED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) Freeing transaction DCC trans(CC:CALL_RECEIVED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) stopping pending timer T301 +DMNCC trans(CC:CALL_RECEIVED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_REL_IND + MSC --> MNCC: callref 0x423: MNCC_REL_IND DCC trans(CC:CALL_RECEIVED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) starting timer T308 with 10 seconds DCC trans(CC:CALL_RECEIVED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) new state CALL_RECEIVED -> RELEASE_REQ DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_RELEASING}: Sending DTAP: CC GSM48_MT_CC_RELEASE @@ -1309,8 +1311,6 @@ - DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 032d0802e1af - DTAP matches expected message DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DMNCC trans(CC:RELEASE_REQ IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) tx MNCC_REL_CNF - MSC --> MNCC: callref 0x423: MNCC_REL_CNF DCC trans(CC:RELEASE_REQ IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) stopping pending timer T308 DCC trans(CC:RELEASE_REQ IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) new state RELEASE_REQ -> NULL DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - CC: now used by 3 (attached,active-conn,msc_a_fsm_releasing_onenter) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3ad4a99757878de3796027325627c87d9a4e93f1 Gerrit-Change-Number: 22747 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:12:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:12:28 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:12:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:12:44 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:12:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:12:51 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:12:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:12:57 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 05:12:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:10 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 ) Change subject: TRXC: use monospace formatting (the backticks) for 'SETFORMAT' ...................................................................... TRXC: use monospace formatting (the backticks) for 'SETFORMAT' Change-Id: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index f15ed7b..3c19da0 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -166,7 +166,7 @@ version number, which can be negotiated on the control interface. By default, the Transceiver will use the legacy header version (0). -The header format negotiation can be initiated by the BTS using 'SETFORMAT' +The header format negotiation can be initiated by the BTS using `SETFORMAT` command. If the requested version is not supported by the transceiver, status code of the response message should indicate a preferred (basically, the latest) version. The format of this message is the following: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3fe1f3ab9c9b614cb5f229ca042021642b154a0b Gerrit-Change-Number: 22866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:12 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add missing description of the 'SETTSC' command In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 ) Change subject: TRXC: add missing description of the 'SETTSC' command ...................................................................... TRXC: add missing description of the 'SETTSC' command Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 3c19da0..65fb569 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -127,6 +127,20 @@ RSP TXTUNE ---- +==== Training Sequence configuration + +The usual way to configure all timeslots at once involves sending of the `SETTSC` +command with a desired Training Sequence Code ``: +---- +CMD SETTSC +CMD SETTSC +---- + +This command instructs the transceiver to use the given Training Sequence Code +from the TSC set 1 (see 3GPP TS 45.002, table 5.2.3a) for Normal Burst detection +on the receive path. It does not affect the transmit path because bursts coming +from the BTS do contain the Training Sequence bits. + ==== Timeslot Control `SETSLOT` sets the format of a given uplink timeslot in the ARFCN. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I3d62da53101ec9c22d9742932bd9bb6f151545e0 Gerrit-Change-Number: 22610 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:13 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: add proposal for multiple Training Sequences In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 ) Change subject: TRXC: add proposal for multiple Training Sequences ...................................................................... TRXC: add proposal for multiple Training Sequences Change-Id: I621e46edac5d748472fd645f81876116904e260c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 65fb569..05c56a5 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -174,6 +174,32 @@ |13| PDTCH+PACCH+PTCCH |=== +===== Multiple Training Sequences (optional) + +For some setups it's insufficient to have a single Training Sequence Code assigned +to all timeslots of a transceiver. It may be required to use different TSCs for +some (or even all) timeslots. This can be achieved by sending `SETSLOT` command +with additional arguments: +---- +CMD SETSLOT [ C/S ] +RSP SETSLOT [ C/S ] +---- + +where `` is a Training Sequence Code from TSC set ``. + +NOTE: The numbering of both Training Sequence Code and set shall be the same as in +3GPP TS 45.002, e.g. `C0S1` corresponds to the first sequence in the first TSC set +for a chosen modulation type. TSC Set number 0 (`S0`) does not exist in the specs. + +.Example: configuring timeslot 4 to use TCH/F and TSC 7 from set 1 +---- +CMD SETSLOT 4 1 C7/S1 +RSP SETSLOT 0 4 1 C7/S1 +---- + +Unless explicitly configured as described above, all timeslots will be using the +default Training Sequence Code and set configured with the `SETTSC` command. + ==== TRXD header version negotiation Messages on DATA interface may have different header formats, defined by a -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I621e46edac5d748472fd645f81876116904e260c Gerrit-Change-Number: 22611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:16 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXC: introduce VAMOS enabled channel combinations In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 ) Change subject: TRXC: introduce VAMOS enabled channel combinations ...................................................................... TRXC: introduce VAMOS enabled channel combinations Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 111 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 05c56a5..ad37224 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -200,6 +200,117 @@ Unless explicitly configured as described above, all timeslots will be using the default Training Sequence Code and set configured with the `SETTSC` command. +===== VAMOS enabled channel combinations (optional) + +The BTS may at any time re-configure channel combination of a timeslot (primarily +during channel activation) to activate or deactivate VAMOS mode in the transceiver. +For this purpose, the following additional channel combinations shall be used: + +.List of VAMOS enabled channel combinations and related values +[options="header"] +|=== +| value | Channel Combination +|VFF| V0(TCH/F) & V1(TCH/F), 2 channels total +|VHH| V0(TCH/H0) & V1(TCH/H0) + V0(TCH/H1) & V1(TCH/H1), 4 channels total +|VFH| V0(TCH/F) & V1(TCH/H0) + V0(TCH/F) & V1(TCH/H1), 3 channels total +|HVHH| TCH/H0 + V0(TCH/H1) & V1(TCH/H1), 3 channels total (mixed) +|=== + +where both `V0` and `V1` define a _VAMOS pair_. Symbols `&` and `+` indicate +simultaneous and sequential transmission in the TDMA domain respectively. +Therefore a combination `V0(a) & V1(b)` indicates that both channels `a` +and `b` are simultaneously active during a timeslot period. + +.Example: `VFF` in time domain (2 channels) +---- + MS1: | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | ... + -----+-----------+-----------+-----------+-----------+------------> TDMA frames + MS2: | V1(TCH/F) | V1(TCH/F) | V1(TCH/F) | V1(TCH/F) | ... +---- + +.Example: `VHH` in time domain (4 channels) +---- + MS1: | V0(TCH/H0) | | V0(TCH/H0) | | ... + MS2: | | V0(TCH/H1) | | V0(TCH/H1) | ... + -----+------------+------------+------------+------------+--------> TDMA frames + MS3: | V1(TCH/H0) | | V1(TCH/H0) | | ... + MS4: | | V1(TCH/H1) | | V1(TCH/H1) | ... +---- + +.Example: `VFH` in time domain (3 channels) +---- + MS1: | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | V0(TCH/F) | ... + -----+------------+------------+------------+------------+--------> TDMA frames + MS2: | V1(TCH/H0) | | V1(TCH/H0) | | ... + MS3: | | V1(TCH/H1) | | V1(TCH/H1) | ... +---- + +.Example: `HVHH` in time domain (3 channels) +---- + MS1: | TCH/H0 | | TCH/H0 | | ... + MS2: | | V0(TCH/H1) | | V0(TCH/H1) | ... + -----+------------+------------+------------+------------+--------> TDMA frames + MS3: | | V1(TCH/H1) | | V1(TCH/H1) | ... +---- + +NOTE: Combination `HVHH` is special, because it allows the network to multiplex +a legacy user device (`MS1`) with a pair of VAMOS capable devices (`MS2` and `MS3`) +on the same timeslot, so the former (`MS1`) is neither required to support the new +orthogonal TSC sets nor conform to DARP phase I or II (SAIC support). + +For all VAMOS enabled channel combinations, it's *required* to specify Training +Sequence Code and the TSC set values for all multiplexed subscribers. See 3GPP +TS 45.002, table 5.2.3e for more details on TSC set selection. + +.Example: configuring a timeslot to use `VFF` combination +---- +CMD SETSLOT VFF C0/S1 <1> C0/S2 <2> +RSP SETSLOT VFF C0/S1 C0/S2 +---- +<1> V0(TCH/F) is configured to use TSC 0 from set 1 (table 5.2.3a). +<2> V1(TCH/F) is configured to use TSC 0 from set 2 (table 5.2.3b). + +.Example: configuring a timeslot to use `VFF` combination (legacy MS) +---- +CMD SETSLOT VFF C7/S1 <1> C4/S1 <2> +RSP SETSLOT VFF C7/S1 C4/S1 +---- +<1> V0(TCH/F) is configured to use TSC 7 from set 1 (table 5.2.3a). +<2> V1(TCH/F) is configured to use TSC 4 from set 1 (table 5.2.3a). + +NOTE: Using Training Sequences from the same set for a _VAMOS pair_ (in this example, +`C7/S1 C4/S1`) is not recommended because of their bad cross-correlation properties. +The only exception is when two legacy non-VAMOS capable phones are paired together +and neither of them does support additional TSC sets. + +.Example: configuring a timeslot to use `VHH` combination +---- +CMD SETSLOT VHH C1/S3 <1> C1/S4 <2> +RSP SETSLOT VHH C1/S3 C1/S4 +---- +<1> V0(TCH/H0) and V0(TCH/H1) are configured to use TSC 1 from set 3 (table 5.2.3c). +<2> V1(TCH/H0) and V1(TCH/H1) are configured to use TSC 1 from set 4 (table 5.2.3d). + +.Example: configuring a timeslot to use `VFH` combination +---- +CMD SETSLOT VFH C2/S1 <1> C2/S4 <2> +RSP SETSLOT VFH C2/S1 C2/S4 +---- +<1> V0(TCH/F) is configured to use TSC 2 from set 1 (table 5.2.3a). +<2> V1(TCH/H0) and V1(TCH/H1) are configured to use TSC 2 from set 4 (table 5.2.3d). + +.Example: configuring a timeslot to use `HVHH` combination +---- +CMD SETSLOT HVHH C0/S1 <1> C0/S1 <2> C0/S2 <3> +RSP SETSLOT HVHH C0/S1 C0/S1 C0/S2 +---- +<1> Legacy TCH/H0 is configured to use TSC 0 from set 1 (table 5.2.3a). +<2> V0(TCH/H1) is configured to use TSC 0 from set 1 (table 5.2.3a). +<3> V1(TCH/H1) is configured to use TSC 0 from set 2 (table 5.2.3b). + +NOTE: In the example for `HVHH`, legacy TCH/H0 does not belong to a _VAMOS pair_, +so it can be configured to use any Training Sequence Code without restrictions. + ==== TRXD header version negotiation Messages on DATA interface may have different header formats, defined by a -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic7d4d90df752ded8c778c7b16b22d4d346bf1c9c Gerrit-Change-Number: 22612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:19 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: fix optional padding length: bits vs bytes In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 ) Change subject: TRXD: fix optional padding length: bits vs bytes ...................................................................... TRXD: fix optional padding length: bits vs bytes Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index ad37224..bbee62c 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -375,7 +375,7 @@ 40-47: RSSI 48-63: TOA256 64-95: ...Payload... - 96-97: PAD + 96-111: PAD } ---- @@ -438,7 +438,7 @@ * 0 -> definite "0" * 255 -> definite "1". -PAD: 2 bits (optional):: +PAD: 2 bytes (optional):: Padding at the end, historical reasons (OpenBTS inheritance). Bits can take any value, but 0 is preferred. Only expected on TRXDv0 headers. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I30327e56558729cccbf627a7fcba04a9f6ac09f1 Gerrit-Change-Number: 22613 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:21 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 ) Change subject: TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams ...................................................................... TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index bbee62c..7ef95a8 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -374,7 +374,7 @@ 8-39: FN 40-47: RSSI 48-63: TOA256 - 64-95: ...Payload... + 64-95: Soft-bits 96-111: PAD } ---- @@ -394,7 +394,7 @@ 48-63: TOA256 64-71: MTS 72-87: C/I - 88-127: ...Payload... + 88-127: Soft-bits } ---- @@ -427,7 +427,7 @@ training sequence is compared to the actual training sequence and the result expressed in centiBels. -Payload: 148 bytes for GSM, 444 bytes for EDGE:: +Soft-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the uplink burst. Unlike the downlink bursts, the uplink bursts are designated using the soft-bits notation, so the receiver can indicate its assurance from 0 to -127 that a given bit is 1, and from 0 to +127 that a given @@ -510,7 +510,7 @@ 5-7: TN 8-39: FN 40-47: PWR - 48-95: ...Payload... + 48-95: Hard-bits } ---- @@ -531,6 +531,6 @@ Contains the relative (to the full-scale amplitude) transmit power level in dB. The absolute value is set on the control interface. -Payload: 148 bytes for GSM, 444 bytes for EDGE:: +Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented using one byte (0x01 or 0x00 respectively). -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ieeb21e07865ab7bf2ac50f908ca50410141e012f Gerrit-Change-Number: 22614 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:22 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify the meaning of field 'PWR' in Downlink messages In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 ) Change subject: TRXD: clarify the meaning of field 'PWR' in Downlink messages ...................................................................... TRXD: clarify the meaning of field 'PWR' in Downlink messages Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 7ef95a8..7bb8c77 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -528,8 +528,9 @@ GSM frame number, big endian. PWR: 8 bits (1 byte):: -Contains the relative (to the full-scale amplitude) transmit power level in dB. -The absolute value is set on the control interface. +Contains the relative (to the full-scale amplitude) transmit power *reduction* +in dB. The absolute value is set on the control interface, so the resulting +power is calculated as follows: `full_scale - (absolute_red + relative_red)`. Hard-bits: 148 bytes for GSM, 444 bytes for EDGE:: Contains the downlink burst. Each hard-bit (1 or 0) of the burst is represented -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idb2a987f9692f0bdc84b40223d5cec2ba3247b9d Gerrit-Change-Number: 22615 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:25 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: use different coding for AQPSK in the 'MTC' field In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 ) Change subject: TRXD: use different coding for AQPSK in the 'MTC' field ...................................................................... TRXD: use different coding for AQPSK in the 'MTC' field AQPSK is used exclusively on Downlink in VAMOS mode. An AQPSK burst is basically a combination of two Normal Bursts. Each of these two bursts has the same length as defined for GMSK, while both must be using Training Sequences from different sets. Four different sets are defined in 3GPP 45.002, section 5.2.3.1. Therefore we need *two* bits to encode all possible values. Let's rearrange the existing combinations and use '11XX'B for AQPSK. The old combination '011X'B becomes reserved and can be re-purposed. This change is considered to be safe, given that no implementations are known to support AQPSK at the moment of making this change. Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index 7bb8c77..b223151 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -482,13 +482,13 @@ +-----------------+---------------------------------------+ | . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) | +-----------------+---------------------------------------+ -| . 0 1 1 X . . . | AQPSK, 2 TS sets (0..1) | +| . 0 1 1 X . . . | RFU (Reserved for Future Use) | +-----------------+---------------------------------------+ | . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) | +-----------------+---------------------------------------+ | . 1 0 1 X . . . | 32QAM, 2 TS sets (0..1) | +-----------------+---------------------------------------+ -| . 1 1 X X . . . | RESERVED (0) | +| . 1 1 X X . . . | AQPSK (Downlink), 4 TS sets (0..3) | +-----------------+---------------------------------------+ ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9b419e4a70fa0eb2888c326ac50d2d40a67a29c Gerrit-Change-Number: 22616 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:27 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: reserve a combination for Access Bursts on PACCH In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 ) Change subject: TRXD: reserve a combination for Access Bursts on PACCH ...................................................................... TRXD: reserve a combination for Access Bursts on PACCH Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index b223151..ce90948 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -482,7 +482,9 @@ +-----------------+---------------------------------------+ | . 0 1 0 X . . . | 8-PSK, 2 TS sets (0..1) | +-----------------+---------------------------------------+ -| . 0 1 1 X . . . | RFU (Reserved for Future Use) | +| . 0 1 1 0 . . . | GMSK, Access Burst (see note) | ++-----------------+---------------------------------------+ +| . 0 1 1 1 . . . | RFU (Reserved for Future Use) | +-----------------+---------------------------------------+ | . 1 0 0 X . . . | 16QAM, 2 TS sets (0..1) | +-----------------+---------------------------------------+ @@ -492,6 +494,11 @@ +-----------------+---------------------------------------+ ---- +NOTE: A radio block on PDCH is carried by the sequence of four Normal Bursts. +The one exception is a special radio block occasionally used on the Uplink +consisting of a sequence of four Access Bursts (see 3GPP TS 44.060). The +transceiver shall use `0110` as the modulation type to indicate that. + Training Sequence Code:: The Training Sequence Code used to decode an Access or a Synchronization burst. This field hence doesn't apply for Normal bursts. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I84c68ab899aea2bbc013f98cb41082ab076308a5 Gerrit-Change-Number: 22617 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:28 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: rework description of the 'Training Sequence Code' field In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 ) Change subject: TRXD: rework description of the 'Training Sequence Code' field ...................................................................... TRXD: rework description of the 'Training Sequence Code' field The way how the indicated Training Sequence Code is supposed to be used by the BTS is behind the scope of this protocol specification. Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index ce90948..e1aef4a 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -500,8 +500,10 @@ transceiver shall use `0110` as the modulation type to indicate that. Training Sequence Code:: -The Training Sequence Code used to decode an Access or a Synchronization burst. -This field hence doesn't apply for Normal bursts. +The Training Sequence Code identifies the Training Sequence of a received +burst. The value of this field corresponds to one of the sequences defined +in 3GPP TS 45.002, section 5.2, and depends on the actual modulation and +the TSC set indicated by the preceding bits. ==== Downlink Data Burst -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ibcb0b6bfff0aa80ed2de563b5e749b7811e7a5c2 Gerrit-Change-Number: 22618 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:29 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: clarify description of NOPE / IDLE indications In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 ) Change subject: TRXD: clarify description of NOPE / IDLE indications ...................................................................... TRXD: clarify description of NOPE / IDLE indications Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 22 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index e1aef4a..ef2740b 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -398,6 +398,24 @@ } ---- +.TRXDv1 NOPE / IDLE indication message structure +[packetdiag] +---- +{ + colwidth = 32 + node_height = 40 + + 0-3: VER(1) + 4: RES + 5-7: TN + 8-39: FN + 40-47: RSSI + 48-63: TOA256 + 64-71: MTS (NOPE.ind) + 72-87: C/I +} +---- + VER: 4 bits:: TRXD header version, v0 and v1 are specified so far. @@ -463,10 +481,10 @@ ---- IDLE / nope frame indication:: -The bit number 7 (MSB) is set to high when either nothing has been detected, or -during IDLE frames, so noise levels can be delivered, and avoid clock gaps on -the BTS side. Other bits are ignored, and should be set to low (`0`) in this -case. +The bit number 7 (MSB) is set to high when either nothing has been detected, so +the BTS scheduler keeps processing bursts without gaps, or during IDLE frames, +so the current noise levels can be delivered. Other bits are ignored, and should +be set to low (`0`) in this case. The field "Soft-bits" is omited. Modulation and TS set number:: GMSK has 4 sets of training sequences (see tables 5.2.3a-d), while 8-PSK (see -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idaa1c597cbfd198a0f1802ac01b210d42369ee95 Gerrit-Change-Number: 22619 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 05:13:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 13 Feb 2021 05:13:29 +0000 Subject: Change in osmo-gsm-manuals[master]: TRXD: more information on PDU versioning and some highlights In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 ) Change subject: TRXD: more information on PDU versioning and some highlights ...................................................................... TRXD: more information on PDU versioning and some highlights Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Related: SYS#4895, OS#4941, OS#4006 --- M common/chapters/trx_if.adoc 1 file changed, 41 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/trx_if.adoc b/common/chapters/trx_if.adoc index ef2740b..d1aa566 100644 --- a/common/chapters/trx_if.adoc +++ b/common/chapters/trx_if.adoc @@ -311,15 +311,16 @@ NOTE: In the example for `HVHH`, legacy TCH/H0 does not belong to a _VAMOS pair_, so it can be configured to use any Training Sequence Code without restrictions. +[[trx_if_pdu_version_nego]] ==== TRXD header version negotiation -Messages on DATA interface may have different header formats, defined by a -version number, which can be negotiated on the control interface. By default, -the Transceiver will use the legacy header version (0). +Messages on DATA interface may have different formats, defined by a version number, +which can be negotiated on the control interface. By default, the Transceiver will +use the legacy header version (0). See <>. -The header format negotiation can be initiated by the BTS using `SETFORMAT` -command. If the requested version is not supported by the transceiver, status -code of the response message should indicate a preferred (basically, the latest) +The format negotiation can be initiated by the BTS using `SETFORMAT` command. +If the requested version is not supported by the transceiver, status code of +the response message should indicate a preferred (basically, the latest) version. The format of this message is the following: ---- CMD SETFORMAT @@ -353,7 +354,38 @@ === TRXD protocol -Messages on the data interface carry one radio burst per UDP message. +PDUs on the data interface carry one radio burst per one UDP packet. +Two kinds of TRXD PDU exist: + +* `TRX -> L1` (from transceiver to the L1): Uplink messages received from the MS, +* `L1 -> TRX` (from the L1 to transceiver): Downlink messages sent to the MS. + +Depending on the origin and the version indicator, PDUs may have different structure. + +[[trx_if_pdu_versioning]] +==== PDU versioning + +The format of a PDU, i.e. presence and ordering of certain fields, is determined by +the version number indicated in the first octet. This is usually referred as +`TRXDvN`, where `N` is the version number (e.g. TRXDv0 or TRXDv1). A version number +indicates the message format to be used for both directions: `TRX -> L1` and +`L1 -> TRX`. The same version shall be used for all messages in both directions, +mixing in any way is not permitted. + +The version negotiation is optionally initiated by the `L1` on the control interface, +and expected to be performed before starting the transceiver (i.e. sending `POWERON` +command). See <>. + +The current header allows to distinguish up to 16 different versions. +The following versions are defined so far: + +* TRXDv0 - initial version of TRXD protocol, inherited as-is from OpenBTS project. +* TRXDv1 (proposed in July 2019): +** Introduced the concept of protocol versioning; +** Introduced NOPE / IDLE indications; +** New field: MTS (Modulation and Training Sequence); +** New field: C/I (Carrier-to-interface) ratio; +** Downlink messages mostly unchanged. ==== Uplink Data Burst @@ -417,7 +449,7 @@ ---- VER: 4 bits:: -TRXD header version, v0 and v1 are specified so far. +TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. TN: 3 bits:: Timeslot number. @@ -542,7 +574,7 @@ ---- VER: 4 bits:: -TRXD header version, v0 and v1 are specified so far. +TRXD header version, common for both `TRX -> L1` and `L1 -> TRX` directions. TN: 3 bits:: Timeslot number. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idac4a1c73cc92bf030ea80474c71688bfb706421 Gerrit-Change-Number: 22622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:39:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:39:10 +0000 Subject: Change in osmo-bts[master]: GSMTAP: fix wrong naming of per-BTS SAPI commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22892 ) Change subject: GSMTAP: fix wrong naming of per-BTS SAPI commands ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 Gerrit-Change-Number: 22892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 07:39:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:39:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:39:16 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22891 ) Change subject: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c Gerrit-Change-Number: 22891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 07:39:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:39:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:39:29 +0000 Subject: Change in osmo-bts[master]: main: cosmetic: tweak deprecation warning messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22890 ) Change subject: main: cosmetic: tweak deprecation warning messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 Gerrit-Change-Number: 22890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 07:39:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:40:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:40:07 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22893 ) Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 Gerrit-Change-Number: 22893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 07:40:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:41:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:41:23 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22889 ) Change subject: bssgp_bvc_fsm: Consistent naming ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 Gerrit-Change-Number: 22889 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 13 Feb 2021 07:41:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:41:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:41:26 +0000 Subject: Change in libosmocore[master]: bssgp_bvc_fsm: Consistent naming In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22889 ) Change subject: bssgp_bvc_fsm: Consistent naming ...................................................................... bssgp_bvc_fsm: Consistent naming bssgp_bvc_get_features_* are fsm "methods" and the name should indicate that just lika all other function names in bssgp_bvc_fsm.h Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c M src/gb/libosmogb.map 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h b/include/osmocom/gprs/bssgp_bvc_fsm.h index 824cdec..446dda8 100644 --- a/include/osmocom/gprs/bssgp_bvc_fsm.h +++ b/include/osmocom/gprs/bssgp_bvc_fsm.h @@ -61,9 +61,9 @@ uint8_t bssgp_bvc_fsm_get_block_cause(struct osmo_fsm_inst *fi); -uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi); -uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi); -uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi); +uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi); +uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi); +uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi); void bssgp_bvc_fsm_set_max_pdu_len(struct osmo_fsm_inst *fi, uint16_t max_pdu_len); uint16_t bssgp_bvc_fsm_get_max_pdu_len(const struct osmo_fsm_inst *fi); \ No newline at end of file diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index a035938..8d284d1 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -794,7 +794,7 @@ } /*! Return the advertised features / extended features. */ -uint32_t bssgp_bvc_get_features_advertised(struct osmo_fsm_inst *fi) +uint32_t bssgp_bvc_fsm_get_features_advertised(struct osmo_fsm_inst *fi) { struct bvc_fsm_priv *bfp = fi->priv; @@ -803,7 +803,7 @@ } /*! Return the received features / extended features. */ -uint32_t bssgp_bvc_get_features_received(struct osmo_fsm_inst *fi) +uint32_t bssgp_bvc_fsm_get_features_received(struct osmo_fsm_inst *fi) { struct bvc_fsm_priv *bfp = fi->priv; @@ -812,7 +812,7 @@ } /*! Return the negotiated features / extended features. */ -uint32_t bssgp_bvc_get_features_negotiated(struct osmo_fsm_inst *fi) +uint32_t bssgp_bvc_fsm_get_features_negotiated(struct osmo_fsm_inst *fi) { struct bvc_fsm_priv *bfp = fi->priv; diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 2327815..699ed1b 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -93,9 +93,9 @@ bssgp_bvc_fsm_set_ops; bssgp_bvc_fsm_is_unblocked; bssgp_bvc_fsm_get_block_cause; -bssgp_bvc_get_features_advertised; -bssgp_bvc_get_features_received; -bssgp_bvc_get_features_negotiated; +bssgp_bvc_fsm_get_features_advertised; +bssgp_bvc_fsm_get_features_received; +bssgp_bvc_fsm_get_features_negotiated; bssgp_bvc_fsm_set_max_pdu_len; bssgp_bvc_fsm_get_max_pdu_len; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I30fbbe36cdabf9635eaf4dfb1e93c8ce0f667b39 Gerrit-Change-Number: 22889 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 07:45:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 07:45:31 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated ...................................................................... Patch Set 1: Code-Review+1 the API becomes even more awkward than it alrady is with that. Might be worth investigating a method where we could simply push those fields to the frong of the msgb, and/or possibly even recycle the msgb and elimiate the memcpy to another msgb altogether. Yes, that's more like a separte patch, just noticing that it's really odd that we store two bytes extra somewhere else when we actually have a msgb that can hold all of this... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 07:45:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:04:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:04:26 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging for ACCH repetition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging for ACCH repetition ...................................................................... Patch Set 1: (2 comments) I agree with previous feedback. This is tons of logging which nobody ever will want to enable during production. And even during testing, it is logging partially redundant information, as there is not one log line per frame/block, but anywhre from 1..N log lines per FACCH/SACCH block. If we should add some logging, I think it would be best to * consolidate logging into one line per MAC block (== function call?) * consider logging messages on state change (enable/disable) at INFO level and messages about function calls without state change at DEBUG level * finally, make sure that the FACCH repetition state (permission by BSC, current state, thresholds, ...) can be introspected via VTY in "show lchan" https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 994 PS1, Line 994: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: disabled by BSC\n"); > This looks redundant to me, if it's disabled that I would not expect any logging. I think it's useful information, but I think that should be something like part of a "show" command in the VTY (like show lchan). It's not like the BSC would enable/disable it all the time on a given lchan? I think given that this function is called quite frequently (at every facch downlink block?), we should be careful not to log redundant informatoin all the time. https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1001 PS1, Line 1001: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "DL-FACCH repetition: inactive\n"); it it was disabled above, then you would never reach here, as there is a 'return' above. If you want to indicate the previous state and the new state durign a decision making process, then the log text should clearly indicate this. Having two lines printed "foobar active" and "foobar active" further below is very hard to understand. I think if at all, there should be one summary log line expressing what happesn (if there was any change). So basically, save the old value, then go through the decision making, compare it with the new value and _if_ it has changed, print a line about the change and ideally also the reason (e.g. by setting a cause_string or log_string variable in the code which is then used by the log statement at the end of the function. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:04:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:04:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:04:36 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging for ACCH repetition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging for ACCH repetition ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 13 Feb 2021 08:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:05:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:05:28 +0000 Subject: Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22880 ) Change subject: gsm: Fix bitfield order in dtap_header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 Gerrit-Change-Number: 22880 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:05:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:05:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:05:30 +0000 Subject: Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22880 ) Change subject: gsm: Fix bitfield order in dtap_header ...................................................................... gsm: Fix bitfield order in dtap_header This bitfield was added later and all osmocom code still uses the old field contain 1 byte "link_id". There's only one known user of the new bitfield which only uses it to log the SAPI name in osmocom, so no logical breakage is expected with this change (other than fixing a log line). While at it, fix a typo in comment describing related enum. Related: SYS#4909 Fixes: 392f607f2d42eb2839ccfc4c1b9e2c7cfaf3bcc2 Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index fe7776b..7ef7a29 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -49,12 +49,12 @@ uint8_t link_id; /* Backward compatibility */ struct { #if OSMO_IS_LITTLE_ENDIAN - uint8_t dlci_cc:2, + uint8_t dlci_sapi:3, /* enum gsm0406_dlci_sapi */ dlci_spare:3, - dlci_sapi:3; /* enum gsm0406_dlc_sapi */ + dlci_cc:2; #elif OSMO_IS_BIG_ENDIAN /* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ - uint8_t dlci_sapi:3, dlci_spare:3, dlci_cc:2; + uint8_t dlci_cc:2, dlci_spare:3, dlci_sapi:3; #endif }; }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67 Gerrit-Change-Number: 22880 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:06:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:06:41 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESO... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22827 ) Change subject: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2ed2580bbbdd6d3464833257b0dcb8ec6f8d699 Gerrit-Change-Number: 22827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:06:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:07:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:07:18 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22828 ) Change subject: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 Gerrit-Change-Number: 22828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:07:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:07:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:07:40 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22859 ) Change subject: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 Gerrit-Change-Number: 22859 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:07:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:07:41 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESO... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22827 ) Change subject: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI ...................................................................... nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI If the message is a duplicate (same tgt cell), simply ignore it. If the message contains a different tgt cell, restart the resolution: * Avoid re-creating the socket in that case * Avoid potentially picking a CTRL response for an older request Related: SYS#4909 Change-Id: Ia2ed2580bbbdd6d3464833257b0dcb8ec6f8d699 --- M src/nacc_fsm.c M src/neigh_cache.c M src/neigh_cache.h 3 files changed, 62 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 99c8164..8d5f23d 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -40,6 +40,9 @@ #define X(s) (1 << (s)) +/* Infer CTRL id (seqnum) for a given tgt arfcn+bsic (bsic range: 0-63) */ +#define arfcn_bsic_2_ctrl_id(arfcn, bsic) ((arfcn) * 100 + (bsic)) + static const struct osmo_tdef_state_timeout nacc_fsm_timeouts[32] = { [NACC_ST_INITIAL] = {}, [NACC_ST_WAIT_RESOLVE_RAC_CI] = { .T = PCU_TDEF_NEIGH_RESOLVE_TO }, @@ -354,15 +357,20 @@ LOGPFSML(fi, LOGL_DEBUG, "No CGI-PS found in cache, resolving " NEIGH_CACHE_ENTRY_KEY_FMT "...\n", NEIGH_CACHE_ENTRY_KEY_ARGS(&ctx->neigh_key)); - rc = osmo_sock_init2_ofd(&ctx->neigh_ctrl_conn->write_queue.bfd, - AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, - NULL, 0, pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port, - OSMO_SOCK_F_CONNECT); - if (rc < 0) { - LOGPFSML(fi, LOGL_ERROR, - "Failed to establish CTRL (neighbor resolution) connection to BSC r=%s:%u\n\n", - pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port); - goto err_term; + /* We may have changed to this state previously (eg: we are handling + * another Pkt cell Change Notify with different target). Avoid + * re-creating the socket in that case. */ + if (ctx->neigh_ctrl_conn->write_queue.bfd.fd == -1) { + rc = osmo_sock_init2_ofd(&ctx->neigh_ctrl_conn->write_queue.bfd, + AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, + NULL, 0, pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port, + OSMO_SOCK_F_CONNECT); + if (rc < 0) { + LOGPFSML(fi, LOGL_ERROR, + "Failed to establish CTRL (neighbor resolution) connection to BSC r=%s:%u\n\n", + pcu->vty.neigh_ctrl_addr, pcu->vty.neigh_ctrl_port); + goto err_term; + } } cmd = ctrl_cmd_create(ctx, CTRL_TYPE_GET); @@ -371,7 +379,8 @@ goto err_term; } - cmd->id = talloc_asprintf(cmd, "1"); + cmd->id = talloc_asprintf(cmd, "%u", arfcn_bsic_2_ctrl_id(ctx->neigh_key.tgt_arfcn, + ctx->neigh_key.tgt_bsic)); cmd->variable = talloc_asprintf(cmd, "neighbor_resolve_cgi_ps_from_lac_ci.%d.%d.%d.%d", ctx->neigh_key.local_lac, ctx->neigh_key.local_ci, ctx->neigh_key.tgt_arfcn, ctx->neigh_key.tgt_bsic); @@ -392,8 +401,25 @@ static void st_wait_resolve_rac_ci(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + struct gprs_rlcmac_bts *bts = ctx->ms->bts; + Packet_Cell_Change_Notification_t *notif; + struct neigh_cache_entry_key neigh_key; + switch (event) { case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (Packet_Cell_Change_Notification_t *)data; + if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) { + LOGPFSML(fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", + notif->Target_Cell.UnionType); + nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); + return; + } + /* If tgt cell changed, restart resolving it */ + if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) { + ctx->neigh_key = neigh_key; + nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); + } break; case NACC_EV_RX_RAC_CI: /* Assumption: ctx->cgi_ps has been filled by caller of the event */ @@ -588,8 +614,10 @@ }, [NACC_ST_WAIT_RESOLVE_RAC_CI] = { .in_event_mask = + X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_RX_RAC_CI), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_WAIT_REQUEST_SI) | X(NACC_ST_TX_CELL_CHG_CONTINUE), .name = "WAIT_RESOLVE_RAC_CI", @@ -662,15 +690,28 @@ { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)data; char *tmp = NULL, *tok, *saveptr; + unsigned int exp_id; - LOGPFSML(ctx->fi, LOGL_NOTICE, "Received CTRL message: type=%d %s: %s\n", - cmd->type, cmd->variable, osmo_escape_str(cmd->reply, -1)); + LOGPFSML(ctx->fi, LOGL_NOTICE, "Received CTRL message: type=%d %s %s: %s\n", + cmd->type, cmd->variable, cmd->id, osmo_escape_str(cmd->reply, -1)); if (cmd->type != CTRL_TYPE_GET_REPLY || !cmd->reply) { nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; } + /* Validate it's the seqnum from our last GET cmd, and not from older + * one we may have requested in case MS decided to resend Pkt Cell + * Change Notify with a different tgt cell: + */ + exp_id = arfcn_bsic_2_ctrl_id(ctx->neigh_key.tgt_arfcn, ctx->neigh_key.tgt_bsic); + if ((unsigned int)atoi(cmd->id) != exp_id) { + LOGPFSML(ctx->fi, LOGL_INFO, + "Received CTRL message with id=%s doesn't match our expected last id=%d, ignoring\n", + cmd->id, exp_id); + return; + } + /* TODO: Potentially validate cmd->variable contains same params as we sent, and that cmd->id matches the original set. We may want to keep the original cmd around by setting cmd->defer=1 when sending it. */ diff --git a/src/neigh_cache.c b/src/neigh_cache.c index ae619d3..3217f40 100644 --- a/src/neigh_cache.c +++ b/src/neigh_cache.c @@ -27,15 +27,6 @@ #include #include -static inline bool neigh_cache_entry_key_eq(const struct neigh_cache_entry_key *a, - const struct neigh_cache_entry_key *b) -{ - return a->local_lac == b->local_lac && - a->local_ci == b->local_ci && - a->tgt_arfcn == b->tgt_arfcn && - a->tgt_bsic == b->tgt_bsic; -} - static void neigh_cache_schedule_cleanup(struct neigh_cache *cache); static void neigh_cache_cleanup_cb(void *data) { diff --git a/src/neigh_cache.h b/src/neigh_cache.h index 4fed0fa..90260cd 100644 --- a/src/neigh_cache.h +++ b/src/neigh_cache.h @@ -48,6 +48,15 @@ #define NEIGH_CACHE_ENTRY_KEY_FMT "%" PRIu16 "-%" PRIu16 "-%" PRIu16 "-%" PRIu8 #define NEIGH_CACHE_ENTRY_KEY_ARGS(key) (key)->local_lac, (key)->local_ci, (key)->tgt_arfcn, (key)->tgt_bsic +static inline bool neigh_cache_entry_key_eq(const struct neigh_cache_entry_key *a, + const struct neigh_cache_entry_key *b) +{ + return a->local_lac == b->local_lac && + a->local_ci == b->local_ci && + a->tgt_arfcn == b->tgt_arfcn && + a->tgt_bsic == b->tgt_bsic; +} + struct neigh_cache_entry { struct llist_head list; /* to be included in neigh_cache->list */ struct timespec update_ts; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia2ed2580bbbdd6d3464833257b0dcb8ec6f8d699 Gerrit-Change-Number: 22827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:07:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:07:43 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22828 ) Change subject: nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI ...................................................................... nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI Similar to what's done in the previous commit, but this time when we are further forward in the resolution process. This can be triggered for instance because we are taking too much time to resolve and MS has timer to retransmit the Pkt cell Change Notify in case no response was received in time. This commit fixes osmo-pcu exiting due to ASSERT(0) since the event was already accepted but not being handled in the state function. Related: SYS#4909 Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 --- M src/nacc_fsm.c 1 file changed, 32 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 8d5f23d..5bc9c12 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -309,6 +309,29 @@ } } +/* Called on event NACC_EV_RX_CELL_CHG_NOTIFICATION on states after + * WAIT_RESOLVE_RAC_CI. Ignore duplicate messages, transition back if target + * cell changed. + */ +static void handle_retrans_pkt_cell_chg_notif(struct nacc_fsm_ctx *ctx, const Packet_Cell_Change_Notification_t *notif) +{ + struct gprs_rlcmac_bts *bts = ctx->ms->bts; + struct neigh_cache_entry_key neigh_key; + + if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) { + LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", + notif->Target_Cell.UnionType); + nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); + return; + } + /* If tgt cell changed, restart resolving it */ + if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) { + ctx->neigh_key = neigh_key; + nacc_fsm_state_chg(ctx->fi, NACC_ST_WAIT_RESOLVE_RAC_CI); + } + /* else: ignore it, it's a dup, carry on what we were doing */ +} + //////////////// // FSM states // //////////////// @@ -398,28 +421,15 @@ nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); } - static void st_wait_resolve_rac_ci(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; - struct gprs_rlcmac_bts *bts = ctx->ms->bts; - Packet_Cell_Change_Notification_t *notif; - struct neigh_cache_entry_key neigh_key; + const Packet_Cell_Change_Notification_t *notif; switch (event) { case NACC_EV_RX_CELL_CHG_NOTIFICATION: - notif = (Packet_Cell_Change_Notification_t *)data; - if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) { - LOGPFSML(fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", - notif->Target_Cell.UnionType); - nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); - return; - } - /* If tgt cell changed, restart resolving it */ - if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) { - ctx->neigh_key = neigh_key; - nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); - } + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); break; case NACC_EV_RX_RAC_CI: /* Assumption: ctx->cgi_ps has been filled by caller of the event */ @@ -489,9 +499,14 @@ static void st_wait_request_si(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; struct si_cache_entry *entry; switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_RX_SI: entry = (struct si_cache_entry *)data; /* Copy info since cache can be deleted at any point */ @@ -629,6 +644,7 @@ X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_RX_SI), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_TX_NEIGHBOUR_DATA) | X(NACC_ST_TX_CELL_CHG_CONTINUE), .name = "WAIT_REQUEST_SI", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 Gerrit-Change-Number: 22828 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:07:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:07:44 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22859 ) Change subject: nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states ...................................................................... nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states Related: SYS#4909 Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 --- M src/nacc_fsm.c 1 file changed, 31 insertions(+), 3 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 5bc9c12..3afa8b5 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -321,7 +321,8 @@ if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) { LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", notif->Target_Cell.UnionType); - nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); + if (ctx->fi->state != NACC_ST_TX_CELL_CHG_CONTINUE) + nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; } /* If tgt cell changed, restart resolving it */ @@ -520,19 +521,29 @@ } } -/* st_tx_neighbour_data_on_enter: - * At this point, we already received all required SI information to send stored +/* At this point, we already received all required SI information to send stored * in struct nacc_fsm_ctx. We now wait for scheduler to ask us to construct * RLCMAC DL CTRL messages to move FSM states forward */ +static void st_tx_neighbour_data_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + ctx->si_info_bytes_sent = 0; + ctx->container_idx = 0; +} static void st_tx_neighbour_data(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; struct nacc_ev_create_rlcmac_msg_ctx *data_ctx; bool all_si_info_sent; switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_CREATE_RLCMAC_MSG: data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data; data_ctx->msg = create_packet_neighbour_cell_data(ctx, data_ctx->tbf, &all_si_info_sent); @@ -557,9 +568,14 @@ static void st_cell_chg_continue(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; struct nacc_ev_create_rlcmac_msg_ctx *data_ctx; switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_CREATE_RLCMAC_MSG: data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data; data_ctx->msg = create_packet_cell_chg_continue(ctx, data_ctx, &ctx->continue_poll_fn); @@ -575,7 +591,14 @@ static void st_wait_cell_chg_continue_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; + const Packet_Cell_Change_Notification_t *notif; + switch (event) { + case NACC_EV_RX_CELL_CHG_NOTIFICATION: + notif = (const Packet_Cell_Change_Notification_t *)data; + handle_retrans_pkt_cell_chg_notif(ctx, notif); + break; case NACC_EV_TIMEOUT_CELL_CHG_CONTINUE: nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); break; @@ -656,8 +679,10 @@ X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_TX_CELL_CHG_CONTINUE), .name = "TX_NEIGHBOUR_DATA", + .onenter = st_tx_neighbour_data_on_enter, .action = st_tx_neighbour_data, }, [NACC_ST_TX_CELL_CHG_CONTINUE] = { @@ -665,15 +690,18 @@ X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_CREATE_RLCMAC_MSG), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK), .name = "TX_CELL_CHG_CONTINUE", .action = st_cell_chg_continue, }, [NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK] = { .in_event_mask = + X(NACC_EV_RX_CELL_CHG_NOTIFICATION) | X(NACC_EV_RX_CELL_CHG_CONTINUE_ACK) | X(NACC_EV_TIMEOUT_CELL_CHG_CONTINUE), .out_state_mask = + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | X(NACC_ST_TX_CELL_CHG_CONTINUE) | X(NACC_ST_DONE), .name = "WAIT_CELL_CHG_CONTINUE_ACK", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 Gerrit-Change-Number: 22859 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:08:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:08:31 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:08:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:08:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:08:34 +0000 Subject: Change in osmo-bsc[master]: bts.adoc: describe ACCH repetition settings In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22855 ) Change subject: bts.adoc: describe ACCH repetition settings ...................................................................... bts.adoc: describe ACCH repetition settings The manual currently does not mention ACCH repetition yet. Lets add some info on how to set up ACCH repetition correctly. Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Related: SYS#5114 --- M doc/manuals/chapters/bts.adoc 1 file changed, 69 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc index 6e7a308..e416775 100644 --- a/doc/manuals/chapters/bts.adoc +++ b/doc/manuals/chapters/bts.adoc @@ -511,6 +511,75 @@ <5> The rotate subset size parameter will be increased one ACC slot at a time: len=0 -> len=1 -> len=2 -> len=3 <6> The time until the subset size is further increased will be calculated based on current channel load +=== Configuring FACCH/SACCH repetition + +osmo-bts supports repetition of FACCH, uplink SACCH and downlink SACCH as +described in _3GPP TS 44.006_ <<3gpp-ts-44.006>>. When the feature is enabled +it is applied dynamically, depending on the rf signal quality and MS +capabilities. FACCH/SACCH repetition (or ACCH repetition) repeats the channel +block transmission two times. This allows the transceiver to combine the symbols +from two separate transmissions, which increases the probability that even a +weak signal can be decoded. + +Enabling ACCH repetition is especially recommended when using the AMR speech +codec. AMR already provides a forward error correction that is superior to +the forward error correction used with FACCH or SACCH. ACCH repetition is a +good way to even out this imbalance. + +The VTY configuration allows to enable repetition for all three channel types +separately. For FACCH the operator has the option to restrict the repetition +to LAPDM command frames only. Alternatively it is also possible to allow all +LAPDM frame types for repetition. The following example shows a typical +configuration where ACCH repetition is fully enabled. + +.Example typical configuration of ACCH repetition parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# repeat dl-facch all +OsmoBSC(config-net-bts)# repeat ul-sacch +OsmoBSC(config-net-bts)# repeat dl-sacch +OsmoBSC(config-net-bts)# repeat rxqual 4 +---- + +It should be noted that unless the repetition is enabled explicitly, the +repetition is turned off by default. If no threshold (see <>) is +set, the default value 4 (BER >= 1.6%) will be used. The following example shows +a minimal configuration where the repetition is only activated for FACCH LAPDM +command frames. + +.Example minimal configuration of ACCH repetition parameters at VTY BTS node +---- +OsmoBSC(config-net-bts)# repeat dl-facch command +---- + +Since it is not worthwhile to apply any repetition when the signal conditions +are good enough to ensure a reliable transmission in one round, the operator +has the option to set a threshold based on RXQUAL/BER at which the repetition +is switched on. The threshold mechanism implements a hysteresis to prevent +bouncing between repetition on and repetition off. Only when the signal quality +is increased again by two rxqual levels, the repetition is turned off again. It +is even possible to permanently enable repetition, regardless of the signal +quality. + +[[acch_rep_thr]] +.ACCH repetition thresholds +[options="header",cols="20%,40%,40%"] +|=== +|rxqual |enable threshold |disable threshold +|0 |(repetition always on) |(repetition always on) +|1 |asciimath:[BER >= 0.2%] |asciimath:[BER = 0%] +|2 |asciimath:[BER >= 0.4%] |asciimath:[BER = 0%] +|3 |asciimath:[BER >= 0.8%] |asciimath:[BER <= 0.2%] +|4 |asciimath:[BER >= 1.6%] |asciimath:[BER <= 0.4%] +|5 |asciimath:[BER >= 3.2%] |asciimath:[BER <= 0.8%] +|6 |asciimath:[BER >= 6.4%] |asciimath:[BER <= 1.6%] +|7 |asciimath:[BER >= 12.8%] |asciimath:[BER <= 3.2%] +|=== + +NOTE: osmo-bsc only sets the ACCH repetition parameters via RSL. Whether ACCH +repetition can be used depends on the BTS model and osmo-bts version. To +find out if a BTS supports ACCH repetition (BTS_FEAT_ACCH_REP), the VTY +command `show bts` can be used. + ==== RACH Parameter Configuration The following parameters allow control over how the MS can access the random -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1e27ac955882497bbeefac0c830708dd18ad46b3 Gerrit-Change-Number: 22855 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:09:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:09:02 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 ) Change subject: Move vty node into gbproxy_vty.c ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:09:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:10:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:10:19 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add MTU field for BSSGP ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 13 Feb 2021 08:10:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:11:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:11:20 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 ) Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 13 Feb 2021 08:11:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:12:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:12:23 +0000 Subject: Change in libosmo-netif[master]: Don't depend on libosmo-abis (by default) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22848 ) Change subject: Don't depend on libosmo-abis (by default) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 Gerrit-Change-Number: 22848 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 08:12:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:12:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:12:35 +0000 Subject: Change in libosmo-netif[master]: migrate to osmo_fd_{read, write}_{enable, disable}() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/20821 ) Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/20821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia8ffcbc61883a4e1615c101dbd3307771ae33974 Gerrit-Change-Number: 20821 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 08:12:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:12:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:12:37 +0000 Subject: Change in libosmo-netif[master]: migrate to osmo_fd_{read, write}_{enable, disable}() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/20821 ) Change subject: migrate to osmo_fd_{read,write}_{enable,disable}() ...................................................................... migrate to osmo_fd_{read,write}_{enable,disable}() Change-Id: Ia8ffcbc61883a4e1615c101dbd3307771ae33974 Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d --- M src/datagram.c M src/rs232.c M src/stream.c 3 files changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/datagram.c b/src/datagram.c index 8b68244..afae3e7 100644 --- a/src/datagram.c +++ b/src/datagram.c @@ -95,7 +95,7 @@ LOGP(DLINP, LOGL_DEBUG, "sending data\n"); if (llist_empty(&conn->tx_queue)) { - conn->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&conn->ofd); return 0; } lh = conn->tx_queue.next; @@ -236,7 +236,7 @@ struct msgb *msg) { msgb_enqueue(&conn->tx_queue, msg); - conn->ofd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&conn->ofd); } /* diff --git a/src/rs232.c b/src/rs232.c index 865ec97..b20c111 100644 --- a/src/rs232.c +++ b/src/rs232.c @@ -62,7 +62,7 @@ struct osmo_rs232 *r = ptr; /* we're again ready to transmit. */ - r->ofd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&r->ofd); } static int handle_ser_write(struct osmo_fd *bfd) @@ -75,7 +75,7 @@ LOGP(DLINP, LOGL_DEBUG, "writing data to rs232\n"); if (llist_empty(&r->tx_queue)) { - r->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&r->ofd); return 0; } lh = r->tx_queue.next; @@ -92,7 +92,7 @@ /* We've got more data to write, but we have to wait to make it. */ if (!llist_empty(&r->tx_queue) && r->cfg.delay_us) { - r->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&r->ofd); osmo_timer_schedule(&r->tx_timer, 0, r->cfg.delay_us); } return 0; @@ -255,7 +255,7 @@ void osmo_rs232_write(struct osmo_rs232 *r, struct msgb *msg) { msgb_enqueue(&r->tx_queue, msg); - r->ofd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&r->ofd); } void osmo_rs232_close(struct osmo_rs232 *r) diff --git a/src/stream.c b/src/stream.c index 3376126..e4fb668 100644 --- a/src/stream.c +++ b/src/stream.c @@ -335,7 +335,7 @@ int ret; if (llist_empty(&cli->tx_queue)) { - cli->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&cli->ofd); return 0; } lh = cli->tx_queue.next; @@ -391,7 +391,7 @@ /* If messages got enqueued while 'connecting', keep WRITE flag up to dispatch them upon next main loop step */ if (llist_empty(&cli->tx_queue)) - cli->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&cli->ofd); LOGSCLI(cli, LOGL_DEBUG, "connection done.\n"); cli->state = STREAM_CLI_STATE_CONNECTED; @@ -787,7 +787,7 @@ void osmo_stream_cli_send(struct osmo_stream_cli *cli, struct msgb *msg) { msgb_enqueue(&cli->tx_queue, msg); - cli->ofd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&cli->ofd); } /*! \brief Receive data via an Osmocom stream client @@ -1137,7 +1137,7 @@ LOGP(DLINP, LOGL_DEBUG, "sending data\n"); if (llist_empty(&conn->tx_queue)) { - conn->ofd.when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(&conn->ofd); return; } lh = conn->tx_queue.next; @@ -1287,7 +1287,7 @@ } msgb_enqueue(&conn->tx_queue, msg); - conn->ofd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&conn->ofd); } /*! \brief Receive data via Osmocom stream server -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/20821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia8ffcbc61883a4e1615c101dbd3307771ae33974 Gerrit-Change-Number: 20821 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:12:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:12:38 +0000 Subject: Change in libosmo-netif[master]: Don't depend on libosmo-abis (by default) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22848 ) Change subject: Don't depend on libosmo-abis (by default) ...................................................................... Don't depend on libosmo-abis (by default) The only reason we have a libosmo-netif -> libosmo-abis dependency is the lapd examples whihc are built but not even installed. Let's build those only if --enable-lapd-examples is specified at the command line, and remove the dependency to libosmo-abis in all other cases. Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 Closes: OS#4726 --- M configure.ac M contrib/jenkins.sh M contrib/libosmo-netif.spec.in M debian/control M examples/Makefile.am 5 files changed, 17 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 36c2f49..1b2a459 100644 --- a/configure.ac +++ b/configure.ac @@ -91,8 +91,19 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) -dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) + +AC_ARG_ENABLE([lapd_examples], + [AS_HELP_STRING( + [--enable-lapd-examples], + [Build some lapd examples] + )], + [lapd_examples=$enableval], [lapd_examples="no"]) +AS_IF([test "x$lapd_examples" = "xyes"], [ + PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) + AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples]) +]) +AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes") +AC_SUBST(ENABLE_LAPD) AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bf04643..543671c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -35,7 +35,7 @@ set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror +./configure --enable-sanitize --enable-werror --enable-lapd-examples $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in index 98d021b..95690a7 100644 --- a/contrib/libosmo-netif.spec.in +++ b/contrib/libosmo-netif.spec.in @@ -24,7 +24,6 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 BuildRequires: pkgconfig(libosmocore) >= 1.0.0 BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 diff --git a/debian/control b/debian/control index d242b48..8b76089 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ git, doxygen, libosmocore-dev (>= 1.3.0), - libosmo-abis-dev (>= 0.6.0), pkg-config, libpcap0.8-dev, libsctp-dev diff --git a/examples/Makefile.am b/examples/Makefile.am index 4125243..6d74238 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,8 +4,6 @@ noinst_PROGRAMS = ipa-stream-client \ ipa-stream-server \ - lapd-over-datagram-user \ - lapd-over-datagram-network \ stream-client \ stream-server \ rs232-read \ @@ -27,6 +25,8 @@ ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) +if ENABLE_LAPD +noinst_PROGRAMS += lapd-over-datagram-user lapd-over-datagram-network lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ @@ -36,6 +36,7 @@ lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) +endif stream_client_SOURCES = stream-client.c stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 Gerrit-Change-Number: 22848 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:13:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:13:32 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to neighbor_ident.c In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to neighbor_ident.c ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:13:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:14:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:14:59 +0000 Subject: Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22814 ) Change subject: Fix neigh resolution service on local neighbours ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22814/2/src/osmo-bsc/neighbor_ident.c File src/osmo-bsc/neighbor_ident.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22814/2/src/osmo-bsc/neighbor_ident.c at 361 PS2, Line 361: c interesting situation. And indeed, it can happen, as the neighbor cell search will report any cell, without knowing if it's GPRS capable or not. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:14:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:15:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:15:01 +0000 Subject: Change in osmo-bsc[master]: Move bts_ident_key to neighbor_ident.c In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22813 ) Change subject: Move bts_ident_key to neighbor_ident.c ...................................................................... Move bts_ident_key to neighbor_ident.c The function is not really handover specific, and will be used in other places in subsequent patches. Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 --- M include/osmocom/bsc/handover.h M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/handover_logic.c M src/osmo-bsc/neighbor_ident.c 4 files changed, 13 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h index d22ac86..a71bb98 100644 --- a/include/osmocom/bsc/handover.h +++ b/include/osmocom/bsc/handover.h @@ -86,8 +86,6 @@ struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for, bool log_errors); -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); - void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn, struct msgb *ho_request_msg); diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h index c8580e2..cab7f9e 100644 --- a/include/osmocom/bsc/neighbor_ident.h +++ b/include/osmocom/bsc/neighbor_ident.h @@ -45,6 +45,8 @@ void *cb_data), void *cb_data); +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts); + void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil); void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts); void neighbor_ident_vty_write_network(struct vty *vty, const char *indent); diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c index ade330d..b0d175a 100644 --- a/src/osmo-bsc/handover_logic.c +++ b/src/osmo-bsc/handover_logic.c @@ -322,17 +322,6 @@ return -ENODEV; } -struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) -{ - static struct neighbor_ident_key key; - key = (struct neighbor_ident_key){ - .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, - .arfcn = bts->c0->arfcn, - .bsic = bts->bsic, - }; - return &key; -} - static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c index 185cd0b..335091e 100644 --- a/src/osmo-bsc/neighbor_ident.c +++ b/src/osmo-bsc/neighbor_ident.c @@ -261,6 +261,17 @@ } } +struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts) +{ + static struct neighbor_ident_key key; + key = (struct neighbor_ident_key){ + .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS, + .arfcn = bts->c0->arfcn, + .bsic = bts->bsic, + }; + return &key; +} + /* Neighbor Resolution CTRL iface */ CTRL_CMD_DEFINE_RO(neighbor_resolve_cgi_ps_from_lac_ci, "neighbor_resolve_cgi_ps_from_lac_ci"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icae8b9045e497f850f22cb3b6f93acbf61b84746 Gerrit-Change-Number: 22813 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:15:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:15:03 +0000 Subject: Change in osmo-bsc[master]: Fix neigh resolution service on local neighbours In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22814 ) Change subject: Fix neigh resolution service on local neighbours ...................................................................... Fix neigh resolution service on local neighbours Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Related: SYS#4909 --- M src/osmo-bsc/neighbor_ident.c M tests/ctrl/osmo-bsc-neigh-test.cfg M tests/ctrl_test_runner.py 3 files changed, 109 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c index 335091e..3235508 100644 --- a/src/osmo-bsc/neighbor_ident.c +++ b/src/osmo-bsc/neighbor_ident.c @@ -276,6 +276,19 @@ CTRL_CMD_DEFINE_RO(neighbor_resolve_cgi_ps_from_lac_ci, "neighbor_resolve_cgi_ps_from_lac_ci"); +static int gsm_bts_get_cgi_ps(const struct gsm_bts *bts, struct osmo_cell_global_id_ps *cgi_ps) +{ + if (bts->gprs.mode == BTS_GPRS_NONE) + return -ENOTSUP; + + cgi_ps->rai.lac.plmn = bts->network->plmn; + cgi_ps->rai.lac.lac = bts->location_area_code; + cgi_ps->rai.rac = bts->gprs.rac; + cgi_ps->cell_identity = bts->cell_identity; + + return 0; +} + static int get_neighbor_resolve_cgi_ps_from_lac_ci(struct ctrl_cmd *cmd, void *data) { struct gsm_network *net = (struct gsm_network *)data; @@ -284,7 +297,9 @@ char *tmp = NULL, *tok, *saveptr; struct neighbor_ident_key ni; unsigned lac, cell_id; - const struct osmo_cell_global_id_ps *cgi_ps; + struct osmo_cell_global_id_ps local_cgi_ps; + const struct osmo_cell_global_id_ps *cgi_ps = NULL; + struct gsm_bts_ref *neigh; if (!cmd->variable) goto fmt_err; @@ -335,10 +350,26 @@ if (!neighbor_ident_key_valid(&ni)) goto fmt_err; - tgt_cell_li = neighbor_ident_get(net->neighbor_bss_cells, &ni); - if (!tgt_cell_li || tgt_cell_li->id_discr != CELL_IDENT_WHOLE_GLOBAL_PS || tgt_cell_li->id_list_len < 1) - goto notfound_err; - cgi_ps = &tgt_cell_li->id_list[0].global_ps; + /* Is there a local BTS that matches the key? */ + llist_for_each_entry(neigh, &bts_found->local_neighbors, entry) { + struct gsm_bts *neigh_bts = neigh->bts; + struct neighbor_ident_key *neigh_bts_key = bts_ident_key(neigh_bts); + neigh_bts_key->from_bts = ni.from_bts; + if (!neighbor_ident_key_match(neigh_bts_key, &ni, true)) + continue; + if (gsm_bts_get_cgi_ps(neigh->bts, &local_cgi_ps) < 0) + continue; /* Not supporting GPRS */ + cgi_ps = &local_cgi_ps; + break; + } + + /* No local neighbor found, looking for remote neighbors */ + if (!cgi_ps) { + tgt_cell_li = neighbor_ident_get(net->neighbor_bss_cells, &ni); + if (!tgt_cell_li || tgt_cell_li->id_discr != CELL_IDENT_WHOLE_GLOBAL_PS || tgt_cell_li->id_list_len < 1) + goto notfound_err; + cgi_ps = &tgt_cell_li->id_list[0].global_ps; + } ctrl_cmd_reply_printf(cmd, "%s", osmo_cgi_ps_name(cgi_ps)); talloc_free(tmp); diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index f1e71b6..2fbc8f8 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -46,6 +46,8 @@ oml ipa stream-id 255 line 0 codec-support fr gprs mode gprs + gprs routing area 5 + ! remote neigh: neighbor cgi-ps 23 42 423 2 5 arfcn 23 bsic 32 trx 0 rf_locked 0 @@ -78,6 +80,63 @@ timeslot 7 phys_chan_config TCH/F hopping enabled 0 + bts 1 + type sysmobts + band DCS1800 + cell_identity 123 + location_area_code 1 + base_station_id_code 55 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-description attach 1 + channel-description bs-pa-mfrms 5 + channel-description bs-ag-blks-res 1 + early-classmark-sending forbidden + ipa unit-id 55 0 + oml ipa stream-id 255 line 0 + codec-support fr + gprs mode gprs + gprs routing area 6 + neighbor bts 0 + trx 0 + rf_locked 0 + arfcn 880 + nominal power 23 + ! to use full TRX power, set max_power_red 0 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + bts 0 + ! local neigh, refers to bts 1: + neighbor cgi-ps 1 1 1 6 123 msc 0 type normal allow-emergency allow diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index fb983c9..501b917 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -501,11 +501,24 @@ def ctrl_app(self): return (4248, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") - def testCtrlNeighborResolution(self): + def testCtrlNeighborResolutionLocalBtsNr(self): + r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci.1.123.871.63') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'neighbor_resolve_cgi_ps_from_lac_ci.1.123.871.63') + self.assertEqual(r['value'], '001-01-1-5-6969') + + def testCtrlNeighborResolutionLocalWithoutArfcnBsic(self): + r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci.1.6969.880.55') + self.assertEqual(r['mtype'], 'GET_REPLY') + self.assertEqual(r['var'], 'neighbor_resolve_cgi_ps_from_lac_ci.1.6969.880.55') + self.assertEqual(r['value'], '001-01-1-6-123') + + def testCtrlNeighborResolutionWrongSyntax(self): r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci') self.assertEqual(r['mtype'], 'ERROR') self.assertEqual(r['error'], 'The format is ,,,') + def testCtrlNeighborResolutionRemote(self): r = self.do_get('neighbor_resolve_cgi_ps_from_lac_ci.1.6969.23.32') self.assertEqual(r['mtype'], 'GET_REPLY') self.assertEqual(r['var'], 'neighbor_resolve_cgi_ps_from_lac_ci.1.6969.23.32') -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I217e3550aa6d7f3c3cab4e545641d790ae12b23f Gerrit-Change-Number: 22814 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:15:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:15:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_cellid_to_RAI In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 ) Change subject: sgsn: Fix f_cellid_to_RAI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 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: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 Gerrit-Change-Number: 22881 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:15:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:15:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:15:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_process_attach_accept on ran_index != 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 ) Change subject: sgsn: Fix f_process_attach_accept on ran_index != 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 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: I7d859fd710dba96eb9b46c428243281183e1be12 Gerrit-Change-Number: 22884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 08:15:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:15:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:15:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_process_attach_accept on ran_index != 0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 ) Change subject: sgsn: Fix f_process_attach_accept on ran_index != 0 ...................................................................... sgsn: Fix f_process_attach_accept on ran_index != 0 Change-Id: I7d859fd710dba96eb9b46c428243281183e1be12 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 4c0a8ab..4e35144 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -765,12 +765,12 @@ } } -function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { +function f_process_attach_accept(PDU_GMM_AttachAccept aa, integer ran_index := 0) runs on BSSGP_ConnHdlr { /* mandatory IE */ var hexstring aa_plmn := f_RAI_to_plmn_hexstr(aa.routingAreaIdentification); - if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) { + if (not (g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc == aa_plmn)) { setverdict(fail, "mismatching PLMN in Attach Accept: " & hex2str(aa_plmn) - & "; expected " & hex2str(g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc)); + & "; expected " & hex2str(g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc)); mtc.stop; } g_pars.ra := aa.routingAreaIdentification; @@ -779,7 +779,8 @@ setverdict(fail, "unexpected P-TMSI allocation"); mtc.stop; } - f_upd_ptmsi_and_tlli(aa.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets); + f_upd_ptmsi_and_tlli(aa.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, + ran_index); } if (ispresent(aa.msIdentity)) { setverdict(fail, "unexpected TMSI allocation in non-combined attach"); @@ -802,7 +803,8 @@ setverdict(fail, "unexpected P-TMSI allocation"); mtc.stop; } - f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, ran_index); + f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, + ran_index); } if (ispresent(ra.msIdentity)) { setverdict(fail, "unexpected TMSI allocation in non-combined attach"); @@ -860,7 +862,7 @@ f_gmm_gsup_lu_isd(); l3_mt := f_receive_l3(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?), ran_index); - f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept); + f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept, ran_index); /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ f_send_l3(ts_GMM_ATTACH_COMPL, ran_index); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22884 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: I7d859fd710dba96eb9b46c428243281183e1be12 Gerrit-Change-Number: 22884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:15:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:15:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix f_cellid_to_RAI In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 ) Change subject: sgsn: Fix f_cellid_to_RAI ...................................................................... sgsn: Fix f_cellid_to_RAI Change-Id: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 7d47a1f..4c0a8ab 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -236,8 +236,8 @@ mncDigit3 := mcc_mnc[3], mncDigit1 := mcc_mnc[4], mncDigit2 := mcc_mnc[5], - lac := int2oct(cell_id.ra_id.lai.lac, 16), - rac := int2oct(cell_id.ra_id.rac, 8) + lac := int2oct(cell_id.ra_id.lai.lac, 2), + rac := int2oct(cell_id.ra_id.rac, 1) } return ret; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22881 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: I4f6d609119b4a9e211fb1b285e4fc3e42d8ebdb6 Gerrit-Change-Number: 22881 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:18:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:18:50 +0000 Subject: Change in osmo-gsm-manuals[master]: logging: add documentation for 'systemd-journal' target In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844 ) Change subject: logging: add documentation for 'systemd-journal' target ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I04c9f81b10ac56c020f537c3ad52026733b5c620 Gerrit-Change-Number: 22844 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 13 Feb 2021 08:18:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:18:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:18:52 +0000 Subject: Change in osmo-gsm-manuals[master]: logging: add documentation for 'systemd-journal' target In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844 ) Change subject: logging: add documentation for 'systemd-journal' target ...................................................................... logging: add documentation for 'systemd-journal' target Change-Id: I04c9f81b10ac56c020f537c3ad52026733b5c620 --- M common/chapters/logging.adoc 1 file changed, 78 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index 11ec774..b0a1f5e 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -290,6 +290,84 @@ by issuing the `logging timestamp 0` command. +==== Logging to systemd-journal + +systemd has been adopted by the majority of modern GNU/Linux distributions. +Along with various daemons and utilities it provides systemd-journald [1] - +a daemon responsible for event logging (syslog replacement). libosmocore +based applications can log messages directly to systemd-journald. + +The key difference from other logging targets is that systemd based logging +allows to offload rendering of the meta information, such as location +(file name, line number), subsystem, and logging level, to systemd-journald. +Furthermore, systemd allows to attach arbitrary meta fields to the logging +messages [2], which can be used for advanced log filtering. + +[1] https://www.freedesktop.org/software/systemd/man/systemd-journald.service.html +[2] https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html + +It was decided to introduce libsystemd as an optional dependency, +so it needs to be enabled explicitly at configure/build time: + +---- +$ ./configure --enable-systemd-logging +---- + +NOTE: Recent libosmocore packages provided by Osmocom for Debian and CentOS are +compiled *with* libsystemd (https://gerrit.osmocom.org/c/libosmocore/+/22651). + +You can configure systemd based logging in two ways: + +.Example: `systemd-journal` target with offloaded rendering +---- +log systemd-journal raw <1> + logging filter all 1 + logging level set-all notice +---- +<1> `raw` logging handler, rendering offloaded to systemd. + +In this example, logging messages will be passed to systemd without any meta +information (time, location, level, category) in the text itself, so all +the printing parameters like `logging print file` will be ignored. Instead, +the meta information is passed separately as _fields_ which can be retrieved +from the journal and rendered in any preferred way. + +---- +# Show Osmocom specific fields +$ journalctl --fields | grep OSMO + +# Filter messages by logging subsystem at run-time +$ journalctl OSMO_SUBSYS=DMSC -f + +# Render specific fields only +$ journalctl --output=verbose \ + --output-fields=SYSLOG_IDENTIFIER,OSMO_SUBSYS,CODE_FILE,CODE_LINE,MESSAGE +---- + +See `man 7 systemd.journal-fields` for a list of default fields, and +`man 1 journalctl` for general information and available formatters. + +.Example: `systemd-journal` target with libosmocore based rendering +---- +log systemd-journal <1> + logging filter all 1 + logging print file basename + logging print category-hex 0 + logging print category 1 + logging print level 1 + logging timestamp 0 <2> + logging color 1 <3> + logging level set-all notice +---- +<1> Generic logging handler, rendering is done by libosmocore. +<2> Disable timestamping, systemd will timestamp every message anyway. +<3> Colored messages can be rendered with `journalctl --output=cat`. + +In this example, logging messages will be pre-processed by libosmocore before +being passed to systemd. No additional fields will be attached, except the +logging level (`PRIORITY`). This mode is similar to _syslog_ and _stderr_. + + ==== Logging to stderr If you're not running the respective application as a daemon in the -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I04c9f81b10ac56c020f537c3ad52026733b5c620 Gerrit-Change-Number: 22844 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:19:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:19:05 +0000 Subject: Change in libosmo-sccp[master]: xua_snm: Implement handling of DUPU messages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 ) Change subject: xua_snm: Implement handling of DUPU messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 Gerrit-Change-Number: 22835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 13 Feb 2021 08:19:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:19:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:19:07 +0000 Subject: Change in libosmo-sccp[master]: xua_snm: Implement handling of DUPU messages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 ) Change subject: xua_snm: Implement handling of DUPU messages ...................................................................... xua_snm: Implement handling of DUPU messages A DUPU message in SUA and M3UA indicates the unavailability of a (MTP-level) user, i.e. the entire SCCP, ISUP, ... is not available. If we receive a DUPU (destination user part unavailable) message in ASP role, then we must * distribute it to any other ASPs for which we operate in SG mode * pass it as MTP-STATUS.ind to SCCP, which can then generates N-PCSTATE.ind to the SCCP User Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 --- M include/osmocom/sigtran/protocol/mtp.h M src/m3ua.c M src/osmo_ss7.c M src/sccp_internal.h M src/sccp_scmg.c M src/sua.c M src/xua_internal.h M src/xua_snm.c 8 files changed, 222 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/sigtran/protocol/mtp.h b/include/osmocom/sigtran/protocol/mtp.h index 8b990c0..2f0c7ac 100644 --- a/include/osmocom/sigtran/protocol/mtp.h +++ b/include/osmocom/sigtran/protocol/mtp.h @@ -22,3 +22,18 @@ }; extern const struct value_string mtp_si_vals[]; + + +/* Chapter 15.17.5 of Q.705 */ +enum mtp_unavail_cause { + MTP_UNAVAIL_C_UNKNOWN = 0x0, + MTP_UNAVAIL_C_UNEQUIP_REM_USER = 0x1, + MTP_UNAVAIL_C_INACC_REM_USER = 0x2, + /* reserved */ +}; + +extern const struct value_string mtp_unavail_cause_vals[]; + +static inline const char *mtp_unavail_cause_str(enum mtp_unavail_cause cs) { + return get_value_string(mtp_unavail_cause_vals, cs); +} diff --git a/src/m3ua.c b/src/m3ua.c index 6639c28..77326e0 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -812,8 +812,29 @@ } #endif +/* 3.4.5 Destination User Part Unavailable (DUPU) */ +static struct xua_msg *m3ua_encode_dupu(const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + uint32_t user_cause = (user << 16) | cause; -/* TODO: 3.4.5 Destination User Part Unavailable (DUPU) */ + xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_DUNA); + xua->hdr.version = M3UA_VERSION; + if (rctx) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_u32(xua, M3UA_IEI_AFFECTED_PC, dpc); + xua_msg_add_u32(xua, M3UA_IEI_USER_CAUSE, user_cause); + + if (info_string) { + xua_msg_add_data(xua, M3UA_IEI_INFO_STRING, + strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} /*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] * \param[in] asp ASP through which to transmit message. Must be ACTIVE. @@ -837,6 +858,21 @@ m3ua_tx_xua_asp(asp, xua); } +/*! Transmit SSNM DUPU message indicating user unavailability. + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] dpc affected point code + * \param[in] user the user (SI) that is unavailable + * \param[in] cause the cause of the user unavailability + * \param[in] info_string optional information string (can be NULL). */ +void m3ua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) +{ + struct xua_msg *xua = m3ua_encode_dupu(rctx, num_rctx, dpc, user, cause, info_str); + m3ua_tx_xua_asp(asp, xua); +} + /* received SNM message on ASP side */ static int m3ua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -857,6 +893,8 @@ xua_snm_rx_dava(asp, as, xua); break; case M3UA_SNM_DUPU: + xua_snm_rx_dupu(asp, as, xua); + break; case M3UA_SNM_SCON: case M3UA_SNM_DRST: LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA SNM message type %u\n", diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index e549708..a801cc9 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -59,6 +59,13 @@ static int32_t next_rctx = 1; static int32_t next_l_rk_id = 1; +const struct value_string mtp_unavail_cause_vals[] = { + { MTP_UNAVAIL_C_UNKNOWN, "unknown" }, + { MTP_UNAVAIL_C_UNEQUIP_REM_USER, "unequipped-remote-user" }, + { MTP_UNAVAIL_C_INACC_REM_USER, "inaccessible-remote-user" }, + { 0, NULL } +}; + struct value_string osmo_ss7_as_traffic_mode_vals[] = { { OSMO_SS7_AS_TMOD_BCAST, "broadcast" }, { OSMO_SS7_AS_TMOD_LOADSHARE, "loadshare" }, diff --git a/src/sccp_internal.h b/src/sccp_internal.h index a95b07d..23b3ef3 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -4,6 +4,7 @@ #include #include #include +#include #define SCCP_STR "Signalling Connection Control Part\n" @@ -141,4 +142,5 @@ void sccp_scmg_rx_ssn_prohibited(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi); void sccp_scmg_rx_mtp_pause(struct osmo_sccp_instance *inst, uint32_t dpc); void sccp_scmg_rx_mtp_resume(struct osmo_sccp_instance *inst, uint32_t dpc); +void sccp_scmg_rx_mtp_status(struct osmo_sccp_instance *inst, uint32_t dpc, enum mtp_unavail_cause cause); int sccp_scmg_init(struct osmo_sccp_instance *inst); diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index 49e09ca..a5d6226 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -122,6 +122,39 @@ * [this would require us to track SSNs at each PC, which we don't] */ } +void sccp_scmg_rx_mtp_status(struct osmo_sccp_instance *inst, uint32_t dpc, enum mtp_unavail_cause cause) +{ + struct osmo_scu_pcstate_param pcstate; + /* 1) Informs the translation function to update the translation tables. */ + /* 2) In the case where the SCCP has received an MTP-STATUS indication primitive relating to + Mark the status of the SCCP and each SSN for the relevant destination to "prohibited" + and initiates a subsystem status test with SSN = 1. If the cause in the MTP-STATUS + indication primitive indicates "unequipped user", then no subsystem status test is + initiated. */ + /* 3) Discontinues all subsystem status tests (including SSN = 1) if an MTP-STATUS + indication primitive is received with a cause of "unequipped SCCP". The SCCP + discontinues all subsystem status tests, except for SSN = 1, if an MTP-STATUS + indication primitive is received with a cause of either "unknown" or "inaccessible" */ + switch (cause) { + case MTP_UNAVAIL_C_UNKNOWN: + case MTP_UNAVAIL_C_UNEQUIP_REM_USER: + case MTP_UNAVAIL_C_INACC_REM_USER: + break; + } + + /* 4) local broadcast of "user-out-of-service" for each SSN at that dest + * [this would require us to track SSNs at each PC, which we don't] */ + + /* 6) local broadcast of "remote SCCP unavailable" */ + pcstate = (struct osmo_scu_pcstate_param) { + .affected_pc = dpc, + .restricted_importance_level = 0, + .sp_status = OSMO_SCCP_SP_S_ACCESSIBLE, + .remote_sccp_status = OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN, + }; + sccp_lbcs_local_bcast_pcstate(inst, &pcstate); +} + const struct value_string sccp_scmg_msgt_names[] = { { SCCP_SCMG_MSGT_SSA, "SSA (Subsystem Allowed)" }, { SCCP_SCMG_MSGT_SSP, "SSP (Subsystem Prohibited)" }, diff --git a/src/sua.c b/src/sua.c index c9e880f..2ff5a9a 100644 --- a/src/sua.c +++ b/src/sua.c @@ -823,6 +823,28 @@ } #endif +/* 3.4.5 Destination User Part Unavailable (DUPU) */ +static struct xua_msg *sua_encode_dupu(const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + uint32_t user_cause = (user << 16) | cause; + + xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_DUNA); + xua->hdr.version = SUA_VERSION; + if (rctx) + xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_u32(xua, SUA_IEI_AFFECTED_PC, dpc); + xua_msg_add_u32(xua, SUA_IEI_USER_CAUSE, user_cause); + + if (info_string) { + xua_msg_add_data(xua, SUA_IEI_INFO_STRING, strlen(info_string)+1, + (const uint8_t *) info_string); + } + return xua; +} /*! Transmit SSNM DUNA/DAVA message indicating [un]availability of certain point code[s] * \param[in] asp ASP through whihc to transmit message. Must be ACTIVE. @@ -848,6 +870,21 @@ sua_tx_xua_asp(asp, xua); } +/*! Transmit SSNM DUPU message indicating user unavailability. + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] dpc affected point code + * \param[in] user the user (SI) that is unavailable + * \param[in] cause the cause of the user unavailability + * \param[in] info_string optional information string (can be NULL). */ +void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) +{ + struct xua_msg *xua = sua_encode_dupu(rctx, num_rctx, dpc, user, cause, info_str); + sua_tx_xua_asp(asp, xua); +} + /* received SNM message on ASP side */ static int sua_rx_snm_asp(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -867,6 +904,8 @@ xua_snm_rx_dava(asp, as, xua); break; case SUA_SNM_DUPU: + xua_snm_rx_dupu(asp, as, xua); + break; case SUA_SNM_SCON: case SUA_SNM_DRST: LOGPASP(asp, DLSUA, LOGL_NOTICE, "Received unsupported SUA SNM message type %u\n", diff --git a/src/xua_internal.h b/src/xua_internal.h index e76fddf..4c6bb29 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -21,6 +21,8 @@ void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, const uint32_t *smi, const char *info_string, bool available); +void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua); int m3ua_hmdc_rx_from_l2(struct osmo_ss7_instance *inst, struct xua_msg *xua); @@ -28,9 +30,12 @@ void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_string, bool available); +void m3ua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua); void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); +void xua_snm_rx_dupu(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); int m3ua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); struct msgb *m3ua_msgb_alloc(const char *name); diff --git a/src/xua_snm.c b/src/xua_snm.c index 2a383c7..0c14964 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "xua_internal.h" #include "sccp_internal.h" @@ -99,6 +100,22 @@ } } +static void xua_tx_upu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_dupu(asp, rctx, num_rctx, dpc, user, cause, info_str); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_dupu(asp, rctx, num_rctx, dpc, user, cause, info_str); + break; + default: + break; + } +} + + /* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, const uint32_t *aff_pc, unsigned int num_aff_pc, @@ -208,6 +225,37 @@ } } +static void xua_snm_upu(struct osmo_ss7_as *as, uint32_t dpc, uint16_t user, uint16_t cause, + const char *info_str) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + + /* Translate to MTP-STATUS.ind towards SCCP (will create N-PCSTATE.ind to SCU) */ + if (s7i->sccp && user == MTP_SI_SCCP) + sccp_scmg_rx_mtp_status(s7i->sccp, dpc, cause); + + /* inform remote ASPs via DUPU */ + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send DAVA/DUNA if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + + xua_tx_upu(asp, rctx, num_rctx, dpc, user, cause, info_str); + } +} /* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) @@ -323,3 +371,37 @@ ie_aff_pc->len / sizeof(uint32_t), info_str, true); } } + +/* an incoming SUA/M3UA DUPU was received from a remote SG */ +void xua_snm_rx_dupu(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + uint32_t aff_pc = xua_msg_get_u32(xua, SUA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, SUA_IEI_INFO_STRING); + /* TODO: should our processing depend on the RCTX included? I somehow don't think so */ + //struct xua_msg_part *ie_rctx = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + uint32_t cause_user; + uint16_t cause, user; + + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) + return; + + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + cause_user = xua_msg_get_u32(xua, M3UA_IEI_USER_CAUSE); + break; + case OSMO_SS7_ASP_PROT_SUA: + cause_user = xua_msg_get_u32(xua, SUA_IEI_USER_CAUSE); + break; + default: + return; + } + + cause = cause_user >> 16; + user = cause_user & 0xffff; + LOGPASP(asp, log_ss, LOGL_NOTICE, "Rx DUPU(%s) for %s User %s, cause %u\n", + info_str ? info_str : "", osmo_ss7_pointcode_print(asp->inst, aff_pc), + get_value_string(mtp_si_vals, user), cause); + + xua_snm_upu(as, aff_pc, user, cause, info_str); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1559ed0f761a8495b222df48c6bd43798e220471 Gerrit-Change-Number: 22835 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 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: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sat, 13 Feb 2021 08:20:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sat, 13 Feb 2021 08:20:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 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: I42908a00f8d076e3559efde298a739d6b26d090e Gerrit-Change-Number: 22858 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sat, 13 Feb 2021 08:20:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 ) Change subject: pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements ...................................................................... pcu: Convert f_handle_pkt_neighbor_cell_data impl to use alt statements Change-Id: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 111 insertions(+), 73 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 34b7e79..e59c18d 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -533,6 +533,17 @@ } } +altstep as_ms_rx_fail_dummy(inout GprsMS ms, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var BTS_PDTCH_Block data_msg; + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL())) -> value data_msg { + setverdict(fail, "Unexpected Dummy Ctrl block ", data_msg); + f_shutdown(__BFILE__, __LINE__); + } +} + altstep as_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn, template RlcmacDlBlock t_pkt_ass := ?, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, @@ -807,6 +818,101 @@ BTS.send(pcu_msg_cnf); } + +altstep as_ms_rx_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, + inout uint5_t exp_container_idx /* := 0 */, + inout integer si_offset /* := 0 */, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var integer len; + var octetstring exp_si_chunk; + var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + var BTS_PDTCH_Block data_msg; + var boolean do_repeat := true; + + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_NEIGH_CELL_DATA(gtfi, exp_container_idx)) + )) -> value data_msg { + + var PacketNeighbourCellData neigh_data := data_msg.dl_block.ctrl.payload.u.neighbour_cell_data; + var PacketNeighbourCellDataContainer cont := neigh_data.container_list[0]; + + if (cont.cd_length == 31) { /* continues on next message */ + len := lengthof(cont.container_data); + exp_si_chunk := substr(exp_si, si_offset, len); + if (cont.container_data != exp_si_chunk) { + setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", + cont.container_data, " vs exp ", exp_si_chunk); + f_shutdown(__BFILE__, __LINE__); + } + si_offset := si_offset + len; + } else if (cont.cd_length == 0) { + /* we are done */ + if (si_offset != lengthof(exp_si)) { + setverdict(fail, "Rx unexpectd SI length ", si_offset, + " vs exp ", lengthof(exp_si)); + f_shutdown(__BFILE__, __LINE__); + } + do_repeat := false; + } else { /* data length, last message */ + len := cont.cd_length; + exp_si_chunk := substr(exp_si, si_offset, len); + if (cont.container_data != exp_si_chunk) { + setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", + cont.container_data, " vs exp ", exp_si_chunk); + f_shutdown(__BFILE__, __LINE__); + } + si_offset := si_offset + len; + /* we are done */ + if (si_offset != lengthof(exp_si)) { + setverdict(fail, "Rx unexpectd SI length ", si_offset, + " vs exp ", lengthof(exp_si)); + f_shutdown(__BFILE__, __LINE__); + } + do_repeat := false; + } + + exp_container_idx := exp_container_idx + 1; + + if (do_repeat) { + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + } +} + +/* Handle groups of PKT NEIGHBOUR CELL DATA packets */ +function f_ms_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si) +runs on MS_BTS_IFACE_CT { + var uint5_t exp_container_idx := 0; + var integer si_offset := 0; + var BTS_PDTCH_Block data_msg; + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum; + + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + alt { + [exp_container_idx == 0] as_ms_rx_ignore_dummy(ms, nr); + [exp_container_idx > 0] as_ms_rx_fail_dummy(ms, nr); + [] as_ms_rx_pkt_neighbor_cell_data(ms, exp_si, exp_container_idx, si_offset, nr); + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DL_CTRL(?, ?) + )) -> value data_msg { + var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + setverdict(fail, "Rx unexpected DL block: ", data_msg.dl_block, " vs exp ", + tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_NEIGH_CELL_DATA(gtfi, exp_container_idx))); + f_shutdown(__BFILE__, __LINE__); + } + }; + + return; +} + //////////////////////// // Low level APIs //////////////////////// diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index cd7a4ec..a937bf4 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3544,74 +3544,6 @@ return dl_block; } -/* Handle groups of PKT NEIGHBOUR CELL DATA packets */ -private function f_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si) -runs on RAW_PCU_Test_CT { - var RlcmacDlBlock dl_block; - var uint32_t sched_fn; - var integer i := 0; - var uint5_t exp_container_idx := 0; - var integer si_offset := 0; - var integer len; - var octetstring exp_si_chunk; - var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; - - dl_block := f_skip_dummy(50, sched_fn); - - while (true) { - var template RlcmacDlCtrlMsg exp_msg; exp_msg := - tr_RlcMacDlCtrl_PKT_NEIGH_CELL_DATA(gtfi, exp_container_idx); - - /* Make sure last Dl block is a Pkt Neighbour Cell Data */ - if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, exp_msg))) { - setverdict(fail, "Rx unexpected DL block: ", dl_block, " vs exp ", tr_RLCMAC_DL_CTRL(?, exp_msg)); - f_shutdown(__BFILE__, __LINE__); - } - var PacketNeighbourCellData neigh_data := dl_block.ctrl.payload.u.neighbour_cell_data; - var PacketNeighbourCellDataContainer cont := neigh_data.container_list[0]; - - if (cont.cd_length == 31) { /* continues on next message */ - len := lengthof(cont.container_data); - exp_si_chunk := substr(exp_si, si_offset, len); - if (cont.container_data != exp_si_chunk) { - setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", - cont.container_data, " vs exp ", exp_si_chunk); - f_shutdown(__BFILE__, __LINE__); - } - si_offset := si_offset + len; - } else if (cont.cd_length == 0) { - /* we are done */ - if (si_offset != lengthof(exp_si)) { - setverdict(fail, "Rx unexpectd SI length ", si_offset, - " vs exp ", lengthof(exp_si)); - f_shutdown(__BFILE__, __LINE__); - } - break; - } else { /* data length, last message */ - len := cont.cd_length; - exp_si_chunk := substr(exp_si, si_offset, len); - if (cont.container_data != exp_si_chunk) { - setverdict(fail, "Rx unexpected SI chunk at offset ", si_offset, ": ", - cont.container_data, " vs exp ", exp_si_chunk); - f_shutdown(__BFILE__, __LINE__); - return; - } - si_offset := si_offset + len; - /* we are done */ - if (si_offset != lengthof(exp_si)) { - setverdict(fail, "Rx unexpectd SI length ", si_offset, - " vs exp ", lengthof(exp_si)); - f_shutdown(__BFILE__, __LINE__); - } - break; - } - - exp_container_idx := exp_container_idx + 1; - f_rx_rlcmac_dl_block(dl_block, sched_fn); - } - return; -} - private function f_outbound_nacc_rim_tx_resp(PCUIF_info_ind info_ind) runs on RAW_PCU_Test_CT { var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), @@ -3693,7 +3625,7 @@ } /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4213,7 +4145,7 @@ } /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4296,7 +4228,7 @@ } /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4379,7 +4311,7 @@ as_outbound_nacc_rim_resolve(info_ind); /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); @@ -4464,7 +4396,7 @@ as_outbound_nacc_rim_resolve(info_ind); /* Announce SI back to MS, continue NACC procedure */ - f_handle_pkt_neighbor_cell_data(ms, si_default); + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ f_rx_rlcmac_dl_block(dl_block, sched_fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22856 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: Iac9306cdcf16d9eaa750f6ca10f0c9df6f2c7453 Gerrit-Change-Number: 22856 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* ...................................................................... pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_dup* These tests verify retransmission of duplicated Pkt Cell Change Notification messages are ignored once the NACC procedure is already ongoig. Related: SYS#4909 Change-Id: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 223 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index e59c18d..34406b9 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -822,7 +822,8 @@ altstep as_ms_rx_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, inout uint5_t exp_container_idx /* := 0 */, inout integer si_offset /* := 0 */, - template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, + boolean single_step := false) runs on MS_BTS_IFACE_CT { var integer len; var octetstring exp_si_chunk; @@ -874,7 +875,7 @@ exp_container_idx := exp_container_idx + 1; - if (do_repeat) { + if (not single_step and do_repeat) { BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), @@ -885,12 +886,13 @@ } /* Handle groups of PKT NEIGHBOUR CELL DATA packets */ -function f_ms_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si) +function f_ms_handle_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum, + uint5_t exp_container_idx := 0, + integer si_offset := 0, + boolean single_step := false) runs on MS_BTS_IFACE_CT { - var uint5_t exp_container_idx := 0; - var integer si_offset := 0; var BTS_PDTCH_Block data_msg; - template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum; BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -899,7 +901,7 @@ alt { [exp_container_idx == 0] as_ms_rx_ignore_dummy(ms, nr); [exp_container_idx > 0] as_ms_rx_fail_dummy(ms, nr); - [] as_ms_rx_pkt_neighbor_cell_data(ms, exp_si, exp_container_idx, si_offset, nr); + [] as_ms_rx_pkt_neighbor_cell_data(ms, exp_si, exp_container_idx, si_offset, nr, single_step); [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DL_CTRL(?, ?) )) -> value data_msg { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a937bf4..2b6c17f 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4245,6 +4245,217 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while sending Pkt Neigh Data Change */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup3() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Receive first Pkt Neigh data Change, then trigger a new Pkt Cell Change Notif: */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, single_step := true); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* It should be ignored, let's continue fetching Pkt Neigh Data Change */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, f_ms_tx_TsTrxBtsNum(ms), 1, 16); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while sending Pkt Cell Change Continue */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup4() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* trigger a dup Pkt Cell Change Notif, it should be ignored: */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while waiting for Pkt Cell Change Continue CTRL ACK */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_dup5() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* trigger a dup Pkt Cell Change Notif, it should be ignored: */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + /* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) * while waiting for CTRL resolution */ testcase TC_nacc_outbound_pkt_cell_chg_notif_twice() runs on RAW_PCU_Test_CT { @@ -4642,6 +4853,9 @@ execute( TC_nacc_outbound_si_resolve_timeout() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_dup2() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup3() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup4() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_dup5() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice2() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22857 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: Ib83eacfab7a73a2a51ab08801ff1c00c0058057c Gerrit-Change-Number: 22857 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 ) Change subject: pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* ...................................................................... pcu: Introduce several tests TC_nacc_outbound_pkt_cell_chg_notif_twice* These tests verify the NACC FSM adapts to MS restarting the NACC procedure at any point when it selects for another tgt cell. Related: SYS#4909 Change-Id: I42908a00f8d076e3559efde298a739d6b26d090e --- M pcu/PCU_Tests.ttcn 1 file changed, 269 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 2b6c17f..4699d3e 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4624,6 +4624,272 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time) + * while sending Pkt Neigh Data Change */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice3() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Receive first Pkt Neigh data Change, then trigger a new Pkt Cell Change Notif (different ARFCN+BSIC): */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, single_step := true); + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* It should trigger RAC_CI resolution to start again: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + /* Transmit SI back to MS */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (different tgt cell) while sending Pkt Cell Change Continue */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice4() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* trigger a Pkt Cell Change Notif with different tgt cell */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* PCU TBF NACC state changed, so we should next receive a dummy block: */ + f_rx_rlcmac_dl_block_exp_dummy(dl_block, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* It should trigger RAC_CI resolution to start again: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + /* Transmit SI back to MS */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + +/* Test MS sending Pkt Cell Change Notification twice (different tgt cell) while waiting for Pkt Cell Change Continue CTRL ACK*/ +testcase TC_nacc_outbound_pkt_cell_chg_notif_twice5() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + /* Announce SI back to MS, continue NACC procedure */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + + /* trigger a Pkt Cell Change Notif with different tgt cell */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn + 1, req_bsic + 1); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + /* PCU TBF NACC state changed, so we should next receive a dummy block: */ + f_rx_rlcmac_dl_block_exp_dummy(dl_block); + + /* It should trigger RAC_CI resolution to start again: */ + ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn + 1) & "." & + int2str(req_bsic + 1); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + /* Transmit SI back to MS */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -4858,6 +5124,9 @@ execute( TC_nacc_outbound_pkt_cell_chg_notif_dup5() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice2() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice3() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice4() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_twice5() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22858 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: I42908a00f8d076e3559efde298a739d6b26d090e Gerrit-Change-Number: 22858 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:20:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:20:35 +0000 Subject: Change in osmo-gbproxy[master]: Move vty node into gbproxy_vty.c In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 ) Change subject: Move vty node into gbproxy_vty.c ...................................................................... Move vty node into gbproxy_vty.c This is no longer shared with osmo-sgsn and osmo-gtphub Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 --- M src/Makefile.am M src/gb_proxy_main.c M src/gb_proxy_vty.c D src/vty.h 4 files changed, 5 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index c08d40f..20d5b8a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,5 +37,4 @@ noinst_HEADERS = \ debug.h \ - vty.h \ $(NULL) diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c index 0e36c06..6bd8bd8 100644 --- a/src/gb_proxy_main.c +++ b/src/gb_proxy_main.c @@ -43,7 +43,6 @@ #include #include "debug.h" -#include "vty.h" #include #include diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index f069e88..04c7173 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -40,7 +40,6 @@ #include "debug.h" #include -#include "vty.h" #include #include @@ -65,6 +64,11 @@ /* * vty code for gbproxy below */ +enum gbproxy_vty_node { + GBPROXY_NODE = _LAST_OSMOVTY_NODE + 1, + SGSN_NODE, +}; + static struct cmd_node gbproxy_node = { GBPROXY_NODE, "%s(config-gbproxy)# ", diff --git a/src/vty.h b/src/vty.h deleted file mode 100644 index d2e3d9a..0000000 --- a/src/vty.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include - -enum bsc_vty_node { - GBPROXY_NODE = _LAST_OSMOVTY_NODE + 1, - SGSN_NODE, - GTPHUB_NODE, -}; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5329ca39e8ecfe29862b0b1f9afa7d35e678a181 Gerrit-Change-Number: 22864 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 08:46:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 08:46:46 +0000 Subject: Change in osmo-bts[master]: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22894 ) Change subject: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" ...................................................................... add support for sysmoBTS 1003 aka "1002 with GPS and PoE" There's a minor derivative version of sysmoBTS 1002 which has built-in GPS and PoE. We call it 1003 in the EEPROM. Let's treat it identical to 1002 in the existing code base. Related: SYS#5327 Change-Id: Ia558587d36a75a1db1951d25b471b3f2e78ef4c9 --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/misc/sysmobts_eeprom.h M src/osmo-bts-sysmo/misc/sysmobts_par.c 3 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/22894/1 diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 2e4765d..07f36db 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1860,7 +1860,8 @@ LOGP(DL1C, LOGL_NOTICE, "Assuming 1002 for sysmoBTS " "Model number %u\n", fl1h->hw_info.model_nr); /* fall-through */ - case 1002: + case 1002: /* sysmoBTS 1002 */ + case 1003: /* sysmoBTS 1002 with GPS and PoE */ set_power_param(&trx->power_params, 23, 0); } } diff --git a/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h b/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h index b7a27fb..9c2b839 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h @@ -32,6 +32,7 @@ enum sysmobts_model_number { MODEL_SYSMOBTS_1002 = 1002, + MODEL_SYSMOBTS_1003 = 1003, MODEL_SYSMOBTS_1020 = 1020, MODEL_SYSMOBTS_2050 = 2050, }; diff --git a/src/osmo-bts-sysmo/misc/sysmobts_par.c b/src/osmo-bts-sysmo/misc/sysmobts_par.c index de81fff..f1fe8f2 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_par.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_par.c @@ -341,6 +341,8 @@ case 0xffff: case 1002: return "sysmoBTS 1002"; + case 1003: + return "sysmoBTS 1002+GPS+PoE"; case 2050: switch(trx_num) { case 0: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia558587d36a75a1db1951d25b471b3f2e78ef4c9 Gerrit-Change-Number: 22894 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 12:48:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 12:48:27 +0000 Subject: Change in libosmocore[master]: BVC FSM: Treat overlapping BVC-RESET as implicit ACK References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22895 ) Change subject: BVC FSM: Treat overlapping BVC-RESET as implicit ACK ...................................................................... BVC FSM: Treat overlapping BVC-RESET as implicit ACK If the BSS (or SGSN) has sent a BVC-RESET PDU for a BVCI to the SGSN (or BSS) and is awaiting a BVC-RESET- ACK PDU in response, but instead receives a BVC-RESET PDU indicating the same BVCI, then this shall be interpreted as a BVC-RESET ACK PDU and the T2 timer shall be stopped. Related: OS#4974 Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 --- M src/gb/bssgp_bvc_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/22895/1 diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index 8d284d1..ce9079d 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -377,6 +377,12 @@ struct msgb *rx = NULL, *tx; switch (event) { + case BSSGP_BVCFSM_E_RX_RESET: + /* 48.018 Section 8.4.3: If the BSS (or SGSN) has sent a BVC-RESET PDU for a BVCI to + * the SGSN (or BSS) and is awaiting a BVC-RESET-ACK PDU in response, but instead + * receives a BVC-RESET PDU indicating the same BVCI, then this shall be interpreted + * as a BVC-RESET ACK PDU and the T2 timer shall be stopped. */ + /* fall-through */ case BSSGP_BVCFSM_E_RX_RESET_ACK: rx = data; tp = (const struct tlv_parsed *) msgb_bcid(rx); @@ -606,7 +612,8 @@ }, [BSSGP_BVCFSM_S_WAIT_RESET_ACK]= { .name = "WAIT_RESET_ACK", - .in_event_mask = S(BSSGP_BVCFSM_E_RX_RESET_ACK), + .in_event_mask = S(BSSGP_BVCFSM_E_RX_RESET_ACK) | + S(BSSGP_BVCFSM_E_RX_RESET), .out_state_mask = S(BSSGP_BVCFSM_S_UNBLOCKED) | S(BSSGP_BVCFSM_S_BLOCKED) | S(BSSGP_BVCFSM_S_WAIT_RESET_ACK), -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 Gerrit-Change-Number: 22895 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:49:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix configuration (ip-sns syntax) References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22896 ) Change subject: gbproxy: Fix configuration (ip-sns syntax) ...................................................................... gbproxy: Fix configuration (ip-sns syntax) It's sad that this config file has again been forgotten. Change-Id: Ic9184669f6459c44fbb81e05b54028eca1b54db5 Related: SYS#5354 --- M gbproxy/osmo-gbproxy.fr.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/22896/1 diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index d0f8595..9595475 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -34,9 +34,9 @@ timer tns-alive 3 timer tns-alive-retries 10 nse 101 - ip-sns 127.0.0.10 7777 + ip-sns-remote 127.0.0.10 7777 nse 102 - ip-sns 127.0.0.11 8888 + ip-sns-remote 127.0.0.11 8888 nse 2001 nsvc fr hdlcnet1 dlci 16 nsvci 1 nsvc fr hdlcnet2 dlci 17 nsvci 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22896 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: Ic9184669f6459c44fbb81e05b54028eca1b54db5 Gerrit-Change-Number: 22896 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:49:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:49:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Factor-out function to broadcast to all NS_VCs References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22897 ) Change subject: NS_Emulation: Factor-out function to broadcast to all NS_VCs ...................................................................... NS_Emulation: Factor-out function to broadcast to all NS_VCs Change-Id: I8cd16031dbbd244dcff74fc8a1cd69e9f8a06dbf --- M library/NS_Emulation.ttcnpp 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/22897/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 6d8113c..24c9941 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -461,6 +461,12 @@ } } + private function f_broadcast_ns_ctrl(template (value) NsCtrlRequest req) runs on NS_CT { + for (var integer i := 0; i < lengthof(g_nsvcs); i := i+1) { + NSVC.send(req) to g_nsvcs[i].vc_conn; + } + } + /* simple IP Sub-Network Service responder for the SGSN side. This is not a full implementation * of the protocol, merely sufficient to make the PCU/BSS side happy to proceed */ private altstep as_vcg_sns_sgsn() runs on NS_CT { @@ -489,9 +495,7 @@ /* success */ log("SNS Config succeeded. Sending Alive"); /* inform all NS-VC that they are now considered alive */ - for (var integer i := 0; i < lengthof(g_nsvcs); i := i+1) { - NSVC.send(NsCtrlRequest:StartAliveProcedure) to g_nsvcs[i].vc_conn; - } + f_broadcast_ns_ctrl(NsCtrlRequest:StartAliveProcedure); } [] NSVC.receive(SnsIndication:{sind.nsvci, tr_SNS_CONFIG_ACK(g_config.nsei, ?)}) from vc { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22897 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: I8cd16031dbbd244dcff74fc8a1cd69e9f8a06dbf Gerrit-Change-Number: 22897 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:49:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:49:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: factor-out as_ns_common_status() altstep References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22898 ) Change subject: NS_Emulation: factor-out as_ns_common_status() altstep ...................................................................... NS_Emulation: factor-out as_ns_common_status() altstep This is a new altstep which groups all handling of NsStatusInd. Right now it's only used from one place, but upcoming patches will re-use it elsewhere. Change-Id: I4e8e7d19c764cc977beb84a6859c9ce73518b653 --- M library/NS_Emulation.ttcnpp 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/22898/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 24c9941..1b9b1df 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -352,13 +352,8 @@ return res; } - private altstep as_ns_common() runs on NS_CT { + private altstep as_ns_common_status() runs on NS_CT { var NsStatusIndication rx_nssi; - var NsUnitdataIndication rx_nsudi; - var NsUnitdataRequest rx_nsudr; - var NsDisableVcRequest rx_disar; - var NsEnableVcRequest rx_enar; - /* pass from NS-VCs up to user */ [] NSVC.receive(tr_NsStsInd(g_config.nsei, ?, ?, NSVC_S_ALIVE_UNBLOCKED)) -> value rx_nssi { /* check if this one is the first to be unblocked */ var integer num_nsvc_unblocked := f_count_nsvcs_in_state(NSVC_S_ALIVE_UNBLOCKED); @@ -385,6 +380,15 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received NsStatusInd for invalid NSEI: ", rx_nssi)); } + } + + private altstep as_ns_common() runs on NS_CT { + var NsUnitdataIndication rx_nsudi; + var NsUnitdataRequest rx_nsudr; + var NsDisableVcRequest rx_disar; + var NsEnableVcRequest rx_enar; + /* pass from NS-VCs up to user */ + [] as_ns_common_status(); [] NSVC.receive(tr_NsUdInd(g_config.nsei, ?, ?)) -> value rx_nsudi { NS_SP.send(rx_nsudi); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22898 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: I4e8e7d19c764cc977beb84a6859c9ce73518b653 Gerrit-Change-Number: 22898 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:49:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:49:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Work around "alive" race condition in IP-SNS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22899 ) Change subject: NS_Emulation: Work around "alive" race condition in IP-SNS ...................................................................... NS_Emulation: Work around "alive" race condition in IP-SNS We need to modify the state of each NS-VC within a NS-VCG/NSE once we receive the final SNS-CONFIG-ACK PDU. However, sometimes the IUT sends its first NS-PDU _before_ we even have communicated the state-change locally to all our NS-VCs. In order to avoid the problem, let's mark the NS-VCs as alive before sending the the SNS-CONFIG. This means we have one RTT more time to locally propagate the state change to all NS-VCs. Change-Id: Idac522a81f01553df52dc012cbab15e1c73c0862 Closes: OS#5023 --- M library/NS_Emulation.ttcnpp 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/22899/1 diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 1b9b1df..38f132a 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -263,7 +263,8 @@ type enumerated NsCtrlRequest { StartAliveProcedure (0), DisableReq (1), /* administratively disable NS-VC */ - EnableReq (2) /* administratively enable NS-VC */ + EnableReq (2), /* administratively enable NS-VC */ + ForceAliveState (3) }; /* add one NSVC (component and table entry */ @@ -487,6 +488,10 @@ -> value sind sender vc { /* blindly acknowledge whatever the PCU sends */ NSVC.send(SnsRequest:{sind.nsvci, ts_SNS_CONFIG_ACK(g_config.nsei, omit)}) to vc; + /* switch to "alive" state already before sending the SNS-CONFIG, as otherwise + * there would be a race condition between internally performing the state change + * of all related NS-VCs and the first incoming NS-PDU after SNS-CONFIG-ACK */ + f_broadcast_ns_ctrl(NsCtrlRequest:ForceAliveState); /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */ var template (omit) IP4_Elements v4; var template (omit) IP6_Elements v6; @@ -494,6 +499,9 @@ NSVC.send(SnsRequest:{sind.nsvci, ts_SNS_CONFIG(g_config.nsei, true, v4, v6)}) to vc; alt { + [] as_ns_common_status() { + repeat; + } [] NSVC.receive(SnsIndication:{sind.nsvci, tr_SNS_CONFIG_ACK(g_config.nsei, omit)}) from vc { /* success */ @@ -735,8 +743,10 @@ setverdict(fail, "Unexpected SNS from NSVC: ", sreq); self.stop; } - [] NS_SP.receive(NsCtrlRequest:StartAliveProcedure) { + [] NS_SP.receive(NsCtrlRequest:ForceAliveState) { f_change_state(NSVC_S_ALIVE_UNBLOCKED); + } + [] NS_SP.receive(NsCtrlRequest:StartAliveProcedure) { f_sendAlive(); Tns_test.start; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22899 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: Idac522a81f01553df52dc012cbab15e1c73c0862 Gerrit-Change-Number: 22899 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix configuration (ip-sns syntax) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22896 ) Change subject: gbproxy: Fix configuration (ip-sns syntax) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22896 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: Ic9184669f6459c44fbb81e05b54028eca1b54db5 Gerrit-Change-Number: 22896 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 15:52:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Factor-out function to broadcast to all NS_VCs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22897 ) Change subject: NS_Emulation: Factor-out function to broadcast to all NS_VCs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22897 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: I8cd16031dbbd244dcff74fc8a1cd69e9f8a06dbf Gerrit-Change-Number: 22897 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 15:52:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: factor-out as_ns_common_status() altstep In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22898 ) Change subject: NS_Emulation: factor-out as_ns_common_status() altstep ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22898 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: I4e8e7d19c764cc977beb84a6859c9ce73518b653 Gerrit-Change-Number: 22898 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 15:52:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Work around "alive" race condition in IP-SNS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22899 ) Change subject: NS_Emulation: Work around "alive" race condition in IP-SNS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22899 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: Idac522a81f01553df52dc012cbab15e1c73c0862 Gerrit-Change-Number: 22899 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 13 Feb 2021 15:52:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: Fix configuration (ip-sns syntax) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22896 ) Change subject: gbproxy: Fix configuration (ip-sns syntax) ...................................................................... gbproxy: Fix configuration (ip-sns syntax) It's sad that this config file has again been forgotten. Change-Id: Ic9184669f6459c44fbb81e05b54028eca1b54db5 Related: SYS#5354 --- M gbproxy/osmo-gbproxy.fr.cfg 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index d0f8595..9595475 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -34,9 +34,9 @@ timer tns-alive 3 timer tns-alive-retries 10 nse 101 - ip-sns 127.0.0.10 7777 + ip-sns-remote 127.0.0.10 7777 nse 102 - ip-sns 127.0.0.11 8888 + ip-sns-remote 127.0.0.11 8888 nse 2001 nsvc fr hdlcnet1 dlci 16 nsvci 1 nsvc fr hdlcnet2 dlci 17 nsvci 2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22896 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: Ic9184669f6459c44fbb81e05b54028eca1b54db5 Gerrit-Change-Number: 22896 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Factor-out function to broadcast to all NS_VCs In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22897 ) Change subject: NS_Emulation: Factor-out function to broadcast to all NS_VCs ...................................................................... NS_Emulation: Factor-out function to broadcast to all NS_VCs Change-Id: I8cd16031dbbd244dcff74fc8a1cd69e9f8a06dbf --- M library/NS_Emulation.ttcnpp 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 6d8113c..24c9941 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -461,6 +461,12 @@ } } + private function f_broadcast_ns_ctrl(template (value) NsCtrlRequest req) runs on NS_CT { + for (var integer i := 0; i < lengthof(g_nsvcs); i := i+1) { + NSVC.send(req) to g_nsvcs[i].vc_conn; + } + } + /* simple IP Sub-Network Service responder for the SGSN side. This is not a full implementation * of the protocol, merely sufficient to make the PCU/BSS side happy to proceed */ private altstep as_vcg_sns_sgsn() runs on NS_CT { @@ -489,9 +495,7 @@ /* success */ log("SNS Config succeeded. Sending Alive"); /* inform all NS-VC that they are now considered alive */ - for (var integer i := 0; i < lengthof(g_nsvcs); i := i+1) { - NSVC.send(NsCtrlRequest:StartAliveProcedure) to g_nsvcs[i].vc_conn; - } + f_broadcast_ns_ctrl(NsCtrlRequest:StartAliveProcedure); } [] NSVC.receive(SnsIndication:{sind.nsvci, tr_SNS_CONFIG_ACK(g_config.nsei, ?)}) from vc { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22897 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: I8cd16031dbbd244dcff74fc8a1cd69e9f8a06dbf Gerrit-Change-Number: 22897 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: factor-out as_ns_common_status() altstep In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22898 ) Change subject: NS_Emulation: factor-out as_ns_common_status() altstep ...................................................................... NS_Emulation: factor-out as_ns_common_status() altstep This is a new altstep which groups all handling of NsStatusInd. Right now it's only used from one place, but upcoming patches will re-use it elsewhere. Change-Id: I4e8e7d19c764cc977beb84a6859c9ce73518b653 --- M library/NS_Emulation.ttcnpp 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 24c9941..1b9b1df 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -352,13 +352,8 @@ return res; } - private altstep as_ns_common() runs on NS_CT { + private altstep as_ns_common_status() runs on NS_CT { var NsStatusIndication rx_nssi; - var NsUnitdataIndication rx_nsudi; - var NsUnitdataRequest rx_nsudr; - var NsDisableVcRequest rx_disar; - var NsEnableVcRequest rx_enar; - /* pass from NS-VCs up to user */ [] NSVC.receive(tr_NsStsInd(g_config.nsei, ?, ?, NSVC_S_ALIVE_UNBLOCKED)) -> value rx_nssi { /* check if this one is the first to be unblocked */ var integer num_nsvc_unblocked := f_count_nsvcs_in_state(NSVC_S_ALIVE_UNBLOCKED); @@ -385,6 +380,15 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received NsStatusInd for invalid NSEI: ", rx_nssi)); } + } + + private altstep as_ns_common() runs on NS_CT { + var NsUnitdataIndication rx_nsudi; + var NsUnitdataRequest rx_nsudr; + var NsDisableVcRequest rx_disar; + var NsEnableVcRequest rx_enar; + /* pass from NS-VCs up to user */ + [] as_ns_common_status(); [] NSVC.receive(tr_NsUdInd(g_config.nsei, ?, ?)) -> value rx_nsudi { NS_SP.send(rx_nsudi); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22898 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: I4e8e7d19c764cc977beb84a6859c9ce73518b653 Gerrit-Change-Number: 22898 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 15:52:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 13 Feb 2021 15:52:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: Work around "alive" race condition in IP-SNS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22899 ) Change subject: NS_Emulation: Work around "alive" race condition in IP-SNS ...................................................................... NS_Emulation: Work around "alive" race condition in IP-SNS We need to modify the state of each NS-VC within a NS-VCG/NSE once we receive the final SNS-CONFIG-ACK PDU. However, sometimes the IUT sends its first NS-PDU _before_ we even have communicated the state-change locally to all our NS-VCs. In order to avoid the problem, let's mark the NS-VCs as alive before sending the the SNS-CONFIG. This means we have one RTT more time to locally propagate the state change to all NS-VCs. Change-Id: Idac522a81f01553df52dc012cbab15e1c73c0862 Closes: OS#5023 --- M library/NS_Emulation.ttcnpp 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp index 1b9b1df..38f132a 100644 --- a/library/NS_Emulation.ttcnpp +++ b/library/NS_Emulation.ttcnpp @@ -263,7 +263,8 @@ type enumerated NsCtrlRequest { StartAliveProcedure (0), DisableReq (1), /* administratively disable NS-VC */ - EnableReq (2) /* administratively enable NS-VC */ + EnableReq (2), /* administratively enable NS-VC */ + ForceAliveState (3) }; /* add one NSVC (component and table entry */ @@ -487,6 +488,10 @@ -> value sind sender vc { /* blindly acknowledge whatever the PCU sends */ NSVC.send(SnsRequest:{sind.nsvci, ts_SNS_CONFIG_ACK(g_config.nsei, omit)}) to vc; + /* switch to "alive" state already before sending the SNS-CONFIG, as otherwise + * there would be a race condition between internally performing the state change + * of all related NS-VCs and the first incoming NS-PDU after SNS-CONFIG-ACK */ + f_broadcast_ns_ctrl(NsCtrlRequest:ForceAliveState); /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */ var template (omit) IP4_Elements v4; var template (omit) IP6_Elements v6; @@ -494,6 +499,9 @@ NSVC.send(SnsRequest:{sind.nsvci, ts_SNS_CONFIG(g_config.nsei, true, v4, v6)}) to vc; alt { + [] as_ns_common_status() { + repeat; + } [] NSVC.receive(SnsIndication:{sind.nsvci, tr_SNS_CONFIG_ACK(g_config.nsei, omit)}) from vc { /* success */ @@ -735,8 +743,10 @@ setverdict(fail, "Unexpected SNS from NSVC: ", sreq); self.stop; } - [] NS_SP.receive(NsCtrlRequest:StartAliveProcedure) { + [] NS_SP.receive(NsCtrlRequest:ForceAliveState) { f_change_state(NSVC_S_ALIVE_UNBLOCKED); + } + [] NS_SP.receive(NsCtrlRequest:StartAliveProcedure) { f_sendAlive(); Tns_test.start; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22899 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: Idac522a81f01553df52dc012cbab15e1c73c0862 Gerrit-Change-Number: 22899 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 13 19:20:59 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Sat, 13 Feb 2021 19:20:59 +0000 Subject: Change in libosmocore[master]: BVC FSM: Treat overlapping BVC-RESET as implicit ACK In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22895 ) Change subject: BVC FSM: Treat overlapping BVC-RESET as implicit ACK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 Gerrit-Change-Number: 22895 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sat, 13 Feb 2021 19:20:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 14 00:19:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 14 Feb 2021 00:19:44 +0000 Subject: Change in osmo-bts[master]: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22894 ) Change subject: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia558587d36a75a1db1951d25b471b3f2e78ef4c9 Gerrit-Change-Number: 22894 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 14 Feb 2021 00:19:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Feb 14 01:44:16 2021 From: admin at opensuse.org (OBS Notification) Date: Sun, 14 Feb 2021 01:44:16 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6028808259ee6_6c892abbc860c5f85800fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 162s] [COMPILING apps/dfu/main.c] [ 163s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 163s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 163s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 163s] Memory region Used Size Region Size %age Used [ 163s] rom: 16580 B 16 KB 101.20% [ 163s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 163s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 163s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 163s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 163s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 163s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 163s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 163s] collect2: error: ld returned 1 exit status [ 163s] % [ 163s] make[2]: *** [Makefile:234: flash] Error 1 [ 163s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 163s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 163s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 163s] dh_auto_build: error: make -j1 returned exit code 2 [ 163s] make: *** [debian/rules:16: build] Error 25 [ 163s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 163s] ### VM INTERACTION START ### [ 166s] [ 154.514641] sysrq: Power Off [ 166s] [ 154.520660] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] lamb60 failed "build simtrace2_0.7.0.70.657c.dsc" at Sun Feb 14 01:43:52 UTC 2021. [ 166s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Feb 14 01:49:42 2021 From: admin at opensuse.org (OBS Notification) Date: Sun, 14 Feb 2021 01:49:42 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602881d2a3710_6c892abbc860c5f858129e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 158s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 158s] [COMPILING libboard/qmod/source/card_pres.c] [ 158s] [COMPILING libboard/qmod/source/wwan_led.c] [ 158s] [COMPILING libboard/qmod/source/i2c.c] [ 159s] [COMPILING libboard/qmod/source/board_qmod.c] [ 159s] [COMPILING apps/dfu/main.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 159s] Memory region Used Size Region Size %age Used [ 159s] rom: 16588 B 16 KB 101.25% [ 159s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 159s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 159s] collect2: error: ld returned 1 exit status [ 159s] % [ 159s] make[2]: *** [Makefile:234: flash] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 159s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: error: make -j1 returned exit code 2 [ 159s] make: *** [debian/rules:16: build] Error 25 [ 159s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 159s] ### VM INTERACTION START ### [ 162s] [ 150.975539] sysrq: Power Off [ 162s] [ 150.980548] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] lamb27 failed "build simtrace2_0.7.0.70.657c.dsc" at Sun Feb 14 01:49:35 UTC 2021. [ 162s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:11 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:15:11 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` A static configured UDP NSVC can have signalling and data weights. Related: SYS#5354 Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f --- M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22900/1 diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 211f056..a0d0ec3 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1031,12 +1031,16 @@ } DEFUN(cfg_ns_nse_nsvc_udp, cfg_ns_nse_nsvc_udp_cmd, - "nsvc udp BIND " VTY_IPV46_CMD " <1-65535>", + "nsvc udp BIND " VTY_IPV46_CMD " <1-65535> [signalling-weight <0-254> data-weight <0-254>]", "NS Virtual Connection\n" "NS over UDP\n" "A unique bind identifier created by ns bind\n" "Remote IPv4 Address\n" "Remote IPv6 Address\n" "Remote UDP Port\n" + "Signalling weight of the NSVC\n" + "Signalling weight of the NSVC\n" + "Data weight of the NSVC\n" + "Data weight of the NSVC\n" ) { struct gprs_ns2_vc_bind *bind; @@ -1049,6 +1053,13 @@ struct osmo_sockaddr_str remote_str; struct osmo_sockaddr remote; uint16_t port = atoi(argv[2]); + uint16_t sig_weight = 1; + uint16_t data_weight = 1; + + if (argc > 3) { + sig_weight = atoi(argv[3]); + data_weight = atoi(argv[4]); + } if (nse->ll == GPRS_NS2_LL_UNDEF) { nse->ll = GPRS_NS2_LL_UDP; @@ -1098,6 +1109,8 @@ vty_out(vty, "Can not create NS-VC.%s", VTY_NEWLINE); goto err; } + nsvc->sig_weight = sig_weight; + nsvc->data_weight = data_weight; nsvc->persistent = true; return CMD_SUCCESS; diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index a748f13..437b997 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -32,3 +32,32 @@ UDP bind: 127.0.0.14:42999 DSCP: 0 IP-SNS signalling weight: 1 data weight: 1 0 NS-VC: +OsmoNSdummy# configure terminal +OsmoNSdummy(config)# ns +OsmoNSdummy(config-ns)# nse 1234 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.15 9496 +OsmoNSdummy(config-ns-nse)# end +OsmoNSdummy# show ns +NSEI 01234: UDP, DEAD + NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +UDP bind: 127.0.0.14:42999 DSCP: 0 + IP-SNS signalling weight: 1 data weight: 1 + 1 NS-VC: + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +OsmoNSdummy# configure terminal +OsmoNSdummy(config)# ns +OsmoNSdummy(config-ns)# nse 1234 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weigh 0 data-weight 9 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.17 9496 signalling-weigh 0 data-weight 0 +OsmoNSdummy(config-ns-nse)# end +OsmoNSdummy# show ns +NSEI 01234: UDP, DEAD + NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 + NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 + NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +UDP bind: 127.0.0.14:42999 DSCP: 0 + IP-SNS signalling weight: 1 data weight: 1 + 3 NS-VC: + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:15:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... gprs_ns2: implement a simple load sharing for UDP Implement the load sharing based on modulo of the LSP. As long the gprs_ns2 doesn't support the resource distribution function (48.016 ? 4.4a) this simple approach is good enought. Fixes: OS#4836 Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 --- M src/gb/gprs_ns2.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 3 files changed, 128 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/22901/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index c7b963e..34c4c20 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -383,6 +383,31 @@ return NULL; } +/* 4.4.2 Load Sharing function for the IP Sub-Network */ +static struct gprs_ns2_vc *ns2_load_sharing_weight_modulor( + struct gprs_ns2_nse *nse, + uint16_t bvci, + uint32_t load_selector) +{ + struct gprs_ns2_vc *tmp; + uint32_t mod; + uint32_t i = 0; + + if (nse->nsvc_count == 0) + return NULL; + + mod = (bvci + load_selector) % nse->sum_data_weight; + llist_for_each_entry(tmp, &nse->nsvc, list) { + if (!ns2_vc_is_unblocked(tmp)) + continue; + if (i == mod || mod < i + tmp->data_weight) + return tmp; + i += tmp->data_weight; + } + + return NULL; +} + /* pick the first available data NSVC - no load sharing */ struct gprs_ns2_vc *ns2_load_sharing_first(struct gprs_ns2_nse *nse) { @@ -420,7 +445,7 @@ nsvc = ns2_load_sharing_signal(nse); } else { /* data with load sharing parameter */ - nsvc = ns2_load_sharing_first(nse); + nsvc = ns2_load_sharing_weight_modulor(nse, bvci, link_selector); } break; } diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index 6d71a8c..d8ed06f 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -60,6 +60,18 @@ return 0; } +static int gp_send_to_ns(struct gprs_ns2_inst *nsi, struct msgb *msg, uint16_t nsei, uint16_t bvci, uint32_t lsp) +{ + struct osmo_gprs_ns2_prim nsp = {}; + nsp.nsei = nsei; + nsp.bvci = bvci; + nsp.u.unitdata.link_selector = lsp; + osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, + PRIM_OP_REQUEST, msg); + return gprs_ns2_recv_prim(nsi, &nsp.oph); +} + + static struct msgb *get_pdu(struct gprs_ns2_vc_bind *bind, enum ns_pdu_type pdu_type) { struct gprs_ns_hdr *nsh; @@ -88,6 +100,12 @@ return false; } +static unsigned int count_pdus(struct gprs_ns2_vc_bind *bind) +{ + struct osmo_wqueue *queue = bind->priv; + return llist_count(&queue->msg_queue); +} + static void clear_pdus(struct gprs_ns2_vc_bind *bind) { struct osmo_wqueue *queue = bind->priv; @@ -370,6 +388,81 @@ printf("--- Finish unitdata test\n"); } +void test_unitdata_weights(void *ctx) +{ + struct gprs_ns2_inst *nsi; + struct gprs_ns2_vc_bind *bind[3]; + struct gprs_ns2_vc_bind *loopbind; + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *nsvc[3]; + struct gprs_ns2_vc *loop[3]; + + struct msgb *msg, *other; + char idbuf[32]; + int i; + + printf("--- Testing unitdata weight test\n"); + osmo_wqueue_clear(unitdata); + printf("---- Create NSE + Binds\n"); + nsi = gprs_ns2_instantiate(ctx, ns_prim_cb, NULL); + bind[0] = dummy_bind(nsi, "bblock1"); + bind[1] = dummy_bind(nsi, "bblock2"); + bind[2] = dummy_bind(nsi, "bblock3"); + loopbind = loopback_bind(nsi, "loopback"); + nse = gprs_ns2_create_nse(nsi, 1004, GPRS_NS2_LL_UDP, GPRS_NS2_DIALECT_STATIC_ALIVE); + OSMO_ASSERT(nse); + + /* data weights are + * nsvc[0] = 1 + * nsvc[1] = 2 + * nsvc[2] = 3 + */ + for (i = 0; i < 3; i++) { + printf("---- Create NSVC[%d]\n", i); + snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei, i); + nsvc[i] = ns2_vc_alloc(bind[i], nse, false, GPRS_NS2_VC_MODE_ALIVE, idbuf); + loop[i] = loopback_nsvc(loopbind, nsvc[i]); + OSMO_ASSERT(nsvc[i]); + nsvc[i]->data_weight = i + 1; + ns2_vc_fsm_start(nsvc[i]); + OSMO_ASSERT(!ns2_vc_is_unblocked(nsvc[i])); + ns2_tx_alive_ack(loop[i]); + OSMO_ASSERT(ns2_vc_is_unblocked(nsvc[i])); + } + + /* all nsvcs are alive */ + printf("---- Send UNITDATA to all NSVCs\n"); + for (i = 0; i < 3; i++) { + msg = generate_unitdata("test_unitdata_weight"); + ns2_recv_vc(nsvc[i], msg); + other = msgb_dequeue(&unitdata->msg_queue); + OSMO_ASSERT(msg == other); + other = msgb_dequeue(&unitdata->msg_queue); + OSMO_ASSERT(NULL == other); + msgb_free(msg); + } + + /* nsvc[1] should be still good */ + printf("---- Send BSSGP data to the NSE to test unitdata over NSVC[1]\n"); + for (i = 0; i < 3; i++) + clear_pdus(bind[i]); + + for (i = 0; i < 12; i++) { + msg = generate_unitdata("test_unitdata_weight2"); + gp_send_to_ns(nsi, msg, 1004, 1, i + 1); + } + + for (i = 0; i < 3; i++) + fprintf(stderr, "count_pdus(bind[%d]) = %d\n", i, count_pdus(bind[i])); + + for (i = 0; i < 3; i++) { + OSMO_ASSERT(count_pdus(bind[i]) == nsvc[i]->data_weight * 2); + } + + gprs_ns2_free(nsi); + printf("--- Finish unitdata weight test\n"); +} + void test_mtu(void *ctx) { struct gprs_ns2_inst *nsi; @@ -440,6 +533,7 @@ test_nse_transfer_cap(ctx); test_block_unblock_nsvc(ctx); test_unitdata(ctx); + test_unitdata_weights(ctx); test_mtu(ctx); printf("===== NS2 protocol test END\n\n"); diff --git a/tests/gb/gprs_ns2_test.ok b/tests/gb/gprs_ns2_test.ok index f40579f..cecc4bf 100644 --- a/tests/gb/gprs_ns2_test.ok +++ b/tests/gb/gprs_ns2_test.ok @@ -20,6 +20,14 @@ ---- Try to receive over blocked NSVC[0] ---- Receive over NSVC[1] --- Finish unitdata test +--- Testing unitdata test +---- Create NSE + Binds +---- Create NSVC[0] +---- Create NSVC[1] +---- Create NSVC[2] +---- Send UNITDATA to all NSVCs +---- Send BSSGP data to the NSE to test unitdata over NSVC[1] +--- Finish unitdata weight test --- Testing mtu test ---- Create NSE + Binds ---- Create NSVC[0] -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:15:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix comment of alive NS-VC References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22902 ) Change subject: gprs_ns2: fix comment of alive NS-VC ...................................................................... gprs_ns2: fix comment of alive NS-VC There is no active NS-VCs only alive or dead. Change-Id: Idb5d2ae4a99a472e38601ff841b8046ecf89d1bc --- M src/gb/gprs_ns2_internal.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/22902/1 diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index b87fcf5..9ddd400 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -174,10 +174,10 @@ struct osmo_fsm_inst *bss_sns_fi; - /*! sum of all the data weight of _active_ NS-VCs */ + /*! sum of all the data weight of _alive_ NS-VCs */ uint32_t sum_data_weight; - /*! sum of all the signalling weight of _active_ NS-VCs */ + /*! sum of all the signalling weight of _alive_ NS-VCs */ uint32_t sum_sig_weight; /*! MTU of a NS PDU. This is the lowest MTU of all NSVCs */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idb5d2ae4a99a472e38601ff841b8046ecf89d1bc Gerrit-Change-Number: 22902 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:15:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... gprs_ns2_sns: rename fsm events to include RX or REQ prefix An event which originates by a received PDU is prefixed by RX. An event which originates by code gets a REQ prefix. Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b --- M src/gb/gprs_ns2_sns.c 1 file changed, 62 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/22903/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 27e6d1f..e2070ae 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -70,31 +70,31 @@ }; enum gprs_sns_event { - GPRS_SNS_EV_SELECT_ENDPOINT, /*!< Select a SNS endpoint from the list */ - GPRS_SNS_EV_SIZE, - GPRS_SNS_EV_SIZE_ACK, - GPRS_SNS_EV_CONFIG, - GPRS_SNS_EV_CONFIG_END, /*!< SNS-CONFIG with end flag received */ - GPRS_SNS_EV_CONFIG_ACK, - GPRS_SNS_EV_ADD, - GPRS_SNS_EV_DELETE, - GPRS_SNS_EV_CHANGE_WEIGHT, - GPRS_SNS_EV_NO_NSVC, - GPRS_SNS_EV_NSVC_ALIVE, /*!< a NS-VC became alive */ + GPRS_SNS_EV_REQ_SELECT_ENDPOINT, /*!< Select a SNS endpoint from the list */ + GPRS_SNS_EV_RX_SIZE, + GPRS_SNS_EV_RX_SIZE_ACK, + GPRS_SNS_EV_RX_CONFIG, + GPRS_SNS_EV_RX_CONFIG_END, /*!< SNS-CONFIG with end flag received */ + GPRS_SNS_EV_RX_CONFIG_ACK, + GPRS_SNS_EV_RX_ADD, + GPRS_SNS_EV_RX_DELETE, + GPRS_SNS_EV_RX_CHANGE_WEIGHT, + GPRS_SNS_EV_REQ_NO_NSVC, + GPRS_SNS_EV_REQ_NSVC_ALIVE, /*!< a NS-VC became alive */ }; static const struct value_string gprs_sns_event_names[] = { - { GPRS_SNS_EV_SELECT_ENDPOINT, "SELECT_ENDPOINT" }, - { GPRS_SNS_EV_SIZE, "SIZE" }, - { GPRS_SNS_EV_SIZE_ACK, "SIZE_ACK" }, - { GPRS_SNS_EV_CONFIG, "CONFIG" }, - { GPRS_SNS_EV_CONFIG_END, "CONFIG_END" }, - { GPRS_SNS_EV_CONFIG_ACK, "CONFIG_ACK" }, - { GPRS_SNS_EV_ADD, "ADD" }, - { GPRS_SNS_EV_DELETE, "DELETE" }, - { GPRS_SNS_EV_CHANGE_WEIGHT, "CHANGE_WEIGHT" }, - { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" }, - { GPRS_SNS_EV_NSVC_ALIVE, "NSVC_ALIVE"}, + { GPRS_SNS_EV_REQ_SELECT_ENDPOINT, "SELECT_ENDPOINT" }, + { GPRS_SNS_EV_RX_SIZE, "SIZE" }, + { GPRS_SNS_EV_RX_SIZE_ACK, "SIZE_ACK" }, + { GPRS_SNS_EV_RX_CONFIG, "CONFIG" }, + { GPRS_SNS_EV_RX_CONFIG_END, "CONFIG_END" }, + { GPRS_SNS_EV_RX_CONFIG_ACK, "CONFIG_ACK" }, + { GPRS_SNS_EV_RX_ADD, "ADD" }, + { GPRS_SNS_EV_RX_DELETE, "DELETE" }, + { GPRS_SNS_EV_RX_CHANGE_WEIGHT, "CHANGE_WEIGHT" }, + { GPRS_SNS_EV_REQ_NO_NSVC, "NO_NSVC" }, + { GPRS_SNS_EV_REQ_NSVC_ALIVE, "NSVC_ALIVE"}, { 0, NULL } }; @@ -272,7 +272,7 @@ } } - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL); } static void ns2_clear_ipv46_entries(struct ns2_sns_state *gss) @@ -702,7 +702,7 @@ struct tlv_parsed *tp = NULL; switch (event) { - case GPRS_SNS_EV_SIZE_ACK: + case GPRS_SNS_EV_RX_SIZE_ACK: tp = data; if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) { LOGPFSML(fi, LOGL_ERROR, "SNS-SIZE-ACK with cause %s\n", @@ -862,7 +862,7 @@ struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); switch (event) { - case GPRS_SNS_EV_CONFIG_ACK: + case GPRS_SNS_EV_RX_CONFIG_ACK: tp = (struct tlv_parsed *) data; if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) { LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG-ACK with cause %s\n", @@ -942,7 +942,7 @@ LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv4 list now %u entries\n", gss->num_ip4_remote); - if (event == GPRS_SNS_EV_CONFIG_END) { + if (event == GPRS_SNS_EV_RX_CONFIG_END) { /* check if sum of data / sig weights == 0 */ if (ip4_weight_sum_data(gss->ip4_remote, gss->num_ip4_remote) == 0 || ip4_weight_sum_sig(gss->ip4_remote, gss->num_ip4_remote) == 0) { @@ -993,7 +993,7 @@ LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv6 list now %u entries\n", gss->num_ip6_remote); - if (event == GPRS_SNS_EV_CONFIG_END) { + if (event == GPRS_SNS_EV_RX_CONFIG_END) { /* check if sum of data / sig weights == 0 */ if (ip6_weight_sum_data(gss->ip6_remote, gss->num_ip6_remote) == 0 || ip6_weight_sum_sig(gss->ip6_remote, gss->num_ip6_remote) == 0) { @@ -1027,8 +1027,8 @@ struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; switch (event) { - case GPRS_SNS_EV_CONFIG_END: - case GPRS_SNS_EV_CONFIG: + case GPRS_SNS_EV_RX_CONFIG_END: + case GPRS_SNS_EV_RX_CONFIG: #if 0 /* part of incoming SNS-SIZE (doesn't happen on BSS side */ if (TLVP_PRESENT(tp, NS_IE_RESET_FLAG)) { @@ -1298,16 +1298,16 @@ struct tlv_parsed *tp = data; switch (event) { - case GPRS_SNS_EV_ADD: + case GPRS_SNS_EV_RX_ADD: ns2_sns_st_configured_add(fi, gss, tp); break; - case GPRS_SNS_EV_DELETE: + case GPRS_SNS_EV_RX_DELETE: ns2_sns_st_configured_delete(fi, gss, tp); break; - case GPRS_SNS_EV_CHANGE_WEIGHT: + case GPRS_SNS_EV_RX_CHANGE_WEIGHT: ns2_sns_st_configured_change(fi, gss, tp); break; - case GPRS_SNS_EV_NSVC_ALIVE: + case GPRS_SNS_EV_REQ_NSVC_ALIVE: osmo_timer_del(&fi->timer); break; } @@ -1327,7 +1327,7 @@ .action = ns2_sns_st_unconfigured, }, [GPRS_SNS_ST_SIZE] = { - .in_event_mask = S(GPRS_SNS_EV_SIZE_ACK), + .in_event_mask = S(GPRS_SNS_EV_RX_SIZE_ACK), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_SIZE) | S(GPRS_SNS_ST_CONFIG_BSS), @@ -1336,7 +1336,7 @@ .onenter = ns2_sns_st_size_onenter, }, [GPRS_SNS_ST_CONFIG_BSS] = { - .in_event_mask = S(GPRS_SNS_EV_CONFIG_ACK), + .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG_ACK), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_CONFIG_BSS) | S(GPRS_SNS_ST_CONFIG_SGSN) | @@ -1346,8 +1346,8 @@ .onenter = ns2_sns_st_config_bss_onenter, }, [GPRS_SNS_ST_CONFIG_SGSN] = { - .in_event_mask = S(GPRS_SNS_EV_CONFIG) | - S(GPRS_SNS_EV_CONFIG_END), + .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG) | + S(GPRS_SNS_EV_RX_CONFIG_END), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_CONFIG_SGSN) | S(GPRS_SNS_ST_CONFIGURED) | @@ -1357,10 +1357,10 @@ .onenter = ns2_sns_st_config_sgsn_onenter, }, [GPRS_SNS_ST_CONFIGURED] = { - .in_event_mask = S(GPRS_SNS_EV_ADD) | - S(GPRS_SNS_EV_DELETE) | - S(GPRS_SNS_EV_CHANGE_WEIGHT) | - S(GPRS_SNS_EV_NSVC_ALIVE), + .in_event_mask = S(GPRS_SNS_EV_RX_ADD) | + S(GPRS_SNS_EV_RX_DELETE) | + S(GPRS_SNS_EV_RX_CHANGE_WEIGHT) | + S(GPRS_SNS_EV_REQ_NSVC_ALIVE), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_SIZE), .name = "CONFIGURED", @@ -1380,7 +1380,7 @@ case 1: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_SIZE_RETRIES]) { LOGPFSML(fi, LOGL_ERROR, "NSE %d: Size retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nsi->timeout[NS_TOUT_TSNS_PROV], 1); } @@ -1388,7 +1388,7 @@ case 2: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { LOGPFSML(fi, LOGL_ERROR, "NSE %d: BSS Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2); } @@ -1396,14 +1396,14 @@ case 3: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { LOGPFSML(fi, LOGL_ERROR, "NSE %d: SGSN Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nsi->timeout[NS_TOUT_TSNS_PROV], 3); } break; case 4: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); break; } return 0; @@ -1416,15 +1416,15 @@ /* reset when receiving GPRS_SNS_EV_NO_NSVC */ switch (event) { - case GPRS_SNS_EV_NO_NSVC: + case GPRS_SNS_EV_REQ_NO_NSVC: /* ignore reselection running */ if (gss->reselection_running) break; LOGPFSML(fi, LOGL_ERROR, "NSE %d: no remaining NSVC, resetting SNS FSM\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); break; - case GPRS_SNS_EV_SELECT_ENDPOINT: + case GPRS_SNS_EV_REQ_SELECT_ENDPOINT: /* tear down previous state * gprs_ns2_free_nsvcs() will trigger NO_NSVC, prevent this from triggering a reselection */ gss->reselection_running = true; @@ -1457,8 +1457,8 @@ .name = "GPRS-NS2-SNS-BSS", .states = ns2_sns_bss_states, .num_states = ARRAY_SIZE(ns2_sns_bss_states), - .allstate_event_mask = S(GPRS_SNS_EV_NO_NSVC) | - S(GPRS_SNS_EV_SELECT_ENDPOINT), + .allstate_event_mask = S(GPRS_SNS_EV_REQ_NO_NSVC) | + S(GPRS_SNS_EV_REQ_SELECT_ENDPOINT), .allstate_action = ns2_sns_st_all_action, .cleanup = NULL, .timer_cb = ns2_sns_fsm_bss_timer_cb, @@ -1523,28 +1523,28 @@ switch (nsh->pdu_type) { case SNS_PDUT_SIZE: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_SIZE, tp); break; case SNS_PDUT_SIZE_ACK: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE_ACK, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_SIZE_ACK, tp); break; case SNS_PDUT_CONFIG: if (nsh->data[0] & 0x01) - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_END, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG_END, tp); else - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG, tp); break; case SNS_PDUT_CONFIG_ACK: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_ACK, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG_ACK, tp); break; case SNS_PDUT_ADD: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_ADD, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_ADD, tp); break; case SNS_PDUT_DELETE: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_DELETE, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_DELETE, tp); break; case SNS_PDUT_CHANGE_WEIGHT: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CHANGE_WEIGHT, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CHANGE_WEIGHT, tp); break; case SNS_PDUT_ACK: LOGPFSML(fi, LOGL_NOTICE, "NSEI=%u Rx unsupported SNS PDU type %s\n", nsei, @@ -1688,7 +1688,7 @@ llist_add_tail(&endpoint->list, &gss->sns_endpoints); if (do_selection) - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); return 0; } @@ -1798,7 +1798,7 @@ if (alive) { gss->alive = true; - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NSVC_ALIVE, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_NSVC_ALIVE, NULL); } else { /* is there at least another alive nsvc? */ llist_for_each_entry(tmp, &nse->nsvc, list) { @@ -1808,7 +1808,7 @@ /* all NS-VC have failed */ gss->alive = false; - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NO_NSVC, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL); } } @@ -1842,7 +1842,7 @@ llist_add_tail(&tmp->list, &gss->binds); if (trigger_reselection) { - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { /* TODO: do a add SNS-IP procedure & add nsvc() */ } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:15:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2: always free msgb of a primitive References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: always free msgb of a primitive ...................................................................... gprs_ns2: always free msgb of a primitive Related: OS#5022 Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c --- M src/gb/gprs_ns2.c 1 file changed, 25 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/22904/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 34c4c20..5be3521 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -467,32 +467,42 @@ struct gprs_ns2_vc *nsvc = NULL; uint16_t bvci, nsei; uint8_t sducontrol = 0; + int rc = 0; - if (oph->sap != SAP_NS) - return -EINVAL; + if (oph->sap != SAP_NS) { + rc = -EINVAL; + goto out; + } nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph); - if (oph->operation != PRIM_OP_REQUEST || oph->primitive != GPRS_NS2_PRIM_UNIT_DATA) - return -EINVAL; + if (oph->operation != PRIM_OP_REQUEST || oph->primitive != GPRS_NS2_PRIM_UNIT_DATA) { + rc = -EINVAL; + goto out; + } - if (!oph->msg) - return -EINVAL; + if (!oph->msg) { + rc = -EINVAL; + goto out; + } bvci = nsp->bvci; nsei = nsp->nsei; nse = gprs_ns2_nse_by_nsei(nsi, nsei); - if (!nse) - return -EINVAL; + if (!nse) { + rc = -EINVAL; + goto out; + } - if (!nse->alive) - return 0; + if (!nse->alive) { + goto out; + } nsvc = ns2_load_sharing(nse, bvci, nsp->u.unitdata.link_selector); /* TODO: send a status primitive back */ if (!nsvc) - return 0; + goto out; if (nsp->u.unitdata.change == GPRS_NS2_ENDPOINT_REQUEST_CHANGE) sducontrol = 1; @@ -500,6 +510,10 @@ sducontrol = 2; return ns2_tx_unit_data(nsvc, bvci, sducontrol, oph->msg); + +out: + msgb_free(oph->msg); + return rc; } /*! Send a STATUS.ind primitive to the specified NS instance user. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 01:15:13 +0000 Subject: Change in osmo-bts[master]: ta_control: cosmetic: use correct naming for MIN/MAX constraints References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22905 ) Change subject: ta_control: cosmetic: use correct naming for MIN/MAX constraints ...................................................................... ta_control: cosmetic: use correct naming for MIN/MAX constraints Change-Id: I112e0b51df06984e2e3f9b567d6d9897e9f9ba28 --- M src/common/ta_control.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/22905/1 diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 2ccc41a..5a3cbf5 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -26,8 +26,8 @@ #define TOA256_9OPERCENT 230 /* rqd_ta value range */ -#define TOA_MIN 0 -#define TOA_MAX 63 +#define TA_MIN 0 +#define TA_MAX 63 void lchan_ms_ta_ctrl(struct gsm_lchan *lchan) { @@ -38,12 +38,12 @@ if (lchan->meas.num_ul_meas < 4) return; - if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TOA_MIN) { + if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TA_MIN) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", toa256, lchan->rqd_ta, lchan->rqd_ta - 1); lchan->rqd_ta--; - } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < TOA_MAX) { + } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < TA_MAX) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n", toa256, lchan->rqd_ta, lchan->rqd_ta + 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I112e0b51df06984e2e3f9b567d6d9897e9f9ba28 Gerrit-Change-Number: 22905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 01:15:13 +0000 Subject: Change in osmo-bts[master]: ta_control: make 'struct bts_ul_meas' parameters const References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22906 ) Change subject: ta_control: make 'struct bts_ul_meas' parameters const ...................................................................... ta_control: make 'struct bts_ul_meas' parameters const The only reason why it was not 'const' is that in lchan_new_ul_meas() we may need to overwrite 'ulm->is_sub'. This can still be done after memcpy()ing a new set of samples to the destination buffer. Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 Related: OS#5024 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c 3 files changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/22906/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 8e91c33..45f275f 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -4,11 +4,15 @@ #define MEAS_MAX_TIMING_ADVANCE 63 #define MEAS_MIN_TIMING_ADVANCE 0 -int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +int lchan_new_ul_meas(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn); int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn); -int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +int lchan_meas_process_measurement(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn); void lchan_meas_reset(struct gsm_lchan *lchan); diff --git a/src/common/measurement.c b/src/common/measurement.c index 95d60f6..03afaa3 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -318,9 +318,12 @@ /* receive a L1 uplink measurement from L1 (this function is only used * internally, it is public to call it from unit-tests) */ -int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +int lchan_new_ul_meas(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn) { uint32_t fn_mod = fn % modulus_by_lchan(lchan); + struct bts_ul_meas *dest; if (lchan->state != LCHAN_S_ACTIVE) { LOGPFN(DMEAS, LOGL_NOTICE, fn, @@ -336,19 +339,19 @@ return -ENOSPC; } + dest = &lchan->meas.uplink[lchan->meas.num_ul_meas++]; + memcpy(dest, ulm, sizeof(*ulm)); + /* We expect the lower layers to mark AMR SID_UPDATE frames already as such. * In this function, we only deal with the common logic as per the TS 45.008 tables */ if (!ulm->is_sub) - ulm->is_sub = ts45008_83_is_sub(lchan, fn); + dest->is_sub = ts45008_83_is_sub(lchan, fn); DEBUGPFN(DMEAS, fn, "%s adding measurement (ber10k=%u, ta_offs=%d, ci=%0.2f, is_sub=%u, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n", gsm_lchan_name(lchan), ulm->ber10k, ulm->ta_offs_256bits, - ulm->c_i, ulm->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, + ulm->c_i, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, fn_mod); - memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm, - sizeof(*ulm)); - lchan->meas.last_fn = fn; return 0; @@ -757,7 +760,9 @@ * l1sap.c every time a measurement indication is received. It collects the * measurement samples and automatically detects the end of the measurement * interval. */ -int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +int lchan_meas_process_measurement(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn) { lchan_new_ul_meas(lchan, ulm, fn); return lchan_meas_check_compute(lchan, fn); diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 174abbe..d129336 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -89,7 +89,7 @@ /* feed uplink measurements into the code */ for (i = 0; i < mtc->ulm_count; i++) { - lchan_new_ul_meas(lchan, (struct bts_ul_meas *) &mtc->ulm[i], fn); + lchan_new_ul_meas(lchan, &mtc->ulm[i], fn); fn += 1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 Gerrit-Change-Number: 22906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:15:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 01:15:14 +0000 Subject: Change in osmo-bts[master]: ta_control: fix Timing Advance control for SDCCH channels References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22907 ) Change subject: ta_control: fix Timing Advance control for SDCCH channels ...................................................................... ta_control: fix Timing Advance control for SDCCH channels Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b --- M src/common/ta_control.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/22907/1 diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 5a3cbf5..ccb60e2 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -33,11 +33,6 @@ { int16_t toa256 = lchan->meas.ms_toa256; - /* Do not perform any computation when the amount of measurement - * results is too little. */ - if (lchan->meas.num_ul_meas < 4) - return; - if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TA_MIN) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b Gerrit-Change-Number: 22907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 15 01:38:29 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 15 Feb 2021 01:38:29 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6029d09869034_6c892abbc860c5f87914a1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 154s] [COMPILING apps/dfu/main.c] [ 154s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 154s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 154s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 155s] Memory region Used Size Region Size %age Used [ 155s] rom: 16580 B 16 KB 101.20% [ 155s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 155s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 155s] collect2: error: ld returned 1 exit status [ 155s] % [ 155s] make[2]: *** [Makefile:234: flash] Error 1 [ 155s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 155s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 155s] dh_auto_build: error: make -j1 returned exit code 2 [ 155s] make: *** [debian/rules:16: build] Error 25 [ 155s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 155s] ### VM INTERACTION START ### [ 158s] [ 144.734511] sysrq: Power Off [ 158s] [ 144.742088] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] cloud114 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 15 01:38:27 UTC 2021. [ 158s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Feb 15 01:40:29 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 15 Feb 2021 01:40:29 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6029d10f9445c_6c892abbc860c5f879162@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 153s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 153s] [COMPILING libboard/qmod/source/card_pres.c] [ 153s] [COMPILING libboard/qmod/source/wwan_led.c] [ 153s] [COMPILING libboard/qmod/source/i2c.c] [ 153s] [COMPILING libboard/qmod/source/board_qmod.c] [ 154s] [COMPILING apps/dfu/main.c] [ 154s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 154s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 154s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 154s] Memory region Used Size Region Size %age Used [ 154s] rom: 16588 B 16 KB 101.25% [ 154s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 154s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 154s] collect2: error: ld returned 1 exit status [ 154s] % [ 154s] make[2]: *** [Makefile:234: flash] Error 1 [ 154s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 154s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] dh_auto_build: error: make -j1 returned exit code 2 [ 154s] make: *** [debian/rules:16: build] Error 25 [ 154s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 154s] ### VM INTERACTION START ### [ 158s] [ 144.308682] sysrq: Power Off [ 158s] [ 144.313402] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] cloud115 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 15 01:40:21 UTC 2021. [ 158s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:41:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22901 to look at the new patch set (#2). Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... gprs_ns2: implement a simple load sharing for UDP Implement the load sharing based on modulo of the LSP. As long the gprs_ns2 doesn't support the resource distribution function (48.016 ? 4.4a) this simple approach is good enought. Fixes: OS#4836 Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 --- M src/gb/gprs_ns2.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 3 files changed, 128 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/22901/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 01:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 01:41:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22903 to look at the new patch set (#2). Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... gprs_ns2_sns: rename fsm events to include RX or REQ prefix An event which originates by a received PDU is prefixed by RX. An event which originates by code gets a REQ prefix. Fixes: OS#5014 Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b --- M src/gb/gprs_ns2_sns.c 1 file changed, 65 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/22903/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 02:45:42 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 02:45:42 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: remove debug line of the alive_timer References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22908 ) Change subject: gprs_ns2_vc_fsm: remove debug line of the alive_timer ...................................................................... gprs_ns2_vc_fsm: remove debug line of the alive_timer The log line sneaked in when fixing the alive ms Fixes: ab0e8646c4aa ("gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer") Change-Id: Iffe367b240f47c39232bbc26991c19752a1c75ad --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/22908/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 31cfb51..40c8984 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -173,8 +173,6 @@ return 0; timespecsub(&now, &priv->alive.timer_started, &elapsed); - LOGNSVC(priv->nsvc, LOGL_ERROR, "elapsed: %ld, now: %ld, saved: %ld.\n", - elapsed.tv_sec, now.tv_sec, priv->alive.timer_started.tv_sec); return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iffe367b240f47c39232bbc26991c19752a1c75ad Gerrit-Change-Number: 22908 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 03:08:43 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 03:08:43 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#11). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP layer needs to know the MTU of the NS UNIDATA payload. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contains the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/frame_relay.h M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 9 files changed, 123 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/11 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 03:08:45 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 03:08:45 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... gprs_ns2_fr: pass MTU changes to the NSE When the MTU of the frame relay device changes, update the bind and notify all NSEs. TODO: how to report to the NS user? Related: OS#4889 Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c --- M src/gb/gprs_ns2_fr.c 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/22909/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 445f00a..6ba2268 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -596,6 +596,27 @@ bpriv->if_running = if_running; } +static void mtu_change(struct gprs_ns2_vc_bind *bind, uint32_t mtu) +{ + struct priv_bind *bpriv = bind->priv; + struct gprs_ns2_nse *nse; + + if (mtu == bind->mtu) + return; + + LOGBIND(bind, LOGL_INFO, "MTU changed from %d to %d.\n", + bind->mtu, mtu); + + /* 2 byte DLCI header */ + bind->mtu = mtu - 2; + if (!bpriv->if_running) + return; + + llist_for_each_entry(nse, &bind->nsi->nse, list) { + ns2_nse_update_mtu(nse); + } +} + /* handle a single netlink message received via libmnl */ static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data) { @@ -623,8 +644,14 @@ if_running = !!(ifm->ifi_flags & IFF_RUNNING); bind = bind4netdev(nsi, ifname); - if (bind) - link_state_change(bind, if_running); + if (!bind) + return MNL_CB_OK; + + if (tb[IFLA_MTU]) { + mtu_change(bind, mnl_attr_get_u32(tb[IFLA_MTU])); + } + + link_state_change(bind, if_running); return MNL_CB_OK; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 03:10:37 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 03:10:37 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... Patch Set 1: any good ideas how we should communicate an update a mtu? should it a new primitive or should I just resend a NSE recovery? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 15 Feb 2021 03:10:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 03:55:30 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 03:55:30 +0000 Subject: Change in libosmocore[master]: gprs_ns2: truncate the NS_STATUS to the MTU References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22910 ) Change subject: gprs_ns2: truncate the NS_STATUS to the MTU ...................................................................... gprs_ns2: truncate the NS_STATUS to the MTU A NS Status can contain the original NS message which might result in a NS PDU which exceeds the MTU of the NS-VC. Truncate the original message to the maximum possible. Based on truncate BSSGP status message. Related: OS#4889 Change-Id: I35d8f8bf0eae890f4db56423da0b23b638d24311 --- M src/gb/gprs_ns2_message.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/22910/1 diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index bfb8781..7f52c4b 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -432,6 +432,7 @@ struct msgb *msg = ns2_msgb_alloc(); struct gprs_ns_hdr *nsh; uint16_t nsvci = osmo_htons(nsvc->nsvci); + unsigned int orig_len, max_orig_len; log_set_context(LOG_CTX_GB_NSE, nsvc->nse); log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -461,8 +462,12 @@ case NS_CAUSE_PROTO_ERR_UNSPEC: case NS_CAUSE_INVAL_ESSENT_IE: case NS_CAUSE_MISSING_ESSENT_IE: - msgb_tvlv_put(msg, NS_IE_PDU, msgb_l2len(orig_msg), - orig_msg->l2h); + /* ensure the PDU doesn't exceed the MTU */ + orig_len = msgb_l2len(orig_msg); + max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(orig_len); + if (max_orig_len > nsvc->bind->mtu) + orig_len -= max_orig_len - nsvc->bind->mtu; + msgb_tvlv_put(msg, NS_IE_PDU, orig_len, orig_msg->l2h); break; default: break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I35d8f8bf0eae890f4db56423da0b23b638d24311 Gerrit-Change-Number: 22910 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 03:55:32 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 03:55:32 +0000 Subject: Change in libosmocore[master]: gprs_ns2_message: tx_status: move all cause dependent code into the s... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22911 ) Change subject: gprs_ns2_message: tx_status: move all cause dependent code into the switch/case ...................................................................... gprs_ns2_message: tx_status: move all cause dependent code into the switch/case Change-Id: I8f1e0962c6f5f0c7287990bb7608d0cc9b86dfdb --- M src/gb/gprs_ns2_message.c 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/22911/1 diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 7f52c4b..ddf7285 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -450,18 +450,18 @@ msgb_tvlv_put(msg, NS_IE_CAUSE, 1, &cause); - /* Section 9.2.7.1: Static conditions for NS-VCI */ - if (cause == NS_CAUSE_NSVC_BLOCKED || - cause == NS_CAUSE_NSVC_UNKNOWN) - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&nsvci); - - /* Section 9.2.7.2: Static conditions for NS PDU */ switch (cause) { + case NS_CAUSE_NSVC_BLOCKED: + case NS_CAUSE_NSVC_UNKNOWN: + /* Section 9.2.7.1: Static conditions for NS-VCI */ + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&nsvci); + break; case NS_CAUSE_SEM_INCORR_PDU: case NS_CAUSE_PDU_INCOMP_PSTATE: case NS_CAUSE_PROTO_ERR_UNSPEC: case NS_CAUSE_INVAL_ESSENT_IE: case NS_CAUSE_MISSING_ESSENT_IE: + /* Section 9.2.7.2: Static conditions for NS PDU */ /* ensure the PDU doesn't exceed the MTU */ orig_len = msgb_l2len(orig_msg); max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(orig_len); @@ -469,14 +469,15 @@ orig_len -= max_orig_len - nsvc->bind->mtu; msgb_tvlv_put(msg, NS_IE_PDU, orig_len, orig_msg->l2h); break; + case NS_CAUSE_BVCI_UNKNOWN: + /* Section 9.2.7.3: Static conditions for BVCI */ + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&bvci); + break; + default: break; } - /* Section 9.2.7.3: Static conditions for BVCI */ - if (cause == NS_CAUSE_BVCI_UNKNOWN) - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&bvci); - return ns_vc_tx(nsvc, msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f1e0962c6f5f0c7287990bb7608d0cc9b86dfdb Gerrit-Change-Number: 22911 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 04:06:37 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 04:06:37 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: fix typo in doxygen comment References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22912 ) Change subject: gprs_ns2_sns: fix typo in doxygen comment ...................................................................... gprs_ns2_sns: fix typo in doxygen comment Fixes: 5bef2cc4bd58 ("ns2: Improve/extend doxygen comments for new ns2 implementation") Change-Id: I21b51791aa149d9a5b13169d1cf8c2857c55774a --- M src/gb/gprs_ns2_sns.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/22912/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index d061eed..ab8415d 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1470,7 +1470,7 @@ /*! Allocate an IP-SNS FSM for the BSS side. * \param[in] nse NS Entity in which the FSM runs * \param[in] id string identifier - * \retruns FSM instance on success; NULL on error */ + * \returns FSM instance on success; NULL on error */ struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, const char *id) { @@ -1499,7 +1499,7 @@ * \param[in] nsvc NS-VC on which the message was received * \param[in] msg message buffer of the IP-SNS message * \param[in] tp parsed TLV structure of message - * \retruns 0 on success; negative on error */ + * \returns 0 on success; negative on error */ int ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp) { struct gprs_ns2_nse *nse = nsvc->nse; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21b51791aa149d9a5b13169d1cf8c2857c55774a Gerrit-Change-Number: 22912 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 04:31:48 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 04:31:48 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 11: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_fr.c at 804 PS9, Line 804: /* 48.016 ? 6.1.4.2 default maximum information field size of 1600 octets : * FR has 2 byte header */ : bind->mtu = 1600 - 2; > I think the "information field" is what comes after the header, so (without checking the specs again [?] Done https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_frgre.c at 572 PS2, Line 572: 1500 > I think this changes from current behavior. [?] Ack https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_frgre.c File src/gb/gprs_ns2_frgre.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/9/src/gb/gprs_ns2_frgre.c at 577 PS9, Line 577: bind->mtu = 1600 - 2; > same here. Also, probably worth adding a #define in the frame_relay. [?] Done https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_internal.h at 240 PS2, Line 240: > is there a reason to use a signed value? like negative having a special meaning? If yes, please doc [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 04:31:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 05:45:10 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 05:45:10 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework ns_create_nsvc References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22913 ) Change subject: gprs_bssgp: rework ns_create_nsvc ...................................................................... gprs_bssgp: rework ns_create_nsvc Add support for multiple SNS endpoints. Move the NSE allocation to the top in preparation of IP-SNS binds. The future gprs_ns2 library will require to manual add every bind to the NSE for IP-SNS. Related: SYS#5354 Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb --- M src/gprs_bssgp_pcu.c 1 file changed, 20 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/13/22913/1 diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index a6b6f7e..7b28665 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -988,10 +988,20 @@ struct gprs_ns2_vc *nsvc; struct gprs_ns2_vc_bind *bind[PCU_IF_NUM_NSVC] = { }; char name[5]; + bool sns_configured = false; if (!valid) return -1; + bts->nse = gprs_ns2_nse_by_nsei(the_pcu->nsi, nsei); + if (!bts->nse) + bts->nse = gprs_ns2_create_nse(the_pcu->nsi, nsei, + GPRS_NS2_LL_UDP, the_pcu->vty.ns_dialect); + if (!bts->nse) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n"); + return 0; + } + for (i = 0; i < PCU_IF_NUM_NSVC; i++) { if (!(valid & (1 << i))) continue; @@ -1010,31 +1020,22 @@ if (!binds) { LOGP(DBSSGP, LOGL_ERROR, "Failed to bind to any NS-VC\n"); + gprs_ns2_free_nses(the_pcu->nsi); return -1; } - bts->nse = gprs_ns2_nse_by_nsei(the_pcu->nsi, nsei); - if (!bts->nse) - bts->nse = gprs_ns2_create_nse(the_pcu->nsi, nsei, - GPRS_NS2_LL_UDP, the_pcu->vty.ns_dialect); - - if (!bts->nse) { - LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n"); - gprs_ns2_free_binds(the_pcu->nsi); - return 1; - } - for (i = 0; i < PCU_IF_NUM_NSVC; i++) { if (!(binds & (1 << i))) continue; - /* FIXME: for SNS we just use the first successful NS-VC instead of all for the initial connect */ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) { rc = gprs_ns2_sns_add_endpoint(bts->nse, &remote[i]); - if (!rc) + if (rc && rc != -EALREADY) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to add SNS endpoint %s!\n", osmo_sockaddr_to_str(&remote[i])); return rc; - else - LOGP(DBSSGP, LOGL_ERROR, "Failed to connect to (SNS) towards SGSN %s!\n", osmo_sockaddr_to_str(&remote[i])); + } else { + sns_configured = true; + } } else { nsvc = gprs_ns2_ip_connect(bind[i], &remote[i], bts->nse, nsvci[i]); if (nsvc) @@ -1044,7 +1045,10 @@ } } - return nsvcs ? 0 : -1; + if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) + return sns_configured ? 0 : 1; + else + return nsvcs ? 0 : -1; } struct nsvc_cb { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 05:45:11 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 05:45:11 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the b... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22914 ) Change subject: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration ...................................................................... gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration The gprs_ns2 now requires to specify every bind which should be used by the NSE for IP-SNS Depends: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Realted: SYS#5354 Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac --- M src/gprs_bssgp_pcu.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/22914/1 diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 7b28665..264860a 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -1013,6 +1013,14 @@ LOGP(DBSSGP, LOGL_ERROR, "Failed to bind to %s\n", osmo_sockaddr_to_str(&local[i])); continue; } + + if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) { + rc = gprs_ns2_sns_add_bind(bts->nse, bind[i]); + if (rc < 0) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to add bind %s to the NSE for IP-SNS\n", osmo_sockaddr_to_str(&local[i])); + continue; + } + } } binds |= 1 << i; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac Gerrit-Change-Number: 22914 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:09:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 07:09:29 +0000 Subject: Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 07:09:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:09:32 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 07:09:32 +0000 Subject: Change in docker-playground[master]: Revert "RFC: allow to set configuration and/or specific testcases" In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22882 ) Change subject: Revert "RFC: allow to set configuration and/or specific testcases" ...................................................................... Revert "RFC: allow to set configuration and/or specific testcases" Fix error message reported by Pau: docker: invalid reference format: repository name must be lowercase. This happens in the "docker run" command after the "Starting container to merge logs" message, because the arguments to --entrypoint are not in quotation marks. The command fails. Logs were merged anyway, because If03422bb8fb126fe6f204a4f8bc6edf0cbb7f194 had already reverted half the patch and added the log merging back to the Dockerfile. This reverts commit 73663b01f21e9a01cf3e5048d802270c482852cf. Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 623f468..35eaf2e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -56,17 +56,6 @@ -v $VOL_BASE_DIR/sgsn-tester:/data \ --name ${BUILD_TAG}-ttcn3-sgsn-test \ $DOCKER_ARGS \ - $REPO_USER/ttcn3-sgsn-test $@ - -echo Starting container to merge logs -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/sgsn-tester:/data \ - --name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \ - --entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \ - $DOCKER_ARGS \ $REPO_USER/ttcn3-sgsn-test echo Stopping containers -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie6f8270230e1f0372b63d610b7868ea8719b18ad Gerrit-Change-Number: 22882 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:19:00 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 07:19:00 +0000 Subject: Change in osmo-bts[master]: main: cosmetic: tweak deprecation warning messages In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22890 ) Change subject: main: cosmetic: tweak deprecation warning messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 Gerrit-Change-Number: 22890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Feb 2021 07:19:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:20:02 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 07:20:02 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22891 ) Change subject: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c Gerrit-Change-Number: 22891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 07:20:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:21:17 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 07:21:17 +0000 Subject: Change in osmo-bts[master]: GSMTAP: fix wrong naming of per-BTS SAPI commands In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22892 ) Change subject: GSMTAP: fix wrong naming of per-BTS SAPI commands ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 Gerrit-Change-Number: 22892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Feb 2021 07:21:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:29:51 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 07:29:51 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22893 ) Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22893/1/src/common/main.c File src/common/main.c: https://gerrit.osmocom.org/c/osmo-bts/+/22893/1/src/common/main.c at 325 PS1, Line 325: if (g_bts->gsmtap.inst == NULL) { why explicit == NULL? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 Gerrit-Change-Number: 22893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 07:29:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:33:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 07:33:25 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22893 ) Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22893/1/src/common/main.c File src/common/main.c: https://gerrit.osmocom.org/c/osmo-bts/+/22893/1/src/common/main.c at 325 PS1, Line 325: if (g_bts->gsmtap.inst == NULL) { > why explicit == NULL? It's just a personal preference that I cannot explain... :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 Gerrit-Change-Number: 22893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 07:33:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:33:34 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 07:33:34 +0000 Subject: Change in osmo-bts[master]: main: cosmetic: tweak deprecation warning messages In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22890 ) Change subject: main: cosmetic: tweak deprecation warning messages ...................................................................... main: cosmetic: tweak deprecation warning messages Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 --- M src/common/main.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/common/main.c b/src/common/main.c index f54a5ca..76e0d43 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -181,15 +181,15 @@ break; case 'r': rt_prio = atoi(optarg); - fprintf(stderr, "Parameter -r is deprecated, use VTY cpu-sched " - "node setting 'policy rr %d' instead\n", rt_prio); + fprintf(stderr, "Command line argument '-r' is deprecated, use VTY " + "cpu-sched node setting 'policy rr %d' instead.\n", rt_prio); break; case 'i': gsmtap_ip = optarg; break; case 't': - fprintf(stderr, "Parameter -t is deprecated and does nothing, " - "TRX num is calculated from VTY\n"); + fprintf(stderr, "Command line argument '-t' is deprecated and does nothing, " + "TRX number is calculated from the VTY automatically.\n"); break; case '?': case 1: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b87502b1af5b8ef8c235923bf966f0c76062993 Gerrit-Change-Number: 22890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:33:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 07:33:35 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22891 ) Change subject: GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c ...................................................................... GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c There is no point in having it there, as VTY is the only user. Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/vty.c 3 files changed, 17 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 85fe548..af58d5e 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -127,7 +127,6 @@ extern uint16_t l1sap_log_ctx_sapi; extern const struct value_string l1sap_common_sapi_names[]; -extern const struct value_string gsmtap_sapi_names[]; extern struct gsmtap_inst *gsmtap; extern uint32_t gsmtap_sapi_mask; extern uint8_t gsmtap_sapi_acch; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 97dd661..9b3b087 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -350,23 +350,6 @@ uint32_t gsmtap_sapi_mask = 0; uint8_t gsmtap_sapi_acch = 0; -const struct value_string gsmtap_sapi_names[] = { - { GSMTAP_CHANNEL_BCCH, "BCCH" }, - { GSMTAP_CHANNEL_CCCH, "CCCH" }, - { GSMTAP_CHANNEL_RACH, "RACH" }, - { GSMTAP_CHANNEL_AGCH, "AGCH" }, - { GSMTAP_CHANNEL_PCH, "PCH" }, - { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, - { GSMTAP_CHANNEL_TCH_F, "TCH/F" }, - { GSMTAP_CHANNEL_TCH_H, "TCH/H" }, - { GSMTAP_CHANNEL_PACCH, "PACCH" }, - { GSMTAP_CHANNEL_PDCH, "PDTCH" }, - { GSMTAP_CHANNEL_PTCCH, "PTCCH" }, - { GSMTAP_CHANNEL_CBCH51,"CBCH" }, - { GSMTAP_CHANNEL_ACCH, "SACCH" }, - { 0, NULL } -}; - /* send primitive as gsmtap */ static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap, uint8_t *chan_type, uint8_t *ss, uint32_t fn, diff --git a/src/common/vty.c b/src/common/vty.c index f36c09e..84e3968 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -71,6 +71,23 @@ int g_vty_port_num = OSMO_VTY_PORT_BTS; +static const struct value_string gsmtap_sapi_names[] = { + { GSMTAP_CHANNEL_BCCH, "BCCH" }, + { GSMTAP_CHANNEL_CCCH, "CCCH" }, + { GSMTAP_CHANNEL_RACH, "RACH" }, + { GSMTAP_CHANNEL_AGCH, "AGCH" }, + { GSMTAP_CHANNEL_PCH, "PCH" }, + { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, + { GSMTAP_CHANNEL_TCH_F, "TCH/F" }, + { GSMTAP_CHANNEL_TCH_H, "TCH/H" }, + { GSMTAP_CHANNEL_PACCH, "PACCH" }, + { GSMTAP_CHANNEL_PDCH, "PDTCH" }, + { GSMTAP_CHANNEL_PTCCH, "PTCCH" }, + { GSMTAP_CHANNEL_CBCH51,"CBCH" }, + { GSMTAP_CHANNEL_ACCH, "SACCH" }, + { 0, NULL } +}; + struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr) { struct phy_link *plink = phy_link_by_num(phy_nr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If919bc1b2d456559ae9ff1ce5dd27d34742ee51c Gerrit-Change-Number: 22891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:33:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 07:33:36 +0000 Subject: Change in osmo-bts[master]: GSMTAP: fix wrong naming of per-BTS SAPI commands In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22892 ) Change subject: GSMTAP: fix wrong naming of per-BTS SAPI commands ...................................................................... GSMTAP: fix wrong naming of per-BTS SAPI commands Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 --- M src/common/vty.c 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index 84e3968..976ccfa 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1826,7 +1826,7 @@ "logical channel commands\n" \ "logical channel number\n" -DEFUN(cfg_trx_gsmtap_sapi_all, cfg_trx_gsmtap_sapi_all_cmd, +DEFUN(cfg_bts_gsmtap_sapi_all, cfg_bts_gsmtap_sapi_all_cmd, "gsmtap-sapi (enable-all|disable-all)", "Enable/disable sending of UL/DL messages over GSMTAP\n" "Enable all kinds of messages (all SAPI)\n" @@ -1843,7 +1843,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_trx_gsmtap_sapi, cfg_trx_gsmtap_sapi_cmd, +DEFUN(cfg_bts_gsmtap_sapi, cfg_bts_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { int sapi; @@ -1859,7 +1859,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_trx_no_gsmtap_sapi, cfg_trx_no_gsmtap_sapi_cmd, +DEFUN(cfg_trx_no_gsmtap_sapi, cfg_bts_no_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { int sapi; @@ -2165,17 +2165,17 @@ int bts_vty_init(void *ctx) { - cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, "gsmtap-sapi (", "|",")", VTY_DO_LOWER); - cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, "Enable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); - cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, "no gsmtap-sapi (", "|",")", VTY_DO_LOWER); - cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, + cfg_bts_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names, NO_STR "Disable sending of UL/DL messages over GSMTAP\n", "\n", "", 0); @@ -2233,9 +2233,9 @@ install_element(BTS_NODE, &cfg_bts_smscb_tgt_qlen_cmd); install_element(BTS_NODE, &cfg_bts_smscb_qhyst_cmd); - install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_all_cmd); - install_element(BTS_NODE, &cfg_trx_gsmtap_sapi_cmd); - install_element(BTS_NODE, &cfg_trx_no_gsmtap_sapi_cmd); + install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_all_cmd); + install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_cmd); + install_element(BTS_NODE, &cfg_bts_no_gsmtap_sapi_cmd); /* add and link to TRX config node */ install_element(BTS_NODE, &cfg_bts_trx_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieb2d74475e4338e9dd5f3962cf14a0448de253f8 Gerrit-Change-Number: 22892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 07:33:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 07:33:36 +0000 Subject: Change in osmo-bts[master]: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22893 ) Change subject: GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' ...................................................................... GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 --- M include/osmo-bts/bts.h M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/main.c M src/common/vty.c 5 files changed, 29 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index f6389ad..3adafcc 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -343,6 +343,13 @@ char *sock_path; } pcu; + /* GSMTAP Um logging (disabled by default) */ + struct { + struct gsmtap_inst *inst; + uint32_t sapi_mask; + uint8_t sapi_acch; + } gsmtap; + struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ struct osmo_tdef *T_defs; /* Timer defines */ diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index af58d5e..fe77431 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -127,10 +127,6 @@ extern uint16_t l1sap_log_ctx_sapi; extern const struct value_string l1sap_common_sapi_names[]; -extern struct gsmtap_inst *gsmtap; -extern uint32_t gsmtap_sapi_mask; -extern uint8_t gsmtap_sapi_acch; - int add_l1sap_header(struct gsm_bts_trx *trx, struct msgb *rmsg, struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn, uint16_t ber10k, int16_t lqual_cb, int8_t rssi, diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 9b3b087..eb652db 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -346,10 +346,6 @@ } } -struct gsmtap_inst *gsmtap = NULL; -uint32_t gsmtap_sapi_mask = 0; -uint8_t gsmtap_sapi_acch = 0; - /* send primitive as gsmtap */ static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap, uint8_t *chan_type, uint8_t *ss, uint32_t fn, @@ -491,7 +487,8 @@ int8_t signal_dbm; int rc; - if (!gsmtap) + struct gsmtap_inst *inst = trx->bts->gsmtap.inst; + if (!inst) return 0; switch (OSMO_PRIM_HDR(&l1sap->oph)) { @@ -524,10 +521,10 @@ if (len == 0) return 0; if ((chan_type & GSMTAP_CHANNEL_ACCH)) { - if (!gsmtap_sapi_acch) + if (!trx->bts->gsmtap.sapi_acch) return 0; } else { - if (!((1 << (chan_type & 31)) & gsmtap_sapi_mask)) + if (!((1 << (chan_type & 31)) & trx->bts->gsmtap.sapi_mask)) return 0; } @@ -536,7 +533,7 @@ if (is_fill_frame(chan_type, data, len)) return 0; - gsmtap_send(gsmtap, trx->arfcn | uplink, tn, chan_type, ss, fn, + gsmtap_send(inst, trx->arfcn | uplink, tn, chan_type, ss, fn, signal_dbm, 0 /* TODO: SNR */, data, len); return 0; diff --git a/src/common/main.c b/src/common/main.c index 76e0d43..38f517c 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -321,12 +321,12 @@ } if (gsmtap_ip) { - gsmtap = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); - if (!gsmtap) { + g_bts->gsmtap.inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); + if (g_bts->gsmtap.inst == NULL) { fprintf(stderr, "Failed during gsmtap_init()\n"); exit(1); } - gsmtap_source_add_sink(gsmtap); + gsmtap_source_add_sink(g_bts->gsmtap.inst); } if (bts_init(g_bts) < 0) { diff --git a/src/common/vty.c b/src/common/vty.c index 976ccfa..f2c7954 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -316,7 +316,7 @@ bts->agch_queue.high_level, VTY_NEWLINE); for (i = 0; i < sizeof(uint32_t) * 8; i++) { - if (gsmtap_sapi_mask & ((uint32_t) 1 << i)) { + if (bts->gsmtap.sapi_mask & ((uint32_t) 1 << i)) { sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i); if (sapi_buf == NULL) continue; @@ -324,7 +324,7 @@ vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } } - if (gsmtap_sapi_acch) { + if (bts->gsmtap.sapi_acch) { sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH)); vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } @@ -1832,12 +1832,14 @@ "Enable all kinds of messages (all SAPI)\n" "Disable all kinds of messages (all SAPI)\n") { + struct gsm_bts *bts = vty->index; + if (argv[0][0] == 'e') { - gsmtap_sapi_mask = UINT32_MAX; - gsmtap_sapi_acch = 1; + bts->gsmtap.sapi_mask = UINT32_MAX; + bts->gsmtap.sapi_acch = 1; } else { - gsmtap_sapi_mask = 0x00; - gsmtap_sapi_acch = 0; + bts->gsmtap.sapi_mask = 0x00; + bts->gsmtap.sapi_acch = 0; } return CMD_SUCCESS; @@ -1846,15 +1848,16 @@ DEFUN(cfg_bts_gsmtap_sapi, cfg_bts_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { + struct gsm_bts *bts = vty->index; int sapi; sapi = get_string_value(gsmtap_sapi_names, argv[0]); OSMO_ASSERT(sapi >= 0); if (sapi == GSMTAP_CHANNEL_ACCH) - gsmtap_sapi_acch = 1; + bts->gsmtap.sapi_acch = 1; else - gsmtap_sapi_mask |= (1 << sapi); + bts->gsmtap.sapi_mask |= (1 << sapi); return CMD_SUCCESS; } @@ -1862,15 +1865,16 @@ DEFUN(cfg_trx_no_gsmtap_sapi, cfg_bts_no_gsmtap_sapi_cmd, "HIDDEN", "HIDDEN") { + struct gsm_bts *bts = vty->index; int sapi; sapi = get_string_value(gsmtap_sapi_names, argv[0]); OSMO_ASSERT(sapi >= 0); if (sapi == GSMTAP_CHANNEL_ACCH) - gsmtap_sapi_acch = 0; + bts->gsmtap.sapi_acch = 0; else - gsmtap_sapi_mask &= ~(1 << sapi); + bts->gsmtap.sapi_mask &= ~(1 << sapi); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 Gerrit-Change-Number: 22893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 08:52:07 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 08:52:07 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... repo-install-test: apt: always use OBS repo Tell apt explicitly to install packages from the OBS repository, to fix this error for repo-install-test with nightly on debian 10: osmo-gbproxy-dbg : Depends: osmo-gbproxy (= 0.0.1.17.2689c) but 1.3.0-2 is to be installed Apt will otherwise try to install osmo-gbproxy from debian 10's repositories (higher version 1.3.0 > 0.0.1.x), and fail with the conflict error, because installing osmo-gbproxy-dbg was also requested. The dbg package is only available in OBS and depends on osmo-gbproxy of the same version. Related: OS#4992 Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/22915/1 diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index f05f01c..6e90a57 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -287,7 +287,7 @@ > osmocom_packages_all.txt filter_packages_txt - apt install -y $(cat osmocom_packages.txt) + apt install -y -t "$DISTRO_OBSDIR" $(cat osmocom_packages.txt) } install_repo_packages_centos() { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:49:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:49:59 +0000 Subject: Change in libosmocore[master]: BVC FSM: Treat overlapping BVC-RESET as implicit ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22895 ) Change subject: BVC FSM: Treat overlapping BVC-RESET as implicit ACK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 Gerrit-Change-Number: 22895 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:49:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:50:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:50:03 +0000 Subject: Change in libosmocore[master]: BVC FSM: Treat overlapping BVC-RESET as implicit ACK In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22895 ) Change subject: BVC FSM: Treat overlapping BVC-RESET as implicit ACK ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 Gerrit-Change-Number: 22895 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:50:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:50:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:50:34 +0000 Subject: Change in osmo-bts[master]: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22894 ) Change subject: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia558587d36a75a1db1951d25b471b3f2e78ef4c9 Gerrit-Change-Number: 22894 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:50:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:51:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:51:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22900/3/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22900/3/src/gb/gprs_ns2_vty.c at 1042 PS3, Line 1042: "Data weight of the NSVC\n" (default = 1) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:51:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:52:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:52:05 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix comment of alive NS-VC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22902 ) Change subject: gprs_ns2: fix comment of alive NS-VC ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idb5d2ae4a99a472e38601ff841b8046ecf89d1bc Gerrit-Change-Number: 22902 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:52:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:53:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:53:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2: always free msgb of a primitive In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: always free msgb of a primitive ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22904/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22904/3//COMMIT_MSG at 7 PS3, Line 7: gprs_ns2: always free msgb of a primitive on error -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:53:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:54:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:54:07 +0000 Subject: Change in osmo-bts[master]: ta_control: cosmetic: use correct naming for MIN/MAX constraints In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22905 ) Change subject: ta_control: cosmetic: use correct naming for MIN/MAX constraints ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I112e0b51df06984e2e3f9b567d6d9897e9f9ba28 Gerrit-Change-Number: 22905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:54:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:55:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:55:52 +0000 Subject: Change in osmo-bts[master]: ta_control: make 'struct bts_ul_meas' parameters const In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22906 ) Change subject: ta_control: make 'struct bts_ul_meas' parameters const ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 Gerrit-Change-Number: 22906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:55:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 09:56:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 09:56:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22903/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22903/3/src/gb/gprs_ns2_sns.c at 89 PS3, Line 89: { GPRS_SNS_EV_REQ_SELECT_ENDPOINT, "SELECT_ENDPOINT" }, also add REQ ande RX here in the strings please -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 09:56:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:01:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:01:45 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22901/3/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22901/3/src/gb/gprs_ns2.c at 387 PS3, Line 387: static struct gprs_ns2_vc *ns2_load_sharing_weight_modulor( modulor???? https://gerrit.osmocom.org/c/libosmocore/+/22901/3/tests/gb/gprs_ns2_test.ok File tests/gb/gprs_ns2_test.ok: https://gerrit.osmocom.org/c/libosmocore/+/22901/3/tests/gb/gprs_ns2_test.ok at 30 PS3, Line 30: --- Finish unitdata weight test How it comes I don't see any count_pdus() output here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:01:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:02:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:02:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: remove debug line of the alive_timer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22908 ) Change subject: gprs_ns2_vc_fsm: remove debug line of the alive_timer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iffe367b240f47c39232bbc26991c19752a1c75ad Gerrit-Change-Number: 22908 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:02:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:03:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:03:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2: truncate the NS_STATUS to the MTU In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22910 ) Change subject: gprs_ns2: truncate the NS_STATUS to the MTU ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I35d8f8bf0eae890f4db56423da0b23b638d24311 Gerrit-Change-Number: 22910 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:03:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:03:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:03:41 +0000 Subject: Change in libosmocore[master]: gprs_ns2_message: tx_status: move all cause dependent code into the s... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22911 ) Change subject: gprs_ns2_message: tx_status: move all cause dependent code into the switch/case ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f1e0962c6f5f0c7287990bb7608d0cc9b86dfdb Gerrit-Change-Number: 22911 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:03:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:04:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:04:03 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: fix typo in doxygen comment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22912 ) Change subject: gprs_ns2_sns: fix typo in doxygen comment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21b51791aa149d9a5b13169d1cf8c2857c55774a Gerrit-Change-Number: 22912 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:04:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:06:19 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 15 Feb 2021 10:06:19 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: remove debug line of the alive_timer In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22908 ) Change subject: gprs_ns2_vc_fsm: remove debug line of the alive_timer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iffe367b240f47c39232bbc26991c19752a1c75ad Gerrit-Change-Number: 22908 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:06:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:06:45 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 15 Feb 2021 10:06:45 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: remove debug line of the alive_timer In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22908 ) Change subject: gprs_ns2_vc_fsm: remove debug line of the alive_timer ...................................................................... gprs_ns2_vc_fsm: remove debug line of the alive_timer The log line sneaked in when fixing the alive ms Fixes: ab0e8646c4aa ("gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer") Change-Id: Iffe367b240f47c39232bbc26991c19752a1c75ad --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 31cfb51..40c8984 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -173,8 +173,6 @@ return 0; timespecsub(&now, &priv->alive.timer_started, &elapsed); - LOGNSVC(priv->nsvc, LOGL_ERROR, "elapsed: %ld, now: %ld, saved: %ld.\n", - elapsed.tv_sec, now.tv_sec, priv->alive.timer_started.tv_sec); return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iffe367b240f47c39232bbc26991c19752a1c75ad Gerrit-Change-Number: 22908 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:06:55 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 15 Feb 2021 10:06:55 +0000 Subject: Change in libosmocore[master]: BVC FSM: Treat overlapping BVC-RESET as implicit ACK In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22895 ) Change subject: BVC FSM: Treat overlapping BVC-RESET as implicit ACK ...................................................................... BVC FSM: Treat overlapping BVC-RESET as implicit ACK If the BSS (or SGSN) has sent a BVC-RESET PDU for a BVCI to the SGSN (or BSS) and is awaiting a BVC-RESET- ACK PDU in response, but instead receives a BVC-RESET PDU indicating the same BVCI, then this shall be interpreted as a BVC-RESET ACK PDU and the T2 timer shall be stopped. Related: OS#4974 Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 --- M src/gb/bssgp_bvc_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c index 8d284d1..ce9079d 100644 --- a/src/gb/bssgp_bvc_fsm.c +++ b/src/gb/bssgp_bvc_fsm.c @@ -377,6 +377,12 @@ struct msgb *rx = NULL, *tx; switch (event) { + case BSSGP_BVCFSM_E_RX_RESET: + /* 48.018 Section 8.4.3: If the BSS (or SGSN) has sent a BVC-RESET PDU for a BVCI to + * the SGSN (or BSS) and is awaiting a BVC-RESET-ACK PDU in response, but instead + * receives a BVC-RESET PDU indicating the same BVCI, then this shall be interpreted + * as a BVC-RESET ACK PDU and the T2 timer shall be stopped. */ + /* fall-through */ case BSSGP_BVCFSM_E_RX_RESET_ACK: rx = data; tp = (const struct tlv_parsed *) msgb_bcid(rx); @@ -606,7 +612,8 @@ }, [BSSGP_BVCFSM_S_WAIT_RESET_ACK]= { .name = "WAIT_RESET_ACK", - .in_event_mask = S(BSSGP_BVCFSM_E_RX_RESET_ACK), + .in_event_mask = S(BSSGP_BVCFSM_E_RX_RESET_ACK) | + S(BSSGP_BVCFSM_E_RX_RESET), .out_state_mask = S(BSSGP_BVCFSM_S_UNBLOCKED) | S(BSSGP_BVCFSM_S_BLOCKED) | S(BSSGP_BVCFSM_S_WAIT_RESET_ACK), -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d15733f9f205cb563b66ef9e41dc8df50151900 Gerrit-Change-Number: 22895 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:13:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 11: (6 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/11/include/osmocom/gprs/frame_relay.h File include/osmocom/gprs/frame_relay.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/include/osmocom/gprs/frame_relay.h at 45 PS11, Line 45: #define FRAME_RELAY_SDU FRAME_RELAY_MTU - 2 () https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at a468 PS11, Line 468: non related https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at 501 PS11, Line 501: nsp.u.status.mtu = nse->mtu - 4; /* 1b NS PDU type, 1b NS SDU control, 2b BVCI */ B, not b? (byte vs bit) Don't we have any header struct for this set of contents, where one can use sizeof()? https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at 754 PS11, Line 754: nse->mtu = 0; not really needed since we use talloc_zero. https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2_udp.c at a116 PS11, Line 116: non-related https://gerrit.osmocom.org/c/libosmocore/+/22343/11/tests/gb/gprs_ns2_test.c File tests/gb/gprs_ns2_test.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/tests/gb/gprs_ns2_test.c at 43 PS11, Line 43: static struct osmo_gprs_ns2_prim last_nse_recovery = {}; not important, but no need for = {} in a static var (it is already initializer to 0). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:13:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:14:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:14:45 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework ns_create_nsvc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22913 ) Change subject: gprs_bssgp: rework ns_create_nsvc ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22913/1/src/gprs_bssgp_pcu.c File src/gprs_bssgp_pcu.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22913/1/src/gprs_bssgp_pcu.c at 1049 PS1, Line 1049: return sns_configured ? 0 : 1; returning 1 here? are you sure this is OK? Please write documentation for this function. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:14:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:17:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:17:09 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... Patch Set 1: I think the proper solution for this would be creating a new tag release for osmo-gbproxy in osmo-gbproxy.git which is > 1.3.0. This way we aoid having other users with potentially same errors (and it makes sense anyway from history point of view). -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:17:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:18:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 10:18:43 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add MTU field for BSSGP ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h at 25 PS3, Line 25: #define DEFAULT_NSE_SDU (1600 - 4) I think lynxis is adding a similar define in libosmocore -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:18:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:34:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:34:09 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... Patch Set 1: > Patch Set 1: > > I think the proper solution for this would be creating a new tag release for osmo-gbproxy in osmo-gbproxy.git which is > 1.3.0. Yes, an this is blocked for months as NS2 API/VTY is still not considered stable. This is really becoming more and more of a problem, on all sides. > This way we aoid having other users with potentially same errors (and it makes sense anyway from history point of view). Another option to solve this would be to use apt pinning to always prefer the osmocom feeds over distribution feeds. This might actually be reasonable in any case, and we could add it to our instructions on "how to add the osmocom feed to your system" in the wiki. That pinning config could then also be part of our docker containers / jenkins slaves -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:34:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:37:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:37:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 11: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/11/include/osmocom/gprs/frame_relay.h File include/osmocom/gprs/frame_relay.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/include/osmocom/gprs/frame_relay.h at 45 PS11, Line 45: #define FRAME_RELAY_SDU FRAME_RELAY_MTU - 2 > () Ack https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at 501 PS11, Line 501: nsp.u.status.mtu = nse->mtu - 4; /* 1b NS PDU type, 1b NS SDU control, 2b BVCI */ > B, not b? (byte vs bit) [?] Ack, we should have a ns_unitdata_hdr struct. https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at 754 PS11, Line 754: nse->mtu = 0; > not really needed since we use talloc_zero. doesn't hurt either to make it clear. https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2_udp.c at a116 PS11, Line 116: > non-related Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:37:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:38:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:38:22 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22900/3/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22900/3/src/gb/gprs_ns2_vty.c at 1042 PS3, Line 1042: "Data weight of the NSVC\n" > (default = 1) Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:38:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:40:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:40:09 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix comment of alive NS-VC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22902 ) Change subject: gprs_ns2: fix comment of alive NS-VC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idb5d2ae4a99a472e38601ff841b8046ecf89d1bc Gerrit-Change-Number: 22902 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:40:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:42:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:42:16 +0000 Subject: Change in libosmocore[master]: gprs_ns2: always free msgb of a primitive In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: always free msgb of a primitive ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22904/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22904/3//COMMIT_MSG at 7 PS3, Line 7: gprs_ns2: always free msgb of a primitive > on error well, I suspect the transmit path also free's it, just in a difeerent function. So I'd suggest something like "make gprs_ns2_recv_prim() always take msgb ownership" or the like. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:42:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:42:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:42:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22903/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22903/3/src/gb/gprs_ns2_sns.c at 89 PS3, Line 89: { GPRS_SNS_EV_REQ_SELECT_ENDPOINT, "SELECT_ENDPOINT" }, > also add REQ ande RX here in the strings please Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 10:42:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:55:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:55:30 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22909/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22909/1//COMMIT_MSG at 9 PS1, Line 9: W In practice, I wouldn't really expect the MTU to change at runtime at all. I'm not even sure it can happen while the device is up. It's purely hypothetical in all practical deployments, IMHO. What does matter is that we determine the MTU of the underlying network device at least once when we open the AF_PACKET socket, rather than using our compile-time default. This can likely be achieved the same way (if we have mnl support included), but the commit should then emphasize the important use case, rather than the esoteric one. https://gerrit.osmocom.org/c/libosmocore/+/22909/1//COMMIT_MSG at 12 PS1, Line 12: T I would suggest to extend the STATUS primitive from NS to BSSGP https://gerrit.osmocom.org/c/libosmocore/+/22909/1/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22909/1/src/gb/gprs_ns2_fr.c at 610 PS1, Line 610: /* 2 byte DLCI header */ : bind->mtu = mtu - 2; I was not entirely sure about that part. AFAIR the AF_PACKET/SOCK_RAW code internally manages this somehow and adds size of the header. See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/packet/af_packet.c#n2940 "(len > dev->mtu + reserve + VLAN_HLEN + extra_len)" is the actual conditoion, and "reserve" corresponds to dev->hard_header_len. This normally is the size of an ethernet header on ethernet-style devices. So I would have assumed it's the size of a FR header on a HDLC/FR device. However, much to my surprise. hdlc_fr.c actually sets hard_header_len to zero, so it seems you're right. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 10:55:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:55:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:55:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2: truncate the NS_STATUS to the MTU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22910 ) Change subject: gprs_ns2: truncate the NS_STATUS to the MTU ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I35d8f8bf0eae890f4db56423da0b23b638d24311 Gerrit-Change-Number: 22910 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:55:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:56:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:56:22 +0000 Subject: Change in libosmocore[master]: gprs_ns2_message: tx_status: move all cause dependent code into the s... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22911 ) Change subject: gprs_ns2_message: tx_status: move all cause dependent code into the switch/case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f1e0962c6f5f0c7287990bb7608d0cc9b86dfdb Gerrit-Change-Number: 22911 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:56:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:56:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:56:28 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix comment of alive NS-VC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22902 ) Change subject: gprs_ns2: fix comment of alive NS-VC ...................................................................... gprs_ns2: fix comment of alive NS-VC There is no active NS-VCs only alive or dead. Change-Id: Idb5d2ae4a99a472e38601ff841b8046ecf89d1bc --- M src/gb/gprs_ns2_internal.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 88e352a..d4764f6 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -174,10 +174,10 @@ struct osmo_fsm_inst *bss_sns_fi; - /*! sum of all the data weight of _active_ NS-VCs */ + /*! sum of all the data weight of _alive_ NS-VCs */ uint32_t sum_data_weight; - /*! sum of all the signalling weight of _active_ NS-VCs */ + /*! sum of all the signalling weight of _alive_ NS-VCs */ uint32_t sum_sig_weight; }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idb5d2ae4a99a472e38601ff841b8046ecf89d1bc Gerrit-Change-Number: 22902 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:57:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:57:58 +0000 Subject: Change in osmo-bts[master]: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22894 ) Change subject: add support for sysmoBTS 1003 aka "1002 with GPS and PoE" ...................................................................... add support for sysmoBTS 1003 aka "1002 with GPS and PoE" There's a minor derivative version of sysmoBTS 1002 which has built-in GPS and PoE. We call it 1003 in the EEPROM. Let's treat it identical to 1002 in the existing code base. Related: SYS#5327 Change-Id: Ia558587d36a75a1db1951d25b471b3f2e78ef4c9 --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/misc/sysmobts_eeprom.h M src/osmo-bts-sysmo/misc/sysmobts_par.c 3 files changed, 5 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 2e4765d..07f36db 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1860,7 +1860,8 @@ LOGP(DL1C, LOGL_NOTICE, "Assuming 1002 for sysmoBTS " "Model number %u\n", fl1h->hw_info.model_nr); /* fall-through */ - case 1002: + case 1002: /* sysmoBTS 1002 */ + case 1003: /* sysmoBTS 1002 with GPS and PoE */ set_power_param(&trx->power_params, 23, 0); } } diff --git a/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h b/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h index b7a27fb..9c2b839 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h +++ b/src/osmo-bts-sysmo/misc/sysmobts_eeprom.h @@ -32,6 +32,7 @@ enum sysmobts_model_number { MODEL_SYSMOBTS_1002 = 1002, + MODEL_SYSMOBTS_1003 = 1003, MODEL_SYSMOBTS_1020 = 1020, MODEL_SYSMOBTS_2050 = 2050, }; diff --git a/src/osmo-bts-sysmo/misc/sysmobts_par.c b/src/osmo-bts-sysmo/misc/sysmobts_par.c index de81fff..f1fe8f2 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_par.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_par.c @@ -341,6 +341,8 @@ case 0xffff: case 1002: return "sysmoBTS 1002"; + case 1003: + return "sysmoBTS 1002+GPS+PoE"; case 2050: switch(trx_num) { case 0: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia558587d36a75a1db1951d25b471b3f2e78ef4c9 Gerrit-Change-Number: 22894 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:58:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:58:18 +0000 Subject: Change in osmo-bts[master]: ta_control: cosmetic: use correct naming for MIN/MAX constraints In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22905 ) Change subject: ta_control: cosmetic: use correct naming for MIN/MAX constraints ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I112e0b51df06984e2e3f9b567d6d9897e9f9ba28 Gerrit-Change-Number: 22905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:58:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:58:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:58:48 +0000 Subject: Change in osmo-bts[master]: ta_control: make 'struct bts_ul_meas' parameters const In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22906 ) Change subject: ta_control: make 'struct bts_ul_meas' parameters const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 Gerrit-Change-Number: 22906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:58:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:58:54 +0000 Subject: Change in osmo-bts[master]: ta_control: cosmetic: use correct naming for MIN/MAX constraints In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22905 ) Change subject: ta_control: cosmetic: use correct naming for MIN/MAX constraints ...................................................................... ta_control: cosmetic: use correct naming for MIN/MAX constraints Change-Id: I112e0b51df06984e2e3f9b567d6d9897e9f9ba28 --- M src/common/ta_control.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 2ccc41a..5a3cbf5 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -26,8 +26,8 @@ #define TOA256_9OPERCENT 230 /* rqd_ta value range */ -#define TOA_MIN 0 -#define TOA_MAX 63 +#define TA_MIN 0 +#define TA_MAX 63 void lchan_ms_ta_ctrl(struct gsm_lchan *lchan) { @@ -38,12 +38,12 @@ if (lchan->meas.num_ul_meas < 4) return; - if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TOA_MIN) { + if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TA_MIN) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", toa256, lchan->rqd_ta, lchan->rqd_ta - 1); lchan->rqd_ta--; - } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < TOA_MAX) { + } else if (toa256 > TOA256_9OPERCENT && lchan->rqd_ta < TA_MAX) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too late (%d), now raising TA from %d to %d\n", toa256, lchan->rqd_ta, lchan->rqd_ta + 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I112e0b51df06984e2e3f9b567d6d9897e9f9ba28 Gerrit-Change-Number: 22905 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:58:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:58:55 +0000 Subject: Change in osmo-bts[master]: ta_control: make 'struct bts_ul_meas' parameters const In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22906 ) Change subject: ta_control: make 'struct bts_ul_meas' parameters const ...................................................................... ta_control: make 'struct bts_ul_meas' parameters const The only reason why it was not 'const' is that in lchan_new_ul_meas() we may need to overwrite 'ulm->is_sub'. This can still be done after memcpy()ing a new set of samples to the destination buffer. Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 Related: OS#5024 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c 3 files changed, 19 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 8e91c33..45f275f 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -4,11 +4,15 @@ #define MEAS_MAX_TIMING_ADVANCE 63 #define MEAS_MIN_TIMING_ADVANCE 0 -int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +int lchan_new_ul_meas(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn); int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn); -int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +int lchan_meas_process_measurement(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn); void lchan_meas_reset(struct gsm_lchan *lchan); diff --git a/src/common/measurement.c b/src/common/measurement.c index 95d60f6..03afaa3 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -318,9 +318,12 @@ /* receive a L1 uplink measurement from L1 (this function is only used * internally, it is public to call it from unit-tests) */ -int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +int lchan_new_ul_meas(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn) { uint32_t fn_mod = fn % modulus_by_lchan(lchan); + struct bts_ul_meas *dest; if (lchan->state != LCHAN_S_ACTIVE) { LOGPFN(DMEAS, LOGL_NOTICE, fn, @@ -336,19 +339,19 @@ return -ENOSPC; } + dest = &lchan->meas.uplink[lchan->meas.num_ul_meas++]; + memcpy(dest, ulm, sizeof(*ulm)); + /* We expect the lower layers to mark AMR SID_UPDATE frames already as such. * In this function, we only deal with the common logic as per the TS 45.008 tables */ if (!ulm->is_sub) - ulm->is_sub = ts45008_83_is_sub(lchan, fn); + dest->is_sub = ts45008_83_is_sub(lchan, fn); DEBUGPFN(DMEAS, fn, "%s adding measurement (ber10k=%u, ta_offs=%d, ci=%0.2f, is_sub=%u, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n", gsm_lchan_name(lchan), ulm->ber10k, ulm->ta_offs_256bits, - ulm->c_i, ulm->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, + ulm->c_i, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, fn_mod); - memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm, - sizeof(*ulm)); - lchan->meas.last_fn = fn; return 0; @@ -757,7 +760,9 @@ * l1sap.c every time a measurement indication is received. It collects the * measurement samples and automatically detects the end of the measurement * interval. */ -int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +int lchan_meas_process_measurement(struct gsm_lchan *lchan, + const struct bts_ul_meas *ulm, + uint32_t fn) { lchan_new_ul_meas(lchan, ulm, fn); return lchan_meas_check_compute(lchan, fn); diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 174abbe..d129336 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -89,7 +89,7 @@ /* feed uplink measurements into the code */ for (i = 0; i < mtc->ulm_count; i++) { - lchan_new_ul_meas(lchan, (struct bts_ul_meas *) &mtc->ulm[i], fn); + lchan_new_ul_meas(lchan, &mtc->ulm[i], fn); fn += 1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 Gerrit-Change-Number: 22906 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:59:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:59:08 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: fix typo in doxygen comment In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22912 ) Change subject: gprs_ns2_sns: fix typo in doxygen comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21b51791aa149d9a5b13169d1cf8c2857c55774a Gerrit-Change-Number: 22912 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 10:59:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 10:59:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 10:59:10 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: fix typo in doxygen comment In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22912 ) Change subject: gprs_ns2_sns: fix typo in doxygen comment ...................................................................... gprs_ns2_sns: fix typo in doxygen comment Fixes: 5bef2cc4bd58 ("ns2: Improve/extend doxygen comments for new ns2 implementation") Change-Id: I21b51791aa149d9a5b13169d1cf8c2857c55774a --- M src/gb/gprs_ns2_sns.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index d061eed..ab8415d 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1470,7 +1470,7 @@ /*! Allocate an IP-SNS FSM for the BSS side. * \param[in] nse NS Entity in which the FSM runs * \param[in] id string identifier - * \retruns FSM instance on success; NULL on error */ + * \returns FSM instance on success; NULL on error */ struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse, const char *id) { @@ -1499,7 +1499,7 @@ * \param[in] nsvc NS-VC on which the message was received * \param[in] msg message buffer of the IP-SNS message * \param[in] tp parsed TLV structure of message - * \retruns 0 on success; negative on error */ + * \returns 0 on success; negative on error */ int ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp) { struct gprs_ns2_nse *nse = nsvc->nse; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21b51791aa149d9a5b13169d1cf8c2857c55774a Gerrit-Change-Number: 22912 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:00:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 11:00:41 +0000 Subject: Change in osmo-gbproxy[master]: Add MTU field for BSSGP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add MTU field for BSSGP ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h at 24 PS3, Line 24: MTU ACK to pespin's comment, and now it's a SDU, not an MTU, comment (and commit log) were not updated. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 11:00:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:01:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 11:01:34 +0000 Subject: Change in osmo-bts[master]: l1sap: fix comment: sapi number is missing In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22886 ) Change subject: l1sap: fix comment: sapi number is missing ...................................................................... l1sap: fix comment: sapi number is missing Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index eb652db..ed7b4e7 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1046,7 +1046,7 @@ msg = pp.oph.msg; sapi = (msg->data[0] >> 2) & 0x07; - /* Only LAPDm frames for SAPI may become a repetition + /* Only LAPDm frames for SAPI 0 may become a repetition * candidate. */ if (sapi == 0) lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7922a5da0cd75eddfe019f3f5bd041ad911f1dd2 Gerrit-Change-Number: 22886 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:01:48 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 11:01:48 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... Patch Set 1: Oh, with my patch I did not consider that we do not only need to ensure for this test that the correct version of osmo-gbproxy gets installed, but also everywhere else where the nightly repository gets used... > Another option to solve this would be to use apt pinning to always prefer the osmocom feeds over distribution feeds. This might actually be reasonable in any case, and we could add it to our instructions on "how to add the osmocom feed to your system" in the wiki. That pinning config could then also be part of our docker containers / jenkins slaves This would work, but we would need to adjust all our Dockerfiles where the repositories get added. Also it wouldn't help users who have configured the repository already from running into installing the wrong version of osmo-gbproxy if nightly is enabled. How about we increase the epoch instead? https://www.debian.org/doc/debian-policy/ch-controlfields.html#version This isn't much effort, and it ensures that apt will always prefer the versions from the split osmo-gbproxy repository over the versions from osmo-sgsn (even if the osmo-gbproxy version is lower like it is now). -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 11:01:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:13:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 11:13:16 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from rem... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22916 ) Change subject: nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell ...................................................................... nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell Change-Id: I6972f46f0f3223ce00672178e5610bd3a012fb19 --- M src/nacc_fsm.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/16/22916/1 diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 3afa8b5..df7cd7d 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -488,9 +488,12 @@ return; } + LOGPFSML(fi, LOGL_INFO, "Tx RIM RAN-INFO to request SI of %s\n", + osmo_cgi_ps_name(&ctx->cgi_ps)); rc = bssgp_tx_rim(&pdu, gprs_ns2_nse_nsei(ctx->ms->bts->nse)); if (rc < 0) { - LOGPFSML(fi, LOGL_ERROR, "Failed transmitting RIM PDU: %d\n", rc); + LOGPFSML(fi, LOGL_ERROR, "Failed transmitting RIM RAN-INFO %s PDU: %d\n", + osmo_cgi_ps_name(&ctx->cgi_ps), rc); nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6972f46f0f3223ce00672178e5610bd3a012fb19 Gerrit-Change-Number: 22916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:29:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 11:29:27 +0000 Subject: Change in docker-playground[master]: gerrit: update to 3.2.7 for security reasons References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22919 ) Change subject: gerrit: update to 3.2.7 for security reasons ...................................................................... gerrit: update to 3.2.7 for security reasons Change-Id: Ib51cb5466ec2eddeb76e1853a4c1206f9a8e5fd0 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/19/22919/1 diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index a532f6e..cbaff20 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.2.3 +FROM gerritcodereview/gerrit:3.2.7 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib51cb5466ec2eddeb76e1853a4c1206f9a8e5fd0 Gerrit-Change-Number: 22919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:29:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 11:29:47 +0000 Subject: Change in docker-playground[master]: gerrit: update to 3.2.7 for security reasons In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22919 ) Change subject: gerrit: update to 3.2.7 for security reasons ...................................................................... Patch Set 1: Verified+1 Code-Review+2 deployed already. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib51cb5466ec2eddeb76e1853a4c1206f9a8e5fd0 Gerrit-Change-Number: 22919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 11:29:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:29:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 11:29:49 +0000 Subject: Change in docker-playground[master]: gerrit: update to 3.2.7 for security reasons In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22919 ) Change subject: gerrit: update to 3.2.7 for security reasons ...................................................................... gerrit: update to 3.2.7 for security reasons Change-Id: Ib51cb5466ec2eddeb76e1853a4c1206f9a8e5fd0 --- M gerrit/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile index a532f6e..cbaff20 100644 --- a/gerrit/Dockerfile +++ b/gerrit/Dockerfile @@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.2.3 +FROM gerritcodereview/gerrit:3.2.7 USER root RUN yum -y install zip unzip patch -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib51cb5466ec2eddeb76e1853a4c1206f9a8e5fd0 Gerrit-Change-Number: 22919 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:39:30 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 11:39:30 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22901/3/tests/gb/gprs_ns2_test.ok File tests/gb/gprs_ns2_test.ok: https://gerrit.osmocom.org/c/libosmocore/+/22901/3/tests/gb/gprs_ns2_test.ok at 30 PS3, Line 30: --- Finish unitdata weight test > How it comes I don't see any count_pdus() output here? because it's in stderr. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 11:39:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 11:40:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 15 Feb 2021 11:40:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2: always free msgb of a primitive In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: always free msgb of a primitive ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22904/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22904/3//COMMIT_MSG at 7 PS3, Line 7: gprs_ns2: always free msgb of a primitive > well, I suspect the transmit path also free's it, just in a difeerent function. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 11:40:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:02:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 12:02:40 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... logging: gsmtap: Fill PID field for each message It was recently discovered that PID field in gsmtap log messages was always set to 0. Before this patch, the field was never being set. The approach of this patch is to record the PID of the process once during tgt creation, in order to avoid calling getpid() syscall on each log line to be sent. The counterpart of this optimization is that eventual fork() calls would still keep the old incorrect value, but I think nobody can safely assume that fork() is possible once all this kind of infrastructure has already been configured (fork() should only be done really at the start of the program before any osmocom foo is initialized). Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 --- M include/osmocom/core/logging.h M src/logging_gsmtap.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/22920/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index c7f89de..c4068a0 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -314,6 +314,7 @@ struct gsmtap_inst *gsmtap_inst; const char *ident; const char *hostname; + uint32_t pid; } tgt_gsmtap; struct { diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index bd64271..9930419 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef HAVE_STRINGS_H #include @@ -82,6 +83,7 @@ /* Logging header */ golh = (struct gsmtap_osmocore_log_hdr *) msgb_put(msg, sizeof(*golh)); OSMO_STRLCPY_ARRAY(golh->proc_name, target->tgt_gsmtap.ident); + golh->pid = target->tgt_gsmtap.pid; if (subsys_name) OSMO_STRLCPY_ARRAY(golh->subsys, subsys_name + 1); else @@ -148,6 +150,7 @@ target->tgt_gsmtap.gsmtap_inst = gti; target->tgt_gsmtap.ident = talloc_strdup(target, ident); target->tgt_gsmtap.hostname = talloc_strdup(target, host); + target->tgt_gsmtap.pid = (uint32_t)getpid(); target->type = LOG_TGT_TYPE_GSMTAP; target->raw_output = _gsmtap_raw_output; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:04:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 12:04:22 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 12:04:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:04:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 12:04:47 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 1: Code-Review+1 well, we do fork() during runtime some times, but then only to exec() another process, and certainly not to ue any libosmo* in the new process. So I think this is fine. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 15 Feb 2021 12:04:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:06:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 12:06:27 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 1: Actually, I would probably have gone for a static global variable, as a) the PID is not different between multiple targets b) it doesn't change the ABI But given we are hopefully soon tagging a new release with tons of other ABI breakage, I guess we can overlook the second one. One idea might be to use the thread ID instead... not sure if that would be interesting in osmoTRX?. t that point it would be a static global __thread variable. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 15 Feb 2021 12:06:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:07:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 12:07:46 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... Patch Set 1: > How about we increase the epoch instead? > https://www.debian.org/doc/debian-policy/ch-controlfields.html#version > > This isn't much effort, and it ensures that apt will always prefer the versions from the split osmo-gbproxy repository over the versions from osmo-sgsn (even if the osmo-gbproxy version is lower like it is now). epoch works to solve this specific problem, yes. It still might be good to advise users to use pinning in case in the future for some reason the distribution would have a higher version or epoch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 12:07:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:11:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 12:11:12 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 1: Regarding TID, what we should do first is moving the my_gettid() from osmo-trx to somehere in libosmocore, similar to what we do with timer_compath.h, and call it osmo_gettid(). The problem is that gettid() support is a bit fishy sometimes. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 12:11:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 12:50:20 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 12:50:20 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Feb 2021 12:50:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 14:03:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 14:03:28 +0000 Subject: Change in osmo-gbproxy[master]: d/changelog: set epoch=1 References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 ) Change subject: d/changelog: set epoch=1 ...................................................................... d/changelog: set epoch=1 Let apt know that the current 0.0.1 release of the split osmo-gbproxy repository should be preferred over all packages from before the split. Related: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version Related: OS#4992 Change-Id: I3e3749cd14bff3b38261ae048b928ea8c54dfcef --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/21/22921/1 diff --git a/debian/changelog b/debian/changelog index c26fb12..06a570e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -osmo-gbproxy (0.0.1) unstable; urgency=medium +osmo-gbproxy (1:0.0.1) unstable; urgency=medium [ Harald Welte ] * Further clean-up in osmo-sgsn -> osmo-gbproxy migration @@ -11,7 +11,7 @@ -- Oliver Smith Fri, 05 Feb 2021 11:42:48 +0100 -osmo-gbproxy (0.0.0) unstable; urgency=medium +osmo-gbproxy (1:0.0.0) unstable; urgency=medium [ Neels Hofmeyr ] * manual: explain IuPS, add SCCP/M3UA section from common chapters -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3e3749cd14bff3b38261ae048b928ea8c54dfcef Gerrit-Change-Number: 22921 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 14:03:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 14:03:39 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... OBS: nightly: use epoch from debian/changelog If epoch is used in debian/changelog, prepend it to the version from git-version-gen. Also set the epoch in the spec file. For example, the version in debian/changelog may be 1:0.0.1. The epoch is 1, therefore a 0.0.1.18.b5d18 version from git-version-gen would turn into 1:0.0.1.18.b5d18. Setting epoch=1 is needed for osmo-gbproxy, so apt on debian 10 with the nightly Osmocom repository enabled does not try to install osmo-gbproxy 1.3.0 from the debian repositories instead of 0.0.1 from the Omsocom repository. Related: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version Related: OS#4992 Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 --- M scripts/common-obs.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/22922/1 diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index 366d72e..edd48df 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -113,6 +113,7 @@ local spec="$oscdir/$name.spec" local tarball local version + local epoch if [ -z "$spec_in" ]; then echo "WARNING: RPM spec missing: $name.spec.in" @@ -123,9 +124,19 @@ osmo_obs_add_depend_rpm "$spec" "$name" "$depend" "$dependver" - # Set version - version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)" - sed -i "s/^Version:.*/Version: $version/g" "$spec" + # Set version and epoch from "Version: [EPOCH:]VERSION" in .dsc + version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2- | xargs)" + case $version in + *:*) + epoch=$(echo "$version" | cut -d : -f 1) + version=$(echo "$version" | cut -d : -f 2) + ;; + esac + if [ -n "$epoch" ]; then + sed -i "s/^Version:.*/Version: $version\nEpoch: $epoch/g" "$spec" + else + sed -i "s/^Version:.*/Version: $version/g" "$spec" + fi # Set source file tarball="$(ls -1 "${name}_"*".tar."*)" diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index d8338ae..09d832a 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -70,11 +70,19 @@ version=$(echo "$version" | sed 's/-/./g' ) # deb version + deb_version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') if [ -z "$version" ] || [ "$version" = "UNKNOWN" ]; then - version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') - version="$version.$DT" + version="$deb_version.$DT" fi + # add epoch from debian/changelog + case $deb_version in + *:*) + epoch=$(echo "$deb_version" | cut -d : -f 1) + version=$epoch:$version + ;; + esac + echo -n "$version" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 14:04:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 14:04:57 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... Patch Set 1: New patches to set epoch instead: * https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 * https://gerrit.osmocom.org/c/osmo-ci/+/22922 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 14:04:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 14:05:14 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 14:05:14 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt: always use OBS repo In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22915 ) Change subject: repo-install-test: apt: always use OBS repo ...................................................................... Abandoned using epoch instead, see patches in last comment -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If7cd254133b44eb9ec204c80095fc25f4a0e6d83 Gerrit-Change-Number: 22915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 14:05:50 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 15 Feb 2021 14:05:50 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... Patch Set 1: Verified+1 Verified that this works as intended in my own OBS namespace. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Feb 2021 14:05:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 14:10:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 14:10:04 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Feb 2021 14:10:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 15:02:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 15:02:13 +0000 Subject: Change in osmo-bts[master]: GSMTAP: make remote host for Um logging configurable via VTY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/10808 ) Change subject: GSMTAP: make remote host for Um logging configurable via VTY ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/10808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 15:02:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 15:06:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 15:06:55 +0000 Subject: Change in osmo-bts[master]: GSMTAP: make remote host for Um logging configurable via VTY In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/10808 ) Change subject: GSMTAP: make remote host for Um logging configurable via VTY ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/10808/3/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/10808/3/src/common/vty.c at 1834 PS3, Line 1834: cfg_bts_gsmtap_remote_host_cmd > should use DEFUN_ATTR now to indicate that it only becomes active at program restart. The current [implicit] policy is that all commands require full program restart unless stated otherwise. This is a safe default assumption, so we don't need a special attribute for that (otherwise basically all DEFUN statements would need to be changed to DEFUN_ATTR in all programs). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/10808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 15:06:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 15:47:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 15:47:27 +0000 Subject: Change in libosmocore[master]: comsetic: gsm0808_test: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22923 ) Change subject: comsetic: gsm0808_test: Fix trailing whitespace ...................................................................... comsetic: gsm0808_test: Fix trailing whitespace Change-Id: I7f48e292fefe555939129f4000303e630a12cc50 --- M tests/gsm0808/gsm0808_test.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/22923/1 diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index dd2ffbe..7eb53c2 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -499,7 +499,7 @@ GSM0808_SCT_CSD | 0x90, 0xc0, GSM0808_IE_CALL_ID, - 0xce, 0xfa, 0xad, 0xde, /* CallID */ + 0xce, 0xfa, 0xad, 0xde, /* CallID */ 0x83, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, /* Kc */ GSM0808_IE_GLOBAL_CALL_REF, 0x0d, /* GCR, length */ 0x03, 0x44, 0x44, 0x44, /* GCR, Net ID */ @@ -1974,7 +1974,7 @@ cfg.m10_2 = 0; cfg.m12_2 = 0; test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - + } static void test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single(uint16_t s15_s0) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7f48e292fefe555939129f4000303e630a12cc50 Gerrit-Change-Number: 22923 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 15:47:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 15:47:28 +0000 Subject: Change in libosmocore[master]: gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22924 ) Change subject: gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() ...................................................................... gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() This is not really used nowadays, but added for completeness in case someone wants to use it. Change-Id: I1361b044bd897d04133cda6fd62c16852700b17a --- M src/gsm/gsm0808_utils.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/22924/1 diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c1b0a00..292b248 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1787,6 +1787,14 @@ cid->id.global = *cgi; return; + case CELL_IDENT_WHOLE_GLOBAL_PS: + cid->id.global_ps = (struct osmo_cell_global_id_ps){ + .rai = { + .lac = cgi->lai, + }, + .cell_identity = cgi->cell_identity, + }; + return; case CELL_IDENT_LAC_AND_CI: cid->id.lac_and_ci = (struct osmo_lac_and_ci_id){ .lac = cgi->lai.lac, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1361b044bd897d04133cda6fd62c16852700b17a Gerrit-Change-Number: 22924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 15:47:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 15:47:28 +0000 Subject: Change in libosmocore[master]: gsm0808_utils: Move static function further up in file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22925 ) Change subject: gsm0808_utils: Move static function further up in file ...................................................................... gsm0808_utils: Move static function further up in file It's a static internal function, so it makes sense to have it at start of its related section. It will be used by other functions in follow up patches. Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95 --- M src/gsm/gsm0808_utils.c 1 file changed, 46 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/22925/1 diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 292b248..e0f0c28 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -767,6 +767,52 @@ return (int)(elem - old_elem); } +/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones. + * This is useful to supplement one CGI with information from more than one Cell Identifier, + * which in turn is useful to match Cell Identifiers of differing kinds to each other. + * Before first invocation, clear the *dst struct externally, this function does only write those members + * that are present in parameter u. + */ +static void cell_id_to_cgi(struct osmo_cell_global_id *dst, + enum CELL_IDENT discr, const union gsm0808_cell_id_u *u) +{ + switch (discr) { + case CELL_IDENT_WHOLE_GLOBAL: + *dst = u->global; + return; + + case CELL_IDENT_WHOLE_GLOBAL_PS: + dst->lai = u->global_ps.rai.lac; + dst->cell_identity = u->global_ps.cell_identity; + return; + + case CELL_IDENT_LAC_AND_CI: + dst->lai.lac = u->lac_and_ci.lac; + dst->cell_identity = u->lac_and_ci.ci; + return; + + case CELL_IDENT_CI: + dst->cell_identity = u->ci; + return; + + case CELL_IDENT_LAI_AND_LAC: + dst->lai = u->lai_and_lac; + return; + + case CELL_IDENT_LAC: + dst->lai.lac = u->lac; + return; + + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + /* No values to set. */ + return; + } +} + /* Return the size of the value part of a cell identifier of given type */ int gsm0808_cell_id_size(enum CELL_IDENT discr) { @@ -1619,52 +1665,6 @@ } } -/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones. - * This is useful to supplement one CGI with information from more than one Cell Identifier, - * which in turn is useful to match Cell Identifiers of differing kinds to each other. - * Before first invocation, clear the *dst struct externally, this function does only write those members - * that are present in parameter u. - */ -static void cell_id_to_cgi(struct osmo_cell_global_id *dst, - enum CELL_IDENT discr, const union gsm0808_cell_id_u *u) -{ - switch (discr) { - case CELL_IDENT_WHOLE_GLOBAL: - *dst = u->global; - return; - - case CELL_IDENT_WHOLE_GLOBAL_PS: - dst->lai = u->global_ps.rai.lac; - dst->cell_identity = u->global_ps.cell_identity; - return; - - case CELL_IDENT_LAC_AND_CI: - dst->lai.lac = u->lac_and_ci.lac; - dst->cell_identity = u->lac_and_ci.ci; - return; - - case CELL_IDENT_CI: - dst->cell_identity = u->ci; - return; - - case CELL_IDENT_LAI_AND_LAC: - dst->lai = u->lai_and_lac; - return; - - case CELL_IDENT_LAC: - dst->lai.lac = u->lac; - return; - - case CELL_IDENT_NO_CELL: - case CELL_IDENT_BSS: - case CELL_IDENT_UTRAN_PLMN_LAC_RNC: - case CELL_IDENT_UTRAN_RNC: - case CELL_IDENT_UTRAN_LAC_RNC: - /* No values to set. */ - return; - } -} - /*! Return true if the common information between the two Cell Identifiers match. * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same. * Note that CELL_IDENT_NO_CELL will always return false. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95 Gerrit-Change-Number: 22925 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 15:47:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 15:47:29 +0000 Subject: Change in libosmocore[master]: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22926 ) Change subject: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types ...................................................................... gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types CGI-PS type doesn't exist in GSM 08.08 Cell Id lists. That type of cell id is osmocom-specific and used internally. In here CGI-PS is automatically converted to CGI (since the later is an extension of this one). The encode/decode_cell_id_u are left intact (comment added) since those can still be used (and are used by RIM code) to encode/decode TS 48.018 Cell Identifiers. Related: SYS#4909 Change-Id: Id74f4577c397c1ba696f00395858311bd82cb2c8 --- M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 2 files changed, 63 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/22926/1 diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index e0f0c28..dda73ad 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -877,6 +877,7 @@ /* Does not have any list items */ break; case CELL_IDENT_WHOLE_GLOBAL_PS: + /* 3GPP TS 48.018 sec 11.3.9 "Cell Identifier" */ if (len < 8) return -EINVAL; decode_lai(buf, (struct osmo_location_area_id *)&out->global_ps.rai); /* rai contains lai + non-decoded rac */ @@ -925,6 +926,7 @@ /* Does not have any list items */ break; case CELL_IDENT_WHOLE_GLOBAL_PS: { + /* 3GPP TS 48.018 sec 11.3.9 "Cell Identifier" */ const struct osmo_cell_global_id_ps *id = &u->global_ps; struct gsm48_loc_area_id lai; gsm48_generate_lai2(&lai, &id->rai.lac); @@ -949,6 +951,7 @@ uint8_t *old_tail; uint8_t *tlv_len; unsigned int i; + uint8_t id_discr; OSMO_ASSERT(msg); OSMO_ASSERT(cil); @@ -957,11 +960,25 @@ tlv_len = msgb_put(msg, 1); old_tail = msg->tail; - msgb_put_u8(msg, cil->id_discr & 0x0f); + /* CGI-PS is an osmocom-specific type. In here we don't care about the + * PS part, only the CS one. */ + if (cil->id_discr == CELL_IDENT_WHOLE_GLOBAL_PS) + id_discr = CELL_IDENT_WHOLE_GLOBAL; + else + id_discr = cil->id_discr & 0x0f; + + msgb_put_u8(msg, id_discr); OSMO_ASSERT(cil->id_list_len <= GSM0808_CELL_ID_LIST2_MAXLEN); - for (i = 0; i < cil->id_list_len; i++) - gsm0808_msgb_put_cell_id_u(msg, cil->id_discr, &cil->id_list[i]); + for (i = 0; i < cil->id_list_len; i++) { + if (cil->id_discr == CELL_IDENT_WHOLE_GLOBAL_PS) { + union gsm0808_cell_id_u u; + cell_id_to_cgi(&u.global, cil->id_discr, &cil->id_list[i]); + gsm0808_msgb_put_cell_id_u(msg, CELL_IDENT_WHOLE_GLOBAL, &u); + } else { + gsm0808_msgb_put_cell_id_u(msg, cil->id_discr, &cil->id_list[i]); + } + } *tlv_len = (uint8_t) (msg->tail - old_tail); return *tlv_len + 2; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 7eb53c2..04b3b72 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1760,6 +1760,48 @@ msgb_free(msg); } +static void test_gsm0808_enc_dec_cell_id_global_ps() +{ + struct gsm0808_cell_id enc_cgi = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + .id.global = { + .lai = { + .plmn = { .mcc = 123, .mnc = 456 }, + .lac = 0x2342 + }, + .cell_identity = 0x423, + } + }; + struct gsm0808_cell_id enc_cgi_ps = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL_PS, + .id.global_ps = { + .rai = { + .lac = { + .plmn = { .mcc = 123, .mnc = 456 }, + .lac = 0x2342 + }, + .rac = 0xcc, + }, + .cell_identity = 0x423, + } + }; + struct msgb *msg_cgi, *msg_cgi_ps; + uint8_t rc_enc; + + msg_cgi = msgb_alloc(1024, "output buffer (CGI)"); + rc_enc = gsm0808_enc_cell_id(msg_cgi, &enc_cgi); + OSMO_ASSERT(rc_enc > 0); + + msg_cgi_ps = msgb_alloc(1024, "output buffer (CGI-PS)"); + rc_enc = gsm0808_enc_cell_id(msg_cgi_ps, &enc_cgi_ps); + OSMO_ASSERT(rc_enc > 0); + + OSMO_ASSERT(msgb_eq(msg_cgi, msg_cgi_ps)); + + msgb_free(msg_cgi); + msgb_free(msg_cgi_ps); +} + static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) { uint16_t s15_s0; @@ -2462,6 +2504,7 @@ test_gsm0808_enc_dec_cell_id_ci(); test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); + test_gsm0808_enc_dec_cell_id_global_ps(); test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); test_gsm48_mr_cfg_from_gsm0808_sc_cfg(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id74f4577c397c1ba696f00395858311bd82cb2c8 Gerrit-Change-Number: 22926 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 16:03:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 15 Feb 2021 16:03:37 +0000 Subject: Change in osmo-gbproxy[master]: d/changelog: set epoch=1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 ) Change subject: d/changelog: set epoch=1 ...................................................................... Patch Set 1: I would still go for setting version > 1.3.0 and be done with it, even if the NS VTY API is still not fixed. If needed let's later release a > 1.3.1 or whatever. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3e3749cd14bff3b38261ae048b928ea8c54dfcef Gerrit-Change-Number: 22921 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 16:03:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 16:46:40 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 15 Feb 2021 16:46:40 +0000 Subject: Change in osmo-bts[master]: l1sap: be sure that the DL-SACCH l1 header is also repeated In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22887 ) Change subject: l1sap: be sure that the DL-SACCH l1 header is also repeated ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6ae601c84dd0df0c9ae142c3295da36f3222b0c9 Gerrit-Change-Number: 22887 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 17:36:11 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 15 Feb 2021 17:36:11 +0000 Subject: Change in osmo-bts[master]: sched_lchan_tchh: fix frame number and fill FACCH gap In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/21329 to look at the new patch set (#3). Change subject: sched_lchan_tchh: fix frame number and fill FACCH gap ...................................................................... sched_lchan_tchh: fix frame number and fill FACCH gap The measurement results / TCH indications that are handed when decoding the TCH/H are off by two bursts. Since a measurement result / TCH block is expected every two bursts anyway the problem can only be noticed when a FACCH transmission is going on and the frame numbers of the BFI TCH blocks appear to be missaligned towards the FACCH block. The reason is that the incoming bursts are shifted into a 6 burst wide buffer. The decoding functions always look at the beginning of that buffer while the bursts are shifted into the buffer from the end. A facch will always fit exactly in that buffer but TCH/H blocks are only 4 bursts wide and thereofre they need two additional bursts until they reach the coverage of the decoding function. Lets fix this by putting the correct frame number (from two bursts before) into the remap functions in order to get the correct beginning of the block. Since the FACCH transmission uses six blocks it takes out two TCH blocks. This means that if we count the FACCH block we end up with a gap of one TCH voice block. Lets generate a dummy measurement to compensate the gap. This will also match the behavior of the osmo-bts-sysmo phy. Change-Id: I1ad9fa3815feb2b4da608ab7df716a87ba1f2f91 Related: OS#4799 --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 51 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/29/21329/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ad9fa3815feb2b4da608ab7df716a87ba1f2f91 Gerrit-Change-Number: 21329 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:17:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:17:55 +0000 Subject: Change in osmo-bts[master]: GSMTAP: make remote host for Um logging configurable via VTY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/10808 ) Change subject: GSMTAP: make remote host for Um logging configurable via VTY ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/10808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 18:17:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:18:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:18:22 +0000 Subject: Change in osmo-gbproxy[master]: d/changelog: set epoch=1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 ) Change subject: d/changelog: set epoch=1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3e3749cd14bff3b38261ae048b928ea8c54dfcef Gerrit-Change-Number: 22921 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 15 Feb 2021 18:18:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:18:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:18:24 +0000 Subject: Change in osmo-gbproxy[master]: d/changelog: set epoch=1 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 ) Change subject: d/changelog: set epoch=1 ...................................................................... d/changelog: set epoch=1 Let apt know that the current 0.0.1 release of the split osmo-gbproxy repository should be preferred over all packages from before the split. Related: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version Related: OS#4992 Change-Id: I3e3749cd14bff3b38261ae048b928ea8c54dfcef --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index c26fb12..06a570e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -osmo-gbproxy (0.0.1) unstable; urgency=medium +osmo-gbproxy (1:0.0.1) unstable; urgency=medium [ Harald Welte ] * Further clean-up in osmo-sgsn -> osmo-gbproxy migration @@ -11,7 +11,7 @@ -- Oliver Smith Fri, 05 Feb 2021 11:42:48 +0100 -osmo-gbproxy (0.0.0) unstable; urgency=medium +osmo-gbproxy (1:0.0.0) unstable; urgency=medium [ Neels Hofmeyr ] * manual: explain IuPS, add SCCP/M3UA section from common chapters -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I3e3749cd14bff3b38261ae048b928ea8c54dfcef Gerrit-Change-Number: 22921 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:18:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:18:43 +0000 Subject: Change in libosmocore[master]: comsetic: gsm0808_test: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22923 ) Change subject: comsetic: gsm0808_test: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7f48e292fefe555939129f4000303e630a12cc50 Gerrit-Change-Number: 22923 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 18:18:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:00 +0000 Subject: Change in libosmocore[master]: gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22924 ) Change subject: gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1361b044bd897d04133cda6fd62c16852700b17a Gerrit-Change-Number: 22924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 18:19:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:09 +0000 Subject: Change in libosmocore[master]: gsm0808_utils: Move static function further up in file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22925 ) Change subject: gsm0808_utils: Move static function further up in file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95 Gerrit-Change-Number: 22925 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 18:19:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:41 +0000 Subject: Change in libosmocore[master]: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22926 ) Change subject: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id74f4577c397c1ba696f00395858311bd82cb2c8 Gerrit-Change-Number: 22926 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 18:19:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:49 +0000 Subject: Change in libosmocore[master]: comsetic: gsm0808_test: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22923 ) Change subject: comsetic: gsm0808_test: Fix trailing whitespace ...................................................................... comsetic: gsm0808_test: Fix trailing whitespace Change-Id: I7f48e292fefe555939129f4000303e630a12cc50 --- M tests/gsm0808/gsm0808_test.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index dd2ffbe..7eb53c2 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -499,7 +499,7 @@ GSM0808_SCT_CSD | 0x90, 0xc0, GSM0808_IE_CALL_ID, - 0xce, 0xfa, 0xad, 0xde, /* CallID */ + 0xce, 0xfa, 0xad, 0xde, /* CallID */ 0x83, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, /* Kc */ GSM0808_IE_GLOBAL_CALL_REF, 0x0d, /* GCR, length */ 0x03, 0x44, 0x44, 0x44, /* GCR, Net ID */ @@ -1974,7 +1974,7 @@ cfg.m10_2 = 0; cfg.m12_2 = 0; test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(&cfg); - + } static void test_gsm48_mr_cfg_from_gsm0808_sc_cfg_single(uint16_t s15_s0) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7f48e292fefe555939129f4000303e630a12cc50 Gerrit-Change-Number: 22923 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:49 +0000 Subject: Change in libosmocore[master]: gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22924 ) Change subject: gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() ...................................................................... gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() This is not really used nowadays, but added for completeness in case someone wants to use it. Change-Id: I1361b044bd897d04133cda6fd62c16852700b17a --- M src/gsm/gsm0808_utils.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c1b0a00..292b248 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1787,6 +1787,14 @@ cid->id.global = *cgi; return; + case CELL_IDENT_WHOLE_GLOBAL_PS: + cid->id.global_ps = (struct osmo_cell_global_id_ps){ + .rai = { + .lac = cgi->lai, + }, + .cell_identity = cgi->cell_identity, + }; + return; case CELL_IDENT_LAC_AND_CI: cid->id.lac_and_ci = (struct osmo_lac_and_ci_id){ .lac = cgi->lai.lac, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1361b044bd897d04133cda6fd62c16852700b17a Gerrit-Change-Number: 22924 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:50 +0000 Subject: Change in libosmocore[master]: gsm0808_utils: Move static function further up in file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22925 ) Change subject: gsm0808_utils: Move static function further up in file ...................................................................... gsm0808_utils: Move static function further up in file It's a static internal function, so it makes sense to have it at start of its related section. It will be used by other functions in follow up patches. Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95 --- M src/gsm/gsm0808_utils.c 1 file changed, 46 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 292b248..e0f0c28 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -767,6 +767,52 @@ return (int)(elem - old_elem); } +/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones. + * This is useful to supplement one CGI with information from more than one Cell Identifier, + * which in turn is useful to match Cell Identifiers of differing kinds to each other. + * Before first invocation, clear the *dst struct externally, this function does only write those members + * that are present in parameter u. + */ +static void cell_id_to_cgi(struct osmo_cell_global_id *dst, + enum CELL_IDENT discr, const union gsm0808_cell_id_u *u) +{ + switch (discr) { + case CELL_IDENT_WHOLE_GLOBAL: + *dst = u->global; + return; + + case CELL_IDENT_WHOLE_GLOBAL_PS: + dst->lai = u->global_ps.rai.lac; + dst->cell_identity = u->global_ps.cell_identity; + return; + + case CELL_IDENT_LAC_AND_CI: + dst->lai.lac = u->lac_and_ci.lac; + dst->cell_identity = u->lac_and_ci.ci; + return; + + case CELL_IDENT_CI: + dst->cell_identity = u->ci; + return; + + case CELL_IDENT_LAI_AND_LAC: + dst->lai = u->lai_and_lac; + return; + + case CELL_IDENT_LAC: + dst->lai.lac = u->lac; + return; + + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + case CELL_IDENT_UTRAN_PLMN_LAC_RNC: + case CELL_IDENT_UTRAN_RNC: + case CELL_IDENT_UTRAN_LAC_RNC: + /* No values to set. */ + return; + } +} + /* Return the size of the value part of a cell identifier of given type */ int gsm0808_cell_id_size(enum CELL_IDENT discr) { @@ -1619,52 +1665,6 @@ } } -/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones. - * This is useful to supplement one CGI with information from more than one Cell Identifier, - * which in turn is useful to match Cell Identifiers of differing kinds to each other. - * Before first invocation, clear the *dst struct externally, this function does only write those members - * that are present in parameter u. - */ -static void cell_id_to_cgi(struct osmo_cell_global_id *dst, - enum CELL_IDENT discr, const union gsm0808_cell_id_u *u) -{ - switch (discr) { - case CELL_IDENT_WHOLE_GLOBAL: - *dst = u->global; - return; - - case CELL_IDENT_WHOLE_GLOBAL_PS: - dst->lai = u->global_ps.rai.lac; - dst->cell_identity = u->global_ps.cell_identity; - return; - - case CELL_IDENT_LAC_AND_CI: - dst->lai.lac = u->lac_and_ci.lac; - dst->cell_identity = u->lac_and_ci.ci; - return; - - case CELL_IDENT_CI: - dst->cell_identity = u->ci; - return; - - case CELL_IDENT_LAI_AND_LAC: - dst->lai = u->lai_and_lac; - return; - - case CELL_IDENT_LAC: - dst->lai.lac = u->lac; - return; - - case CELL_IDENT_NO_CELL: - case CELL_IDENT_BSS: - case CELL_IDENT_UTRAN_PLMN_LAC_RNC: - case CELL_IDENT_UTRAN_RNC: - case CELL_IDENT_UTRAN_LAC_RNC: - /* No values to set. */ - return; - } -} - /*! Return true if the common information between the two Cell Identifiers match. * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same. * Note that CELL_IDENT_NO_CELL will always return false. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95 Gerrit-Change-Number: 22925 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:52 +0000 Subject: Change in libosmocore[master]: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22926 ) Change subject: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id74f4577c397c1ba696f00395858311bd82cb2c8 Gerrit-Change-Number: 22926 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 18:19:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:19:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:19:55 +0000 Subject: Change in libosmocore[master]: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22926 ) Change subject: gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types ...................................................................... gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types CGI-PS type doesn't exist in GSM 08.08 Cell Id lists. That type of cell id is osmocom-specific and used internally. In here CGI-PS is automatically converted to CGI (since the later is an extension of this one). The encode/decode_cell_id_u are left intact (comment added) since those can still be used (and are used by RIM code) to encode/decode TS 48.018 Cell Identifiers. Related: SYS#4909 Change-Id: Id74f4577c397c1ba696f00395858311bd82cb2c8 --- M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 2 files changed, 63 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index e0f0c28..dda73ad 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -877,6 +877,7 @@ /* Does not have any list items */ break; case CELL_IDENT_WHOLE_GLOBAL_PS: + /* 3GPP TS 48.018 sec 11.3.9 "Cell Identifier" */ if (len < 8) return -EINVAL; decode_lai(buf, (struct osmo_location_area_id *)&out->global_ps.rai); /* rai contains lai + non-decoded rac */ @@ -925,6 +926,7 @@ /* Does not have any list items */ break; case CELL_IDENT_WHOLE_GLOBAL_PS: { + /* 3GPP TS 48.018 sec 11.3.9 "Cell Identifier" */ const struct osmo_cell_global_id_ps *id = &u->global_ps; struct gsm48_loc_area_id lai; gsm48_generate_lai2(&lai, &id->rai.lac); @@ -949,6 +951,7 @@ uint8_t *old_tail; uint8_t *tlv_len; unsigned int i; + uint8_t id_discr; OSMO_ASSERT(msg); OSMO_ASSERT(cil); @@ -957,11 +960,25 @@ tlv_len = msgb_put(msg, 1); old_tail = msg->tail; - msgb_put_u8(msg, cil->id_discr & 0x0f); + /* CGI-PS is an osmocom-specific type. In here we don't care about the + * PS part, only the CS one. */ + if (cil->id_discr == CELL_IDENT_WHOLE_GLOBAL_PS) + id_discr = CELL_IDENT_WHOLE_GLOBAL; + else + id_discr = cil->id_discr & 0x0f; + + msgb_put_u8(msg, id_discr); OSMO_ASSERT(cil->id_list_len <= GSM0808_CELL_ID_LIST2_MAXLEN); - for (i = 0; i < cil->id_list_len; i++) - gsm0808_msgb_put_cell_id_u(msg, cil->id_discr, &cil->id_list[i]); + for (i = 0; i < cil->id_list_len; i++) { + if (cil->id_discr == CELL_IDENT_WHOLE_GLOBAL_PS) { + union gsm0808_cell_id_u u; + cell_id_to_cgi(&u.global, cil->id_discr, &cil->id_list[i]); + gsm0808_msgb_put_cell_id_u(msg, CELL_IDENT_WHOLE_GLOBAL, &u); + } else { + gsm0808_msgb_put_cell_id_u(msg, cil->id_discr, &cil->id_list[i]); + } + } *tlv_len = (uint8_t) (msg->tail - old_tail); return *tlv_len + 2; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 7eb53c2..04b3b72 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1760,6 +1760,48 @@ msgb_free(msg); } +static void test_gsm0808_enc_dec_cell_id_global_ps() +{ + struct gsm0808_cell_id enc_cgi = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL, + .id.global = { + .lai = { + .plmn = { .mcc = 123, .mnc = 456 }, + .lac = 0x2342 + }, + .cell_identity = 0x423, + } + }; + struct gsm0808_cell_id enc_cgi_ps = { + .id_discr = CELL_IDENT_WHOLE_GLOBAL_PS, + .id.global_ps = { + .rai = { + .lac = { + .plmn = { .mcc = 123, .mnc = 456 }, + .lac = 0x2342 + }, + .rac = 0xcc, + }, + .cell_identity = 0x423, + } + }; + struct msgb *msg_cgi, *msg_cgi_ps; + uint8_t rc_enc; + + msg_cgi = msgb_alloc(1024, "output buffer (CGI)"); + rc_enc = gsm0808_enc_cell_id(msg_cgi, &enc_cgi); + OSMO_ASSERT(rc_enc > 0); + + msg_cgi_ps = msgb_alloc(1024, "output buffer (CGI-PS)"); + rc_enc = gsm0808_enc_cell_id(msg_cgi_ps, &enc_cgi_ps); + OSMO_ASSERT(rc_enc > 0); + + OSMO_ASSERT(msgb_eq(msg_cgi, msg_cgi_ps)); + + msgb_free(msg_cgi); + msgb_free(msg_cgi_ps); +} + static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg) { uint16_t s15_s0; @@ -2462,6 +2504,7 @@ test_gsm0808_enc_dec_cell_id_ci(); test_gsm0808_enc_dec_cell_id_lac_and_ci(); test_gsm0808_enc_dec_cell_id_global(); + test_gsm0808_enc_dec_cell_id_global_ps(); test_gsm0808_sc_cfg_from_gsm48_mr_cfg(); test_gsm48_mr_cfg_from_gsm0808_sc_cfg(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id74f4577c397c1ba696f00395858311bd82cb2c8 Gerrit-Change-Number: 22926 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:21:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:21:16 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from rem... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22916 ) Change subject: nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6972f46f0f3223ce00672178e5610bd3a012fb19 Gerrit-Change-Number: 22916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 15 Feb 2021 18:21:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 18:21:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 15 Feb 2021 18:21:19 +0000 Subject: Change in osmo-pcu[master]: nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from rem... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22916 ) Change subject: nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell ...................................................................... nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell Change-Id: I6972f46f0f3223ce00672178e5610bd3a012fb19 --- M src/nacc_fsm.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index 3afa8b5..df7cd7d 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -488,9 +488,12 @@ return; } + LOGPFSML(fi, LOGL_INFO, "Tx RIM RAN-INFO to request SI of %s\n", + osmo_cgi_ps_name(&ctx->cgi_ps)); rc = bssgp_tx_rim(&pdu, gprs_ns2_nse_nsei(ctx->ms->bts->nse)); if (rc < 0) { - LOGPFSML(fi, LOGL_ERROR, "Failed transmitting RIM PDU: %d\n", rc); + LOGPFSML(fi, LOGL_ERROR, "Failed transmitting RIM RAN-INFO %s PDU: %d\n", + osmo_cgi_ps_name(&ctx->cgi_ps), rc); nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6972f46f0f3223ce00672178e5610bd3a012fb19 Gerrit-Change-Number: 22916 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 21:09:47 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 15 Feb 2021 21:09:47 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 to look at the new patch set (#2). Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... l1sap: add logging and VTY introspection for ACCH repetition At the moment osmo-bts is not looging much ACCH repetition related information. This makes testing ACCH repetition difficult. Lets add some debug output that informs the user when ACCH repetition is turned on or off. Lets also add an ACCH repetition status display to the show lchan VTY command. Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Related: SYS#5114 --- M src/common/l1sap.c M src/common/vty.c 2 files changed, 90 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/22888/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 21:09:48 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 15 Feb 2021 21:09:48 +0000 Subject: Change in osmo-bts[master]: vty: dont put a colon after vty_out in cfg_out macro References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22927 ) Change subject: vty: dont put a colon after vty_out in cfg_out macro ...................................................................... vty: dont put a colon after vty_out in cfg_out macro The cfg_out macro is used like a function in the code below its definition. This means a colon will follow after it is used. When the vty_out call in the macro already has a colon the final result will be vty_out(...);;. This works fine as long the macro is not used in one line if/else if/else constructs without curly braces {}. The compiler will interpret the double colon as two lines of code and run into an error then. Lets fix this by removing the colon from the vty_cout in the macro. Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519 --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/27/22927/1 diff --git a/src/common/vty.c b/src/common/vty.c index f2c7954..d60a2be 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1240,7 +1240,7 @@ /* TODO: generalize and move indention handling to libosmocore */ #define cfg_out(vty, fmt, args...) \ - vty_out(vty, "%*s" fmt, indent, "", ##args); + vty_out(vty, "%*s" fmt, indent, "", ##args) static void dump_dpc_meas_params(struct vty *vty, const unsigned int indent, const struct gsm_power_ctrl_meas_params *mp, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519 Gerrit-Change-Number: 22927 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 21:09:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 15 Feb 2021 21:09:49 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22928 ) Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... l1sap: Store status of SRR in an lchan struct memeber The MS sets the SRR bit in the L1 SACCH header to request DL-SACCH repetition from the BTS. At the moment we access the l1_info stored in tle lchan struct each time we want to check the status of the SRR bit. However, it is more convinient to do this once at reception and store the status of the status of the flag in a separate struct member. Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Related: SYS#5114 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/28/22928/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 05b6cf2..305a518 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -406,6 +406,7 @@ struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; bool repeated_dl_facch_active; bool repeated_ul_sacch_active; + bool repeated_dl_sacch_active; /* Message buffer to store DL-SACCH repeation candidate */ struct msgb *rep_sacch; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index ed7b4e7..c0bed8b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1028,7 +1028,7 @@ * SACCH repetition. */ if (lchan->rep_sacch) { - if (((lchan->meas.l1_info[0] >> 1) & 1) == 0) { + if (lchan->repeated_dl_sacch_active == false) { /* Toss previous repetition candidate */ msgb_free(lchan->rep_sacch); lchan->rep_sacch = NULL; @@ -1137,9 +1137,14 @@ p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */ p[1] = lchan->rqd_ta; le = &lchan->lapdm_ch.lapdm_acch; - if (lchan->repeated_acch_capability.dl_sacch) + if (lchan->repeated_acch_capability.dl_sacch) { + /* Check if MS requests SACCH repetition and update state accordingly */ + if ((lchan->meas.l1_info[0] >> 1) & 1) + lchan->repeated_dl_sacch_active = true; + else + lchan->repeated_dl_sacch_active = false; pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le); - else + } else pp_msg = lapdm_phsap_dequeue_msg(le); } else { if (lchan->ts->trx->bts->dtxd) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 15 22:26:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 15 Feb 2021 22:26:04 +0000 Subject: Change in osmo-bts[master]: vty: dont put a colon after vty_out in cfg_out macro In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22927 ) Change subject: vty: dont put a colon after vty_out in cfg_out macro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519 Gerrit-Change-Number: 22927 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 15 Feb 2021 22:26:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 16 03:01:56 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 16 Feb 2021 03:01:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602b35c973361_6c892abbc860c5f81252919@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] [COMPILING apps/dfu/main.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 160s] Memory region Used Size Region Size %age Used [ 160s] rom: 16580 B 16 KB 101.20% [ 160s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 160s] collect2: error: ld returned 1 exit status [ 160s] % [ 160s] make[2]: *** [Makefile:234: flash] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 160s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: error: make -j1 returned exit code 2 [ 160s] make: *** [debian/rules:16: build] Error 25 [ 160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 160s] ### VM INTERACTION START ### [ 163s] [ 151.984253] sysrq: Power Off [ 163s] [ 151.992476] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb17 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 16 03:01:54 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 16 03:07:20 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 16 Feb 2021 03:07:20 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602b36f034079_6c892abbc860c5f81254038@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 174s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 174s] [COMPILING libboard/qmod/source/card_pres.c] [ 174s] [COMPILING libboard/qmod/source/wwan_led.c] [ 175s] [COMPILING libboard/qmod/source/i2c.c] [ 175s] [COMPILING libboard/qmod/source/board_qmod.c] [ 175s] [COMPILING apps/dfu/main.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 176s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 176s] Memory region Used Size Region Size %age Used [ 176s] rom: 16588 B 16 KB 101.25% [ 176s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 176s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 176s] collect2: error: ld returned 1 exit status [ 176s] % [ 176s] make[2]: *** [Makefile:234: flash] Error 1 [ 176s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 176s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 176s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 176s] dh_auto_build: error: make -j1 returned exit code 2 [ 176s] make: *** [debian/rules:16: build] Error 25 [ 176s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 176s] ### VM INTERACTION START ### [ 180s] [ 168.092391] sysrq: Power Off [ 180s] [ 168.138138] reboot: Power down [ 180s] ### VM INTERACTION END ### [ 180s] [ 180s] lamb24 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 16 03:07:10 UTC 2021. [ 180s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 16 09:36:49 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 09:36:49 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Feb 2021 09:36:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 10:36:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 10:36:16 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22928 ) Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... Patch Set 1: (1 comment) I'm not sure what's the gain with this patch. The only real difference that may exist is that now we start applying the dl-sacch repetition some time before (before dequeuing)? https://gerrit.osmocom.org/c/osmo-bts/+/22928/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/22928/1/src/common/l1sap.c at 1147 PS1, Line 1147: } else {} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 10:36:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 10:36:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Feb 2021 10:36:39 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/22922/1/scripts/osmocom-nightly-packages.sh File scripts/osmocom-nightly-packages.sh: https://gerrit.osmocom.org/c/osmo-ci/+/22922/1/scripts/osmocom-nightly-packages.sh at 84 PS1, Line 84: esac I just noticed... this case...esac needs to go into an else block, otherwise the epoch may be in there twice. pushing a fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Feb 2021 10:36:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 10:37:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 16 Feb 2021 10:37:55 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: Hello daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 to look at the new patch set (#2). Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... OBS: nightly: use epoch from debian/changelog If epoch is used in debian/changelog, prepend it to the version from git-version-gen. Also set the epoch in the spec file. For example, the version in debian/changelog may be 1:0.0.1. The epoch is 1, therefore a 0.0.1.18.b5d18 version from git-version-gen would turn into 1:0.0.1.18.b5d18. Setting epoch=1 is needed for osmo-gbproxy, so apt on debian 10 with the nightly Osmocom repository enabled does not try to install osmo-gbproxy 1.3.0 from the debian repositories instead of 0.0.1 from the Omsocom repository. Related: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version Related: OS#4992 Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 --- M scripts/common-obs.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/22922/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 13:28:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 13:28:12 +0000 Subject: Change in osmo-sgsn[master]: Fix nsei+bvci not updated on rx UL SNDCP data References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 ) Change subject: Fix nsei+bvci not updated on rx UL SNDCP data ...................................................................... Fix nsei+bvci not updated on rx UL SNDCP data msgid2mmctx() was already being called for signalling messages in gsm0408_gprs_rcvmsg_gb() before calling gprs_gb_recv_pdu(), but it was not called in sndcp_llunitdata_ind(). Let's move msgid2mmctx() inside gprs_gb_recv_pdu() since we want to always update the nsei+bvci, regardless of message containing data or control content. This commit fixes the scenario where an MS changes to a new cell (PCU) and then continues transmitting UL data. Prior to this patch, the SGSN kept sending DL content to the old cell (PCU nsei+bvci) instead of the new one even after the MS transmitted Ul content fro mthe new cell. Related: SYS#4909 Change-Id: I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 --- M include/osmocom/sgsn/gprs_gb.h M src/sgsn/gprs_gb.c M src/sgsn/gprs_sndcp.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/22929/1 diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h index c98dd34..9162367 100644 --- a/include/osmocom/sgsn/gprs_gb.h +++ b/include/osmocom/sgsn/gprs_gb.h @@ -8,7 +8,7 @@ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable); /* Has to be called whenever any PDU (signaling, data, ...) has been received */ -void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx); +void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg); /* page a MS in its routing area */ int gprs_gb_page_ps_ra(struct sgsn_mm_ctx *mmctx); diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_gb.c index 2585d6d..cddd1b1 100644 --- a/src/sgsn/gprs_gb.c +++ b/src/sgsn/gprs_gb.c @@ -38,7 +38,8 @@ #include /* Has to be called whenever any PDU (signaling, data, ...) has been received */ -void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx) { +void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { + msgid2mmctx(mmctx, msg); if (mmctx->gb.llme) osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL); } @@ -56,10 +57,9 @@ bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); if (mmctx) { - msgid2mmctx(mmctx, msg); rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); mmctx->gb.llme = llme; - gprs_gb_recv_pdu(mmctx); + gprs_gb_recv_pdu(mmctx, msg); } /* MMCTX can be NULL */ diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index b237bf9..6692f1a 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -808,7 +808,7 @@ lle, lle->llme->tlli, lle->sapi, sch->nsapi); return -EIO; } - gprs_gb_recv_pdu(mmctx); + gprs_gb_recv_pdu(mmctx, msg); if (scomph) { sne->defrag.pcomp = scomph->pcomp; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 Gerrit-Change-Number: 22929 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 13:53:44 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 13:53:44 +0000 Subject: Change in osmo-bts[master]: vty: dont put a colon after vty_out in cfg_out macro In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22927 ) Change subject: vty: dont put a colon after vty_out in cfg_out macro ...................................................................... vty: dont put a colon after vty_out in cfg_out macro The cfg_out macro is used like a function in the code below its definition. This means a colon will follow after it is used. When the vty_out call in the macro already has a colon the final result will be vty_out(...);;. This works fine as long the macro is not used in one line if/else if/else constructs without curly braces {}. The compiler will interpret the double colon as two lines of code and run into an error then. Lets fix this by removing the colon from the vty_cout in the macro. Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519 --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index f2c7954..d60a2be 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1240,7 +1240,7 @@ /* TODO: generalize and move indention handling to libosmocore */ #define cfg_out(vty, fmt, args...) \ - vty_out(vty, "%*s" fmt, indent, "", ##args); + vty_out(vty, "%*s" fmt, indent, "", ##args) static void dump_dpc_meas_params(struct vty *vty, const unsigned int indent, const struct gsm_power_ctrl_meas_params *mp, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c23c38ce892067add0f95f3e504a9c559e24519 Gerrit-Change-Number: 22927 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 13:56:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 16 Feb 2021 13:56:41 +0000 Subject: Change in osmo-sgsn[master]: Fix nsei+bvci not updated on rx UL SNDCP data In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 ) Change subject: Fix nsei+bvci not updated on rx UL SNDCP data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 Gerrit-Change-Number: 22929 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 16 Feb 2021 13:56:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:11:26 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 14:11:26 +0000 Subject: Change in osmo-bts[master]: GSMTAP: make remote host for Um logging configurable via VTY In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/10808 ) Change subject: GSMTAP: make remote host for Um logging configurable via VTY ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/10808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 14:11:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:16:07 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 14:16:07 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... Patch Set 2: (5 comments) (gerrit) https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 938 PS1, Line 938: DL1C > Pau was complaining about unreadable DL1C (https://osmocom.org/issues/5007), maybe DL1P? [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 938 PS1, Line 938: DL-FACCH repetition: repeating FACCH channel > How can you 'repeat FACCH channel'? You actually repeat a 'FACCH block', or more precisely 'retransm [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 943 PS1, Line 943: channel > Same here. Done https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1091 PS1, Line 1091: > ws, unrelated Done https://gerrit.osmocom.org/c/osmo-bts/+/22888/1/src/common/l1sap.c at 1468 PS1, Line 1468: LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, "UL-SACCH repetition: disabled by BSC\n"); > Same here. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 16 Feb 2021 14:16:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:16:19 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 14:16:19 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 to look at the new patch set (#2). Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... l1sap: Store status of SRR in an lchan struct memeber The MS sets the SRR bit in the L1 SACCH header to request DL-SACCH repetition from the BTS. At the moment we access the l1_info stored in tle lchan struct each time we want to check the status of the SRR bit. However, it is more convinient to do this once at reception and store the status of the status of the flag in a separate struct member. Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Related: SYS#5114 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/28/22928/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:20:25 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 14:20:25 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Feb 2021 14:20:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:49:21 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 14:49:21 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 11: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/11/include/osmocom/gprs/frame_relay.h File include/osmocom/gprs/frame_relay.h: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/include/osmocom/gprs/frame_relay.h at 45 PS11, Line 45: #define FRAME_RELAY_SDU FRAME_RELAY_MTU - 2 > Ack Done https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at a468 PS11, Line 468: > non related Done https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at 501 PS11, Line 501: nsp.u.status.mtu = nse->mtu - 4; /* 1b NS PDU type, 1b NS SDU control, 2b BVCI */ > Ack, we should have a ns_unitdata_hdr struct. I agree.But can this in a different commit? https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2_udp.c at a116 PS11, Line 116: > Ack Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 14:49:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:49:26 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 14:49:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 14:49:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 14:51:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 14:51:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22900/3/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22900/3/src/gb/gprs_ns2_vty.c at 1042 PS3, Line 1042: "Data weight of the NSVC\n" > Ack Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 14:51:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:10:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#12). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP layer needs to know the MTU of the NS UNIDATA payload. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contains the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/frame_relay.h M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 9 files changed, 123 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/12 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:10:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22872 to look at the new patch set (#8). Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. This is a behaviour change of the API and must be synchronized with the osmo-pcu. Otherwise SNS won't work with osmo-pcu. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 5 files changed, 460 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:10:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22900 to look at the new patch set (#4). Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` A static configured UDP NSVC can have signalling and data weights. Related: SYS#5354 Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f --- M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22900/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:10:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22904 to look at the new patch set (#4). Change subject: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership ...................................................................... gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership Have a clear ownership of the msgb to prevent any leaks. Related: OS#5022 Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c --- M src/gb/gprs_ns2.c 1 file changed, 25 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/22904/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:10:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22903 to look at the new patch set (#4). Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... gprs_ns2_sns: rename fsm events to include RX or REQ prefix An event which originates by a received PDU is prefixed by RX. An event which originates by code gets a REQ prefix. Fixes: OS#5014 Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b --- M src/gb/gprs_ns2_sns.c 1 file changed, 67 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/22903/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:10:36 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:10:36 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22903/3/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22903/3/src/gb/gprs_ns2_sns.c at 89 PS3, Line 89: { GPRS_SNS_EV_REQ_SELECT_ENDPOINT, "SELECT_ENDPOINT" }, > Ack Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 15:10:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:22:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:22:28 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 12: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/11/src/gb/gprs_ns2.c at 501 PS11, Line 501: nsp.u.status.mtu = nse->mtu - 4; /* 1b NS PDU type, 1b NS SDU control, 2b BVCI */ > I agree. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:22:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:30:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:30:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22343 to look at the new patch set (#13). Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP layer needs to know the MTU of the NS UNIDATA payload. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contains the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/frame_relay.h M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 9 files changed, 130 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/22343/13 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:30:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:30:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22909 to look at the new patch set (#3). Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... gprs_ns2_fr: pass MTU changes to the NSE When the MTU of the frame relay device changes, update the bind and notify all NSEs. Related: OS#4889 Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c --- M src/gb/gprs_ns2_fr.c 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/22909/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:30:15 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:30:15 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22930 ) Change subject: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS ...................................................................... gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS Change-Id: I7c9245be248cb8697a370f80021612c14efa5cbb --- M src/gb/gprs_ns2.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/22930/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 403a09f..4d61d21 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -217,6 +217,7 @@ { GPRS_NS2_AFF_CAUSE_RECOVERY, "NSE recovery" }, { GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED, "NSE SNS configured" }, { GPRS_NS2_AFF_CAUSE_SNS_FAILURE, "NSE SNS failure" }, + { GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS, "NSE SNS no endpoints"}, { GPRS_NS2_AFF_CAUSE_MTU_CHANGE, "NSE MTU changed" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c9245be248cb8697a370f80021612c14efa5cbb Gerrit-Change-Number: 22930 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:32:27 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:32:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22909/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22909/1//COMMIT_MSG at 9 PS1, Line 9: W > In practice, I wouldn't really expect the MTU to change at runtime at all. [?] I've add code to notify the NS user in the first commit (https://gerrit.osmocom.org/c/libosmocore/+/22343/) https://gerrit.osmocom.org/c/libosmocore/+/22909/1//COMMIT_MSG at 12 PS1, Line 12: T > I would suggest to extend the STATUS primitive from NS to BSSGP see https://gerrit.osmocom.org/c/libosmocore/+/22343/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 15:32:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:34:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:34:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 9: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c at 100 PS8, Line 100: { GPRS_SNS_EV_REQ_ADD_BIND, "ADD_BIND"}, wrong indentation? https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c at 125 PS8, Line 125: struct ns2_sns_bind *current_bind; I wonder, if there's only 1 current bind, why do we need a list entry and not simply a pointer to the object? Or can there be several "current" ones? The naming is then a bit confusing Should it then be called "current_binds" then. https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c at 790 PS8, Line 790: bind = sbind->bind; bind bind bind -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:34:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:35:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:35:16 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22930 ) Change subject: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c9245be248cb8697a370f80021612c14efa5cbb Gerrit-Change-Number: 22930 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 16 Feb 2021 15:35:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:35:47 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:35:47 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the b... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22914 to look at the new patch set (#2). Change subject: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration ...................................................................... gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration The gprs_ns2 now requires to specify every bind which should be used by the NSE for IP-SNS Related: SYS#5354 Depends: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac --- M src/gprs_bssgp_pcu.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/22914/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac Gerrit-Change-Number: 22914 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:35:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:35:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 13: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:35:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:36:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:36:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 15:36:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:36:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:36:55 +0000 Subject: Change in libosmocore[master]: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:36:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:38:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:38:34 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the b... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22914 ) Change subject: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac Gerrit-Change-Number: 22914 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:38:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:43:18 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 15:43:18 +0000 Subject: Change in osmo-gbproxy[master]: Add SDU length for an NSE (== BSSGP PDU size) In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 to look at the new patch set (#4). Change subject: Add SDU length for an NSE (== BSSGP PDU size) ...................................................................... Add SDU length for an NSE (== BSSGP PDU size) Prepare tracking the SDU from NS. Initialize with a conservative default. The value is not yet updated, that will happen in a later patch. Related: OS#4889 Depends: I5016b295db6185ec131d83089cf6c806e34ef1b6 (libosmocore.git) Depends: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 (libosmocore.git) Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c M src/gb_proxy_vty.c 4 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/77/22877/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 15:43:29 +0000 Subject: Change in osmo-gbproxy[master]: Add SDU length for an NSE (== BSSGP PDU size) In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add SDU length for an NSE (== BSSGP PDU size) ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h at 24 PS3, Line 24: MTU > ACK to pespin's comment, and now it's a SDU, not an MTU, comment (and commit log) were not updated. Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h at 25 PS3, Line 25: #define DEFAULT_NSE_SDU (1600 - 4) > I think lynxis is adding a similar define in libosmocore Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:43:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:57:42 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:57:42 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 to look at the new patch set (#2). Change subject: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse ...................................................................... gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse Add support for multiple SNS endpoints. Move the NSE allocation to the top in preparation of IP-SNS binds. The future gprs_ns2 library will require to manual add every bind to the NSE for IP-SNS. Rename the function to match more it's purpose. Related: SYS#5354 Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb --- M src/gprs_bssgp_pcu.c 1 file changed, 40 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/13/22913/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:57:43 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 15:57:43 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22931 ) Change subject: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config ...................................................................... gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config Improve the naming of the function to match it's purpose. Related: SYS#5354 Change-Id: Ib8e4ae734503fd6f6695d9d6767d809e1bf79d22 --- M src/gprs_bssgp_pcu.c M src/gprs_bssgp_pcu.h M src/pcu_l1_if.cpp M tests/emu/pcu_emu.cpp 4 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/22931/1 diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 7d793be..ce36c6b 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -1097,10 +1097,11 @@ return 0; } -int gprs_ns_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, - const struct osmo_sockaddr *local, - const struct osmo_sockaddr *remote, - uint16_t *nsvci, uint16_t valid) +/* update the ns configuration if needed */ +int gprs_ns_update_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + uint16_t *nsvci, uint16_t valid) { int rc = 0; if (!bts->nse) { diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index 4b0e0aa..db77cbb 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -90,7 +90,7 @@ uint16_t mcc, uint16_t mnc, bool mnc_3_digits, uint16_t lac, uint16_t rac, uint16_t cell_id); -int gprs_ns_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, +int gprs_ns_update_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, const struct osmo_sockaddr *local, const struct osmo_sockaddr *remote, uint16_t *nsvci, uint16_t valid); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 9873469..b6d6786 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -583,7 +583,7 @@ return -EINVAL; } - return gprs_ns_config(bts, info_ind->nsei, local, remote, nsvci, valid); + return gprs_ns_update_config(bts, info_ind->nsei, local, remote, nsvci, valid); } static int pcu_rx_info_ind(struct gprs_rlcmac_bts *bts, const struct gsm_pcu_if_info_ind *info_ind) diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index ef573a7..082f8ea 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -108,7 +108,7 @@ remote.u.sin.sin_port = htons(sgsn_port); pcu = gprs_bssgp_init(bts, 20, 20, 901, 99, false, 1, 0, 0); - gprs_ns_config(bts, nsei, &local, &remote, &nsvci, 1); + gprs_ns_update_config(bts, nsei, &local, &remote, &nsvci, 1); pcu->on_unblock_ack = bvci_unblocked; pcu->on_dl_unit_data = bssgp_data; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8e4ae734503fd6f6695d9d6767d809e1bf79d22 Gerrit-Change-Number: 22931 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:59:18 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 15:59:18 +0000 Subject: Change in osmo-gbproxy[master]: Add SDU length for an NSE (== BSSGP PDU size) In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add SDU length for an NSE (== BSSGP PDU size) ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h File include/osmocom/sgsn/gb_proxy.h: https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877/3/include/osmocom/sgsn/gb_proxy.h at 24 PS3, Line 24: MTU > Done On second thought I don't really like the whole MTU -> SDU renaming.. MTU is relative to the current layer the *Maximum* transfer unit so the name MTU makes sense. PDU/SDU has the issue that the don't actually refer to the maximum size so to be correct we would need something like max_sdu max_pdu. On the other hand I have almost had enough bike-shedding over this issue. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 15:59:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 15:59:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 15:59:42 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22931 ) Change subject: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8e4ae734503fd6f6695d9d6767d809e1bf79d22 Gerrit-Change-Number: 22931 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 16 Feb 2021 15:59:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:02:06 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:02:06 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 13: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2.c at 469 PS13, Line 469: Unrelated ws change https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2_udp.c at 116 PS13, Line 116: Unrelated ws change -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:02:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:03:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 16:03:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Inroduce tests for several cell change related scenarios In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 ) Change subject: sgsn: Inroduce tests for several cell change related scenarios ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 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: I2158685bf817d4bf064bb4d2ef5aa96ca252fe21 Gerrit-Change-Number: 22885 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 16:03:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:09:59 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:09:59 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 13: Code-Review+2 (2 comments) 1+1=2 https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2.c at 469 PS13, Line 469: > Unrelated ws change I don't think so. There is nothing changed here. I corrected a empty line change earlier here. https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/13/src/gb/gprs_ns2_udp.c at 116 PS13, Line 116: > Unrelated ws change I don't think so. There is nothing changed here. I corrected a empty line change earlier here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:09:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:11:22 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:11:22 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... Patch Set 13: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c at 121 PS2, Line 121: int > I don't really have a preference either way. [?] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:11:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:11:25 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:11:25 +0000 Subject: Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE ...................................................................... gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE The BSSGP layer needs to know the MTU of the NS UNIDATA payload. The MTU can be 0 if the NSE doesn't contain any NSVC. Every status indication will contain the mtu value. The MTU in the status indication contains the maximum transfer unit of a BSSGP message. From NS side the maximum SDU. Related: OS#4889 Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 --- M include/osmocom/gprs/frame_relay.h M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 9 files changed, 130 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/include/osmocom/gprs/frame_relay.h b/include/osmocom/gprs/frame_relay.h index 1be37ee..e316707 100644 --- a/include/osmocom/gprs/frame_relay.h +++ b/include/osmocom/gprs/frame_relay.h @@ -39,6 +39,11 @@ FR_ROLE_NETWORK_EQUIPMENT, }; +/* 48.016 ? 6.1.4.2 default maximum information field size of 1600 octets */ +#define FRAME_RELAY_MTU 1600 +/* FR DLC header is 2 byte */ +#define FRAME_RELAY_SDU (FRAME_RELAY_MTU - 2) + extern const struct value_string osmo_fr_role_names[]; static inline const char *osmo_fr_role_str(enum osmo_fr_role role) { diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index 07e6c45..b406bb0 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -84,6 +84,7 @@ GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED, GPRS_NS2_AFF_CAUSE_SNS_FAILURE, GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS, + GPRS_NS2_AFF_CAUSE_MTU_CHANGE, }; extern const struct value_string gprs_ns2_aff_cause_prim_strs[]; @@ -135,6 +136,8 @@ /* Only true on the first time it's available. * Allow the BSSGP layer to reset persistent NSE */ bool first; + /* MTU of a NS SDU. It's the lowest MTU of all (alive & dead) NSVCs */ + uint16_t mtu; } status; } u; }; diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 99a7415..9302a16 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -217,6 +217,7 @@ { GPRS_NS2_AFF_CAUSE_RECOVERY, "NSE recovery" }, { GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED, "NSE SNS configured" }, { GPRS_NS2_AFF_CAUSE_SNS_FAILURE, "NSE SNS failure" }, + { GPRS_NS2_AFF_CAUSE_MTU_CHANGE, "NSE MTU changed" }, { 0, NULL } }; @@ -496,15 +497,20 @@ nsp.u.status.transfer = ns2_count_transfer_cap(nse, bvci); nsp.u.status.first = nse->first; nsp.u.status.persistent = nse->persistent; + if (nse->mtu < 4) + nsp.u.status.mtu = 0; + else + nsp.u.status.mtu = nse->mtu - 4; /* 1 Byte NS PDU type, 1 Byte NS SDU control, 2 Byte BVCI */ + if (nsvc) { nsp.u.status.nsvc = gprs_ns2_ll_str_buf(nsvc_str, sizeof(nsvc_str), nsvc); - LOGNSVC(nsvc, LOGL_NOTICE, "NS-STATUS.ind(bvci=%05u): cause=%s, transfer=%d, first=%d\n", + LOGNSVC(nsvc, LOGL_NOTICE, "NS-STATUS.ind(bvci=%05u): cause=%s, transfer=%d, first=%d, mtu=%d\n", nsp.bvci, gprs_ns2_aff_cause_prim_str(nsp.u.status.cause), - nsp.u.status.transfer, nsp.u.status.first); + nsp.u.status.transfer, nsp.u.status.first, nse->mtu); } else { - LOGNSE(nse, LOGL_NOTICE, "NS-STATUS.ind(bvci=%05u): cause=%s, transfer=%d, first=%d\n", + LOGNSE(nse, LOGL_NOTICE, "NS-STATUS.ind(bvci=%05u): cause=%s, transfer=%d, first=%d, mtu=%d\n", nsp.bvci, gprs_ns2_aff_cause_prim_str(nsp.u.status.cause), - nsp.u.status.transfer, nsp.u.status.first); + nsp.u.status.transfer, nsp.u.status.first, nse->mtu); } osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_STATUS, PRIM_OP_INDICATION, NULL); @@ -548,6 +554,7 @@ llist_add(&nsvc->list, &nse->nsvc); llist_add(&nsvc->blist, &bind->nsvc); + ns2_nse_update_mtu(nse); return nsvc; @@ -746,6 +753,7 @@ nse->nsei = nsei; nse->nsi = nsi; nse->first = true; + nse->mtu = 0; llist_add(&nse->list, &nsi->nse); INIT_LLIST_HEAD(&nse->nsvc); @@ -1334,6 +1342,31 @@ array[i] = bind; } +void ns2_nse_update_mtu(struct gprs_ns2_nse *nse) +{ + struct gprs_ns2_vc *nsvc; + int mtu = 0; + + if (llist_empty(&nse->nsvc)) { + nse->mtu = 0; + return; + } + + llist_for_each_entry(nsvc, &nse->nsvc, list) { + if (mtu == 0) + mtu = nsvc->bind->mtu; + else if (mtu > nsvc->bind->mtu) + mtu = nsvc->bind->mtu; + } + + if (nse->mtu == mtu) + return; + + nse->mtu = mtu; + if (nse->alive) + ns2_prim_status_ind(nsvc->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_MTU_CHANGE); +} + /*! calculate the transfer capabilities for a nse * \param nse the nse to count the transfer capability * \param bvci a bvci - unused diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 7e6db2a..445f00a 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -801,6 +801,7 @@ bind->send_vc = fr_vc_sendmsg; bind->free_vc = free_vc; bind->dump_vty = dump_vty; + bind->mtu = FRAME_RELAY_SDU; priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { rc = -ENOMEM; diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 177aeb2..62d87a4 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -572,6 +572,10 @@ bind->send_vc = frgre_vc_sendmsg; bind->free_vc = free_vc; bind->nsi = nsi; + /* TODO: allow to set the MTU via vty. It can not be automatic detected because it goes over an + * ethernet device and the MTU here must match the FR side of the FR-to-GRE gateway. + */ + bind->mtu = FRAME_RELAY_SDU; priv = bind->priv = talloc_zero(bind, struct priv_bind); if (!priv) { diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index d4764f6..7e235be 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -179,6 +179,9 @@ /*! sum of all the signalling weight of _alive_ NS-VCs */ uint32_t sum_sig_weight; + + /*! MTU of a NS PDU. This is the lowest MTU of all NSVCs */ + uint16_t mtu; }; /*! Structure representing a single NS-VC */ @@ -244,6 +247,9 @@ /*! transfer capability in mbit */ int transfer_capability; + /*! MTU of a NS PDU on this bind. */ + uint16_t mtu; + /*! which link-layer are we based on? */ enum gprs_ns2_ll ll; @@ -298,6 +304,7 @@ uint16_t bvci, enum gprs_ns2_affecting_cause cause); void ns2_nse_notify_alive(struct gprs_ns2_vc *nsvc, bool alive); +void ns2_nse_update_mtu(struct gprs_ns2_nse *nse); /* message */ int ns2_validate(struct gprs_ns2_vc *nsvc, diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 0f22458..36f6a97 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -368,6 +368,10 @@ dscp, rc, errno); } + /* IPv4: max fragmented payload can be (13 bit) * 8 byte => 65535. + * IPv6: max payload can be 65535 (RFC 2460). + * UDP header = 8 byte */ + bind->mtu = 65535 - 8; if (result) *result = bind; diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index 2027e63..6d71a8c 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -40,10 +40,13 @@ static struct log_info info = {}; static struct osmo_wqueue *unitdata = NULL; +static struct osmo_gprs_ns2_prim last_nse_recovery = {}; static int ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { + struct osmo_gprs_ns2_prim *nsp; OSMO_ASSERT(oph->sap == SAP_NS); + nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph); if (oph->msg) { if (oph->primitive == GPRS_NS2_PRIM_UNIT_DATA) { osmo_wqueue_enqueue(unitdata, oph->msg); @@ -51,6 +54,9 @@ msgb_free(oph->msg); } } + if (oph->primitive == GPRS_NS2_PRIM_STATUS && nsp->u.status.cause == GPRS_NS2_AFF_CAUSE_RECOVERY) { + last_nse_recovery = *nsp; + } return 0; } @@ -113,6 +119,7 @@ bind->transfer_capability = 42; bind->send_vc = vc_sendmsg; bind->priv = talloc_zero(bind, struct osmo_wqueue); + bind->mtu = 123; struct osmo_wqueue *queue = bind->priv; osmo_wqueue_init(queue, 100); @@ -154,6 +161,7 @@ bind->ll = GPRS_NS2_LL_UDP; bind->transfer_capability = 99; bind->send_vc = loopback_sendmsg; + bind->mtu = 123; return bind; } @@ -362,6 +370,59 @@ printf("--- Finish unitdata test\n"); } +void test_mtu(void *ctx) +{ + struct gprs_ns2_inst *nsi; + struct gprs_ns2_vc_bind *bind[2]; + struct gprs_ns2_vc_bind *loopbind; + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *nsvc[2]; + struct gprs_ns2_vc *loop[2]; + + struct msgb *msg, *other; + char idbuf[32]; + int i; + + printf("--- Testing mtu test\n"); + osmo_wqueue_clear(unitdata); + printf("---- Create NSE + Binds\n"); + nsi = gprs_ns2_instantiate(ctx, ns_prim_cb, NULL); + bind[0] = dummy_bind(nsi, "bblock1"); + bind[1] = dummy_bind(nsi, "bblock2"); + loopbind = loopback_bind(nsi, "loopback"); + nse = gprs_ns2_create_nse(nsi, 1004, GPRS_NS2_LL_UDP, GPRS_NS2_DIALECT_STATIC_RESETBLOCK); + OSMO_ASSERT(nse); + + for (i=0; i<2; i++) { + printf("---- Create NSVC[%d]\n", i); + snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei, i); + nsvc[i] = ns2_vc_alloc(bind[i], nse, false, GPRS_NS2_VC_MODE_BLOCKRESET, idbuf); + loop[i] = loopback_nsvc(loopbind, nsvc[i]); + OSMO_ASSERT(nsvc[i]); + ns2_vc_fsm_start(nsvc[i]); + OSMO_ASSERT(!ns2_vc_is_unblocked(nsvc[i])); + ns2_tx_reset(loop[i], NS_CAUSE_OM_INTERVENTION); + ns2_tx_unblock(loop[i]); + OSMO_ASSERT(ns2_vc_is_unblocked(nsvc[i])); + } + + /* both nsvcs are unblocked and alive */ + printf("---- Send a small UNITDATA to NSVC[0]\n"); + msg = generate_unitdata("test_unitdata"); + ns2_recv_vc(nsvc[0], msg); + other = msgb_dequeue(&unitdata->msg_queue); + OSMO_ASSERT(msg == other); + other = msgb_dequeue(&unitdata->msg_queue); + OSMO_ASSERT(NULL == other); + msgb_free(msg); + + printf("---- Check if got mtu reported\n"); + /* 1b NS PDU type, 1b NS SDU control, 2b BVCI */ + OSMO_ASSERT(last_nse_recovery.u.status.mtu == 123 - 4); + + gprs_ns2_free(nsi); + printf("--- Finish unitdata test\n"); +} int main(int argc, char **argv) { @@ -379,6 +440,7 @@ test_nse_transfer_cap(ctx); test_block_unblock_nsvc(ctx); test_unitdata(ctx); + test_mtu(ctx); printf("===== NS2 protocol test END\n\n"); talloc_free(ctx); diff --git a/tests/gb/gprs_ns2_test.ok b/tests/gb/gprs_ns2_test.ok index 7d12325..f40579f 100644 --- a/tests/gb/gprs_ns2_test.ok +++ b/tests/gb/gprs_ns2_test.ok @@ -20,5 +20,12 @@ ---- Try to receive over blocked NSVC[0] ---- Receive over NSVC[1] --- Finish unitdata test +--- Testing mtu test +---- Create NSE + Binds +---- Create NSVC[0] +---- Create NSVC[1] +---- Send a small UNITDATA to NSVC[0] +---- Check if got mtu reported +--- Finish unitdata test ===== NS2 protocol test END -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:16:55 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:16:55 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22872 to look at the new patch set (#10). Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. This is a behaviour change of the API and must be synchronized with the osmo-pcu. Otherwise SNS won't work with osmo-pcu. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 5 files changed, 460 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/10 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:16:55 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:16:55 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22903 to look at the new patch set (#6). Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... gprs_ns2_sns: rename fsm events to include RX or REQ prefix An event which originates by a received PDU is prefixed by RX. An event which originates by code gets a REQ prefix. Fixes: OS#5014 Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b --- M src/gb/gprs_ns2_sns.c 1 file changed, 67 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/22903/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:18:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 16:18:42 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:18:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:19:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 16:19:06 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 16:19:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:26:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 16:26:18 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22920 to look at the new patch set (#2). Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... logging: gsmtap: Fill PID field for each message It was recently discovered that PID field in gsmtap log messages was always set to 0. Before this patch, the field was never being set. The approach of this patch is to record the PID of process one, in order to avoid calling getpid() syscall on each log line to be sent. The counterpart of this optimization is that eventual fork() calls would still keep the old incorrect value, but I think nobody can safely assume that fork() is possible once all this kind of infrastructure has already been configured (fork() should only be done really at the start of the program before any osmocom foo is initialized, or to immediatelly call exec()). Related: OS#5027 Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 --- M src/logging_gsmtap.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/22920/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:27:49 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:27:49 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 10: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c File src/gb/gprs_ns2_sns.c: https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c at 100 PS8, Line 100: { GPRS_SNS_EV_REQ_ADD_BIND, "ADD_BIND"}, > wrong indentation? Done https://gerrit.osmocom.org/c/libosmocore/+/22872/8/src/gb/gprs_ns2_sns.c at 125 PS8, Line 125: struct ns2_sns_bind *current_bind; > I wonder, if there's only 1 current bind, why do we need a list entry and not simply a pointer to th [?] it's similiar to the *initial, but it's a bind instead of an endpoint. i'll renmae initial_bind -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:27:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:29:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 16:29:21 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 2: I pushed a new version with a simple getpid() implementation to get going for now. gettid() support and so on will be handled later when I have less urgent tasks at hand as part of ticket https://osmocom.org/issues/5027 I just created. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Feb 2021 16:29:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:29:48 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:29:48 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 10: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22872/10/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22872/10/src/gb/gprs_ns2_vty.c at 182 PS10, Line 182: talloc_free(vnse); Remove all vnse->binds or at least add a comment that talloc is expected to do this for us here. https://gerrit.osmocom.org/c/libosmocore/+/22872/10/src/gb/gprs_ns2_vty.c at 202 PS10, Line 202: vnse Shouldn't this be vnse_bind->list ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:29:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:31:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 16 Feb 2021 16:31:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Introduce tests for several cell change related scenarios In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 to look at the new patch set (#4). Change subject: sgsn: Introduce tests for several cell change related scenarios ...................................................................... sgsn: Introduce tests for several cell change related scenarios Test TC_cell_change_different_ci_data provides test case for fix in osmo-sgsn.git Change-Id I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 Related: SYS#4909 Change-Id: I2158685bf817d4bf064bb4d2ef5aa96ca252fe21 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 151 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/22885/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 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: I2158685bf817d4bf064bb4d2ef5aa96ca252fe21 Gerrit-Change-Number: 22885 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:35:06 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 16:35:06 +0000 Subject: Change in libosmocore[master]: gsm_08_59, gsm_44_004: add struct for l1 information References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_59, gsm_44_004: add struct for l1 information ...................................................................... gsm_08_59, gsm_44_004: add struct for l1 information Libosmocore currently does not offer any structs to encode and decode the l1 information on RSL level and the sacch l1 header on the air interface level. Both structs are identical but the endianess of the first octet is reversed. Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 --- M include/Makefile.am M include/osmocom/gsm/protocol/gsm_08_58.h A include/osmocom/gsm/protocol/gsm_44_004.h 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/22932/1 diff --git a/include/Makefile.am b/include/Makefile.am index 10f0221..8dae3d9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -144,6 +144,7 @@ osmocom/gsm/protocol/gsm_23_003.h \ osmocom/gsm/protocol/gsm_23_041.h \ osmocom/gsm/protocol/gsm_29_118.h \ + osmocom/gsm/protocol/gsm_44_004.h \ osmocom/gsm/protocol/gsm_44_318.h \ osmocom/gsm/protocol/gsm_48_049.h \ osmocom/gsm/protocol/gsm_48_071.h \ diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index e9c14e6..6f974ce 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -945,4 +945,20 @@ struct ipac_preproc_ho_ctl_param ho_ctl_param; }; +struct rsl_l1_info { +#if OSMO_IS_BIG_ENDIAN + uint8_t ms_pwr:5, + fpc_epc:1, + srr_sro:1, + reserved:1; + uint8_t ta; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t reserved:1, + srr_sro:1, + fpc_epc:1, + ms_pwr:5; + uint8_t ta; +#endif +} __attribute__ ((packed)); + /*! @} */ diff --git a/include/osmocom/gsm/protocol/gsm_44_004.h b/include/osmocom/gsm/protocol/gsm_44_004.h new file mode 100644 index 0000000..635d924 --- /dev/null +++ b/include/osmocom/gsm/protocol/gsm_44_004.h @@ -0,0 +1,19 @@ +#pragma once + +/* TS 44.004 Section 7.1 */ + +struct gsm_sacch_l1_hdr { +#if OSMO_IS_BIG_ENDIAN + uint8_t reserved:1, + srr_sro:1, + fpc_epc:1, + ms_pwr:5; + uint8_t ta; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t ms_pwr:5, + fpc_epc:1, + srr_sro:1, + reserved:1; + uint8_t ta; +#endif +} __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:37:10 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:37:10 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22901 to look at the new patch set (#7). Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... gprs_ns2: implement a simple load sharing for UDP Implement the load sharing based on modulo of the LSP. As long the gprs_ns2 doesn't support the resource distribution function (48.016 ? 4.4a) this simple approach is good enought. Fixes: OS#4836 Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 --- M src/gb/gprs_ns2.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 3 files changed, 128 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/22901/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:37:11 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:37:11 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix typo in function name ns2_load_sharing_modulo References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22933 ) Change subject: gprs_ns2: fix typo in function name ns2_load_sharing_modulo ...................................................................... gprs_ns2: fix typo in function name ns2_load_sharing_modulo It's a modulo operation, not modulo*r*. Change-Id: I0345f2bcac9c57cf7efe8ff27fda4d049e04d5cc --- M src/gb/gprs_ns2.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/22933/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index c47fa6f..1762e25 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -360,7 +360,7 @@ } /* 4.4.1 Load Sharing function for the Frame Relay Sub-Network */ -static struct gprs_ns2_vc *ns2_load_sharing_modulor( +static struct gprs_ns2_vc *ns2_load_sharing_modulo( struct gprs_ns2_nse *nse, uint16_t bvci, uint32_t load_selector) @@ -437,7 +437,7 @@ switch (nse->ll) { case GPRS_NS2_LL_FR: - nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector); + nsvc = ns2_load_sharing_modulo(nse, bvci, link_selector); break; case GPRS_NS2_LL_UDP: default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0345f2bcac9c57cf7efe8ff27fda4d049e04d5cc Gerrit-Change-Number: 22933 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:37:12 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:37:12 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22901/3/src/gb/gprs_ns2.c File src/gb/gprs_ns2.c: https://gerrit.osmocom.org/c/libosmocore/+/22901/3/src/gb/gprs_ns2.c at 387 PS3, Line 387: static struct gprs_ns2_vc *ns2_load_sharing_weight_modulor( > modulor???? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:37:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:38:40 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:38:40 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 6: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22900/6/tests/gb/gprs_ns2_vty.vty File tests/gb/gprs_ns2_vty.vty: https://gerrit.osmocom.org/c/libosmocore/+/22900/6/tests/gb/gprs_ns2_vty.vty at 50 PS6, Line 50: signalling-weigh signalling-weight -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:38:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:45:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 16:45:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Introduce tests for several cell change related scenarios In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 ) Change subject: sgsn: Introduce tests for several cell change related scenarios ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 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: I2158685bf817d4bf064bb4d2ef5aa96ca252fe21 Gerrit-Change-Number: 22885 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 16:45:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:45:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 16:45:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Introduce tests for several cell change related scenarios In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 ) Change subject: sgsn: Introduce tests for several cell change related scenarios ...................................................................... sgsn: Introduce tests for several cell change related scenarios Test TC_cell_change_different_ci_data provides test case for fix in osmo-sgsn.git Change-Id I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 Related: SYS#4909 Change-Id: I2158685bf817d4bf064bb4d2ef5aa96ca252fe21 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 151 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 4e35144..c6e22cc 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -371,7 +371,7 @@ } } }; - g_gb[2].cfg := { + g_gb[2].cfg := { /* [2] configured to have same RAC as [1] */ nsei := 98, sgsn_role := false, bvc := { @@ -381,7 +381,7 @@ ra_id := { lai := { mcc_mnc := mcc_mnc, - lac := 13300 + lac := 13200 }, rac := 0 }, @@ -844,11 +844,19 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); } -friend function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, integer ran_index := 0) runs on BSSGP_ConnHdlr { - var RoutingAreaIdentificationV old_ra := f_random_RAI(); - var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); +friend function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, integer ran_index := 0, + template (omit) RoutingAreaIdentificationV old_ra := omit) runs on BSSGP_ConnHdlr { + var RoutingAreaIdentificationV old_ra_val; + var template PDU_L3_MS_SGSN attach_req; var PDU_L3_SGSN_MS l3_mt; + if (istemplatekind(old_ra, "omit")) { + old_ra_val := f_random_RAI(); + } else { + old_ra_val := valueof(old_ra); + } + + attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra_val, false, false, omit, omit); /* indicate R99 capability of the MS to enable UMTS AKA in presence of * 3G auth vectors */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.revisionLevelIndicatior := '1'B; @@ -1612,12 +1620,12 @@ } /* Transceive given 'payload' as MO message from Gb -> OsmoSGSN -> GTP */ -private function f_gtpu_xceive_mo(inout PdpActPars apars, octetstring payload, integer ran_index := 0) +private function f_gtpu_xceive_mo(inout PdpActPars apars, octetstring payload, integer ran_index := 0, uint9_t n_u := 0) runs on BSSGP_ConnHdlr { /* Send PDU via SNDCP/LLC/BSSGP/NS via simulated MS/PCU to the SGSN */ var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); - BSSGP[ran_index].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 0)); + BSSGP[ran_index].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, n_u)); /* Expect PDU via GTP from SGSN on simulated GGSN */ alt { [] GTP.receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)); @@ -3230,6 +3238,137 @@ f_cleanup(); } +/* Test if the SGSN routes traffic to new cell after the MS attached to it */ +private function f_TC_cell_change_different_rai_ci_attach(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + + /* first perform regular attach */ + f_gmm_attach(false, false, ran_index := 0); + /* then activate PDP context */ + f_pdp_ctx_act(apars, ran_index := 0); + /* then transceive a downlink PDU */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 0); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 0); + + /* Now attach on different cell: */ + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[0]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]); + g_pars.net.expect_auth := false; + f_gmm_attach(false, false, ran_index := 1, old_ra := f_cellid_to_RAI(g_pars.bssgp_cell_id[0])); + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 1); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 1, n_u := 1); +} +testcase TC_cell_change_different_rai_ci_attach() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_cell_change_different_rai_ci_attach), testcasename(), g_gb, 68); + vc_conn.done; + f_cleanup(); +} + +/* Test if the SGSN routes traffic to new cell after the MS attached to it */ +/* Assumption: g_gb[1] and g_gb[2] configured with same RAC */ +private function f_TC_cell_change_different_ci_attach(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[0]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]); + + /* first perform regular attach */ + f_gmm_attach(false, false, ran_index := 1); + /* then activate PDP context */ + f_pdp_ctx_act(apars, ran_index := 1); + /* then transceive a downlink PDU */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 1); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 1); + + /* Now attach on different cell: */ + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[1]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[2]); + g_pars.net.expect_auth := false; + f_gmm_attach(false, false, ran_index := 2, old_ra := f_cellid_to_RAI(g_pars.bssgp_cell_id[1])); + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 2); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 2, n_u := 1); +} +testcase TC_cell_change_different_ci_attach() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_cell_change_different_ci_attach), testcasename(), g_gb, 69); + vc_conn.done; + f_cleanup(); +} + +/* Test if the SGSN silently drops MO data message coming from new BVCI if RAC changed (eg. cell change) */ +private function f_TC_cell_change_different_rai_ci_data(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + + /* first perform regular attach */ + f_gmm_attach(false, false, ran_index := 0); + /* then activate PDP context */ + f_pdp_ctx_act(apars, ran_index := 0); + /* then transceive a downlink PDU */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 0); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 0); + + /* Send some data over new bvci, it should be silently discarded since + * RAC changed and SGSN expects a RAU to occur in that case */ + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]); + var octetstring payload := f_rnd_octstring(200); + var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); + BSSGP[1].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 1)); + var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); + timer T := 2.0; + T.start; + alt { + [] GTP.receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)) { + setverdict(fail, "Unexpected GTP message"); + } + [] T.timeout { setverdict(pass); } + } + + /* Expect SGSN to continue routing DL data to last known NSEI+BVCI */ + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[1]); + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 0); +} +testcase TC_cell_change_different_rai_ci_data() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_cell_change_different_rai_ci_data), testcasename(), g_gb, 70); + vc_conn.done; + f_cleanup(); +} + +/* Test if the SGSN routes traffic to new cell after the MS switched cell without re-attaching */ +/* Assumption: g_gb[1] and g_gb[2] configured with same RAC */ +private function f_TC_cell_change_different_ci_data(charstring id) runs on BSSGP_ConnHdlr { + var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); + + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[0]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]); + + /* first perform regular attach */ + f_gmm_attach(false, false, ran_index := 1); + /* then activate PDP context */ + f_pdp_ctx_act(apars, ran_index := 1); + /* then transceive a downlink PDU */ + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 1); + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 1); + + /* Now attach on different cell: */ + f_bssgp_client_unregister(g_pars.imsi, BSSGP_PROC[1]); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[2]); + + f_gtpu_xceive_mo(apars, f_rnd_octstring(200), ran_index := 2, n_u := 1); + f_gtpu_xceive_mt(apars, f_rnd_octstring(100), ran_index := 2); +} +testcase TC_cell_change_different_ci_data() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_cell_change_different_ci_data), testcasename(), g_gb, 71); + vc_conn.done; + f_cleanup(); +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -3294,6 +3433,11 @@ execute( TC_bssgp_rim_single_report() ); + execute( TC_cell_change_different_rai_ci_attach() ); + execute( TC_cell_change_different_rai_ci_data() ); + execute( TC_cell_change_different_ci_attach() ); + execute( TC_cell_change_different_ci_data() ); + /* At the end, may crash osmo-sgsn, see OS#3957, OS#4245 */ execute( TC_attach_req_id_req_ra_update() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22885 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: I2158685bf817d4bf064bb4d2ef5aa96ca252fe21 Gerrit-Change-Number: 22885 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:46:43 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:46:43 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:47:20 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:47:20 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix typo in function name ns2_load_sharing_modulo In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22933 ) Change subject: gprs_ns2: fix typo in function name ns2_load_sharing_modulo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0345f2bcac9c57cf7efe8ff27fda4d049e04d5cc Gerrit-Change-Number: 22933 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:47:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:47:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 16:47:54 +0000 Subject: Change in osmo-sgsn[master]: Fix nsei+bvci not updated on rx UL SNDCP data In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 ) Change subject: Fix nsei+bvci not updated on rx UL SNDCP data ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 Gerrit-Change-Number: 22929 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 16 Feb 2021 16:47:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:47:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 16:47:57 +0000 Subject: Change in osmo-sgsn[master]: Fix nsei+bvci not updated on rx UL SNDCP data In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 ) Change subject: Fix nsei+bvci not updated on rx UL SNDCP data ...................................................................... Fix nsei+bvci not updated on rx UL SNDCP data msgid2mmctx() was already being called for signalling messages in gsm0408_gprs_rcvmsg_gb() before calling gprs_gb_recv_pdu(), but it was not called in sndcp_llunitdata_ind(). Let's move msgid2mmctx() inside gprs_gb_recv_pdu() since we want to always update the nsei+bvci, regardless of message containing data or control content. This commit fixes the scenario where an MS changes to a new cell (PCU) and then continues transmitting UL data. Prior to this patch, the SGSN kept sending DL content to the old cell (PCU nsei+bvci) instead of the new one even after the MS transmitted Ul content fro mthe new cell. Related: SYS#4909 Change-Id: I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 --- M include/osmocom/sgsn/gprs_gb.h M src/sgsn/gprs_gb.c M src/sgsn/gprs_sndcp.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_gb.h index c98dd34..9162367 100644 --- a/include/osmocom/sgsn/gprs_gb.h +++ b/include/osmocom/sgsn/gprs_gb.h @@ -8,7 +8,7 @@ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable); /* Has to be called whenever any PDU (signaling, data, ...) has been received */ -void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx); +void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg); /* page a MS in its routing area */ int gprs_gb_page_ps_ra(struct sgsn_mm_ctx *mmctx); diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_gb.c index 2585d6d..cddd1b1 100644 --- a/src/sgsn/gprs_gb.c +++ b/src/sgsn/gprs_gb.c @@ -38,7 +38,8 @@ #include /* Has to be called whenever any PDU (signaling, data, ...) has been received */ -void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx) { +void gprs_gb_recv_pdu(struct sgsn_mm_ctx *mmctx, const struct msgb *msg) { + msgid2mmctx(mmctx, msg); if (mmctx->gb.llme) osmo_fsm_inst_dispatch(mmctx->gb.mm_state_fsm, E_MM_PDU_RECEPTION, NULL); } @@ -56,10 +57,9 @@ bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); if (mmctx) { - msgid2mmctx(mmctx, msg); rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]); mmctx->gb.llme = llme; - gprs_gb_recv_pdu(mmctx); + gprs_gb_recv_pdu(mmctx, msg); } /* MMCTX can be NULL */ diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index b237bf9..6692f1a 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -808,7 +808,7 @@ lle, lle->llme->tlli, lle->sapi, sch->nsapi); return -EIO; } - gprs_gb_recv_pdu(mmctx); + gprs_gb_recv_pdu(mmctx, msg); if (scomph) { sne->defrag.pcomp = scomph->pcomp; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c14e1d65575f54212924f7c5f0a2f4c1b76ec81 Gerrit-Change-Number: 22929 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:48:02 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:48:02 +0000 Subject: Change in libosmocore[master]: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:48:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:49:26 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:49:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 16:49:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:49:50 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:49:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 10: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22872/10/src/gb/gprs_ns2_vty.c File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/22872/10/src/gb/gprs_ns2_vty.c at 182 PS10, Line 182: talloc_free(vnse); > Remove all vnse->binds or at least add a comment that talloc is expected to do this for us here. Done https://gerrit.osmocom.org/c/libosmocore/+/22872/10/src/gb/gprs_ns2_vty.c at 202 PS10, Line 202: vnse > Shouldn't this be vnse_bind->list ? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:49:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:49:51 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:49:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22872 to look at the new patch set (#11). Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. This is a behaviour change of the API and must be synchronized with the osmo-pcu. Otherwise SNS won't work with osmo-pcu. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map 5 files changed, 461 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/11 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:49:51 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 16:49:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22901 to look at the new patch set (#8). Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... gprs_ns2: implement a simple load sharing for UDP Implement the load sharing based on modulo of the LSP. As long the gprs_ns2 doesn't support the resource distribution function (48.016 ? 4.4a) this simple approach is good enought. Fixes: OS#4836 Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 --- M src/gb/gprs_ns2.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 3 files changed, 142 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/22901/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:53:40 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:53:40 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:53:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:56:26 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:56:26 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:56:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:58:13 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:58:13 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 16:58:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 16:58:37 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 16:58:37 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22930 ) Change subject: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c9245be248cb8697a370f80021612c14efa5cbb Gerrit-Change-Number: 22930 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 16:58:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:00:35 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 17:00:35 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22900 to look at the new patch set (#8). Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` A static configured UDP NSVC can have signalling and data weights. Related: SYS#5354 Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f --- M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22900/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:00:39 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 17:00:39 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22900/6/tests/gb/gprs_ns2_vty.vty File tests/gb/gprs_ns2_vty.vty: https://gerrit.osmocom.org/c/libosmocore/+/22900/6/tests/gb/gprs_ns2_vty.vty at 50 PS6, Line 50: signalling-weigh > signalling-weight Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:00:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:03:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 17:03:04 +0000 Subject: Change in osmo-gbproxy[master]: Add SDU length for an NSE (== BSSGP PDU size) In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add SDU length for an NSE (== BSSGP PDU size) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:03:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:13:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:13:21 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Feb 2021 17:13:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:14:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:14:10 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:14:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:14:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:14:42 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:14:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:15:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:15:10 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:15:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:15:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:15:40 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix typo in function name ns2_load_sharing_modulo In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22933 ) Change subject: gprs_ns2: fix typo in function name ns2_load_sharing_modulo ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0345f2bcac9c57cf7efe8ff27fda4d049e04d5cc Gerrit-Change-Number: 22933 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:15:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:15:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:15:56 +0000 Subject: Change in libosmocore[master]: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:15:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:18:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:18:11 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:18:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:18:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:18:44 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... Patch Set 7: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22909/7/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22909/7/src/gb/gprs_ns2_fr.c at 608 PS7, Line 608: bind->mtu, mtu); minor: no newline requested, that line is rather short... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 17:18:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:20:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:20:14 +0000 Subject: Change in osmo-gbproxy[master]: Add SDU length for an NSE (== BSSGP PDU size) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add SDU length for an NSE (== BSSGP PDU size) ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:20:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:23:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:23:47 +0000 Subject: Change in libosmocore[master]: gsm_08_59, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_59, gsm_44_004: add struct for l1 information ...................................................................... Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG at 1 PS1, Line 1: Parent: 52489850 (gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types) bit-order, not endian-ness. And is that really true, it difers on RSL and on the radoi interface? WTF? https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG at 7 PS1, Line 7: gsm_08_59 08_58 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 17:23:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:29:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:29:03 +0000 Subject: Change in libosmocore[master]: gsm_08_59, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_59, gsm_44_004: add struct for l1 information ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG at 1 PS1, Line 1: Parent: 52489850 (gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types) > bit-order, not endian-ness. [?] so it's neither the endianness, nor the bit-order that changes. It appears the field order is changed. And yes, it's indeed different between 08.58 (RSL) and 44.004 (Um) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 17:29:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:29:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:29:47 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Feb 2021 17:29:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:29:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:29:50 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fill PID field for each message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22920 ) Change subject: logging: gsmtap: Fill PID field for each message ...................................................................... logging: gsmtap: Fill PID field for each message It was recently discovered that PID field in gsmtap log messages was always set to 0. Before this patch, the field was never being set. The approach of this patch is to record the PID of process one, in order to avoid calling getpid() syscall on each log line to be sent. The counterpart of this optimization is that eventual fork() calls would still keep the old incorrect value, but I think nobody can safely assume that fork() is possible once all this kind of infrastructure has already been configured (fork() should only be done really at the start of the program before any osmocom foo is initialized, or to immediatelly call exec()). Related: OS#5027 Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 --- M src/logging_gsmtap.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index bd64271..8947c5d 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef HAVE_STRINGS_H #include @@ -53,6 +54,8 @@ #define GSMTAP_LOG_MAX_SIZE 4096 +static uint32_t logging_gsmtap_pid; + static void _gsmtap_raw_output(struct log_target *target, int subsys, unsigned int level, const char *file, int line, int cont, const char *format, @@ -82,6 +85,7 @@ /* Logging header */ golh = (struct gsmtap_osmocore_log_hdr *) msgb_put(msg, sizeof(*golh)); OSMO_STRLCPY_ARRAY(golh->proc_name, target->tgt_gsmtap.ident); + golh->pid = logging_gsmtap_pid; if (subsys_name) OSMO_STRLCPY_ARRAY(golh->subsys, subsys_name + 1); else @@ -152,6 +156,9 @@ target->type = LOG_TGT_TYPE_GSMTAP; target->raw_output = _gsmtap_raw_output; + if (!logging_gsmtap_pid) + logging_gsmtap_pid = (uint32_t)getpid(); + return target; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7db00d1810f0860166bffa0bda8566caa82e06a9 Gerrit-Change-Number: 22920 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:30:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:30:49 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22931 ) Change subject: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8e4ae734503fd6f6695d9d6767d809e1bf79d22 Gerrit-Change-Number: 22931 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:30:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:31:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:31:38 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22913 ) Change subject: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:31:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:32:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:32:08 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the b... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22914 ) Change subject: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac Gerrit-Change-Number: 22914 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:32:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:33:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:33:41 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22928 ) Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:33:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:35:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:35:12 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 16 Feb 2021 17:35:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:35:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:35:44 +0000 Subject: Change in osmo-bts[master]: GSMTAP: make remote host for Um logging configurable via VTY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/10808 ) Change subject: GSMTAP: make remote host for Um logging configurable via VTY ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/10808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 17:35:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:35:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:35:47 +0000 Subject: Change in osmo-bts[master]: GSMTAP: make remote host for Um logging configurable via VTY In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/10808 ) Change subject: GSMTAP: make remote host for Um logging configurable via VTY ...................................................................... GSMTAP: make remote host for Um logging configurable via VTY So far, the only way to configure GSMTAP Um logging is to use the cmdline argument '-i'. Let's deprecate it, and add a VTY command to allow setting the remote host from configuration file. The legacy '-i' option, if provided, overrides the configuration file option, and will also appear in 'write file'. Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Tweaked by: Vadim Yanitskiy --- M include/osmo-bts/bts.h M src/common/main.c M src/common/vty.c 3 files changed, 69 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 3adafcc..be0222d 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -346,6 +346,7 @@ /* GSMTAP Um logging (disabled by default) */ struct { struct gsmtap_inst *inst; + char *remote_host; uint32_t sapi_mask; uint8_t sapi_acch; } gsmtap; diff --git a/src/common/main.c b/src/common/main.c index 38f517c..2503352 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -77,7 +77,6 @@ " -T --timestamp Prefix every log line with a timestamp\n" " -V --version Print version information and exit\n" " -e --log-level Set a global log-level\n" - " -i --gsmtap-ip The destination IP used for GSMTAP.\n" "\nVTY reference generation:\n" " --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n" " --vty-ref-xml Generate the VTY reference XML output and exit.\n" @@ -186,6 +185,8 @@ break; case 'i': gsmtap_ip = optarg; + fprintf(stderr, "Command line argument '-i' is deprecated, use VTY " + "parameter 'gsmtap-remote-host %s' instead.\n", gsmtap_ip); break; case 't': fprintf(stderr, "Command line argument '-t' is deprecated and does nothing, " @@ -320,15 +321,6 @@ } } - if (gsmtap_ip) { - g_bts->gsmtap.inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); - if (g_bts->gsmtap.inst == NULL) { - fprintf(stderr, "Failed during gsmtap_init()\n"); - exit(1); - } - gsmtap_source_add_sink(g_bts->gsmtap.inst); - } - if (bts_init(g_bts) < 0) { fprintf(stderr, "unable to open bts\n"); exit(1); @@ -358,6 +350,32 @@ write_pid_file("osmo-bts"); + /* Accept a GSMTAP host from VTY config, but a commandline option overrides that. */ + if (gsmtap_ip != NULL) { + if (g_bts->gsmtap.remote_host != NULL) { + LOGP(DLGLOBAL, LOGL_NOTICE, + "Command line argument '-i %s' overrides " + "'gsmtap-remote-host %s' from the config file\n", + gsmtap_ip, g_bts->gsmtap.remote_host); + talloc_free(g_bts->gsmtap.remote_host); + } + g_bts->gsmtap.remote_host = talloc_strdup(g_bts, gsmtap_ip); + } + + /* TODO: move this to gsm_bts_alloc() */ + if (g_bts->gsmtap.remote_host != NULL) { + LOGP(DLGLOBAL, LOGL_NOTICE, + "Setting up GSMTAP Um forwarding to '%s:%u'\n", + g_bts->gsmtap.remote_host, GSMTAP_UDP_PORT); + g_bts->gsmtap.inst = gsmtap_source_init(g_bts->gsmtap.remote_host, + GSMTAP_UDP_PORT, 1); + if (g_bts->gsmtap.inst == NULL) { + fprintf(stderr, "Failed during gsmtap_source_init()\n"); + exit(1); + } + gsmtap_source_add_sink(g_bts->gsmtap.inst); + } + bts_controlif_setup(g_bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS); rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(), diff --git a/src/common/vty.c b/src/common/vty.c index d60a2be..bbd33f8 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -315,6 +315,10 @@ bts->agch_queue.thresh_level, bts->agch_queue.low_level, bts->agch_queue.high_level, VTY_NEWLINE); + if (bts->gsmtap.remote_host != NULL) + vty_out(vty, " gsmtap-remote-host %s%s", + bts->gsmtap.remote_host, + VTY_NEWLINE); for (i = 0; i < sizeof(uint32_t) * 8; i++) { if (bts->gsmtap.sapi_mask & ((uint32_t) 1 << i)) { sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i); @@ -1826,6 +1830,40 @@ "logical channel commands\n" \ "logical channel number\n" +DEFUN(cfg_bts_gsmtap_remote_host, + cfg_bts_gsmtap_remote_host_cmd, + "gsmtap-remote-host [HOSTNAME]", + "Enable GSMTAP Um logging (see also 'gsmtap-sapi')\n" + "Remote IP address or hostname ('localhost' if omitted)\n") +{ + struct gsm_bts *bts = vty->index; + + osmo_talloc_replace_string(bts, &bts->gsmtap.remote_host, + argc > 0 ? argv[0] : "localhost"); + + if (vty->type != VTY_FILE) + vty_out(vty, "%% This command requires restart%s", VTY_NEWLINE); + + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_no_gsmtap_remote_host, + cfg_bts_no_gsmtap_remote_host_cmd, + "no gsmtap-remote-host", + NO_STR "Disable GSMTAP Um logging\n") +{ + struct gsm_bts *bts = vty->index; + + if (bts->gsmtap.remote_host != NULL) + talloc_free(bts->gsmtap.remote_host); + bts->gsmtap.remote_host = NULL; + + if (vty->type != VTY_FILE) + vty_out(vty, "%% This command requires restart%s", VTY_NEWLINE); + + return CMD_SUCCESS; +} + DEFUN(cfg_bts_gsmtap_sapi_all, cfg_bts_gsmtap_sapi_all_cmd, "gsmtap-sapi (enable-all|disable-all)", "Enable/disable sending of UL/DL messages over GSMTAP\n" @@ -2237,6 +2275,8 @@ install_element(BTS_NODE, &cfg_bts_smscb_tgt_qlen_cmd); install_element(BTS_NODE, &cfg_bts_smscb_qhyst_cmd); + install_element(BTS_NODE, &cfg_bts_gsmtap_remote_host_cmd); + install_element(BTS_NODE, &cfg_bts_no_gsmtap_remote_host_cmd); install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_all_cmd); install_element(BTS_NODE, &cfg_bts_gsmtap_sapi_cmd); install_element(BTS_NODE, &cfg_bts_no_gsmtap_sapi_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/10808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17676a21c4e0c9cbc88f2c5c53a39c6c6c473ca1 Gerrit-Change-Number: 10808 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:36:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:36:32 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22883 ) Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 Gerrit-Change-Number: 22883 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 17:36:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 17:36:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 17:36:35 +0000 Subject: Change in docker-playground[master]: ttcn3-gbproxy-test: remove broken merge logs cmd In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22883 ) Change subject: ttcn3-gbproxy-test: remove broken merge logs cmd ...................................................................... ttcn3-gbproxy-test: remove broken merge logs cmd Remove commands that result in a docker error message, like in Ie6f8270230e1f0372b63d610b7868ea8719b18ad. Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 --- M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh 2 files changed, 0 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 863e8ef..4ef2ace 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -78,18 +78,6 @@ # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-gbproxy-test - -echo Starting container to merge logs -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/gbproxy-tester:/data \ - --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \ - --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-gbproxy-test - echo Stopping containers docker container kill ${BUILD_TAG}-gbproxy diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 9605608..b063c7f 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -45,17 +45,6 @@ $DOCKER_ARGS \ $REPO_USER/ttcn3-gbproxy-test $@ -echo Starting container to merge logs -docker run --rm \ - $(docker_network_params $SUBNET 103) \ - --ulimit core=-1 \ - -e "TTCN3_PCAP_PATH=/data" \ - -v $VOL_BASE_DIR/gbproxy-tester:/data \ - --name ${BUILD_TAG}-ttcn3-gbproxy-test-logmerge \ - --entrypoint /osmo-ttcn3-hacks/log_merge.sh GBProxy_Tests --rm \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-gbproxy-test - echo Stopping containers docker container kill ${BUILD_TAG}-gbproxy -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9dec8d27c0f09cd8ee75255c8dfa314c70387ee9 Gerrit-Change-Number: 22883 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 18:03:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 16 Feb 2021 18:03:58 +0000 Subject: Change in libosmocore[master]: gsm_08_59, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_59, gsm_44_004: add struct for l1 information ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG at 1 PS1, Line 1: Parent: 52489850 (gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types) > so it's neither the endianness, nor the bit-order that changes. [?] Huh, you forgot that amazing comment from src/common/l1sap.c? Some brilliant engineer decided that the ordering of fields on the Um interface is different from the order of fields in RSL. See 3GPP TS 44.004 (section 7.2) vs. 3GPP TS 48.058 (section 9.3.10). https://gerrit.osmocom.org/c/libosmocore/+/22932/1/include/osmocom/gsm/protocol/gsm_44_004.h File include/osmocom/gsm/protocol/gsm_44_004.h: https://gerrit.osmocom.org/c/libosmocore/+/22932/1/include/osmocom/gsm/protocol/gsm_44_004.h at 17 PS1, Line 17: ws? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 16 Feb 2021 18:03:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 18:38:42 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 18:38:42 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22900 to look at the new patch set (#9). Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` A static configured UDP NSVC can have signalling and data weights Related: SYS#5354 Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f --- M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22900/9 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:00:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:00:31 +0000 Subject: Change in titan.TestPorts.AF_PACKET[master]: FrameRelay_Emulation: Fix network side emulation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 ) Change subject: FrameRelay_Emulation: Fix network side emulation ...................................................................... FrameRelay_Emulation: Fix network side emulation On the network side, by definition all PVCs are always active. Only the user side detects the active PVCs from the network side. In order to make higher-layer code agnostic, we need to spoof the related status events up the stack. Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655 --- M src/FrameRelay_Emulation.ttcn 1 file changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/titan.TestPorts.AF_PACKET refs/changes/34/22934/1 diff --git a/src/FrameRelay_Emulation.ttcn b/src/FrameRelay_Emulation.ttcn index fbca3bd..bc581c6 100644 --- a/src/FrameRelay_Emulation.ttcn +++ b/src/FrameRelay_Emulation.ttcn @@ -80,7 +80,7 @@ }; -/* FR Emulation user/client component/dispatcher. Exists once per FR_CODEC_PT */ +/* FR Emulation user/client component/dispatcher. Exists once per DLC */ type component FR_Client_CT { /* message port towards the Frame Relay Emulation */ port FRemu_PT FR; @@ -198,6 +198,10 @@ q933em.service_affecting_condition := false; log("Detecting no more service affecting condition after N392 consecutive good cycles"); notify_all_clients(FRemu_Event:{link_status:=FR_LINK_STS_AVAILABLE}); + if (not q933em.cfg.ats_is_user) { + /* on the network side, all DLCs are active immediately */ + notify_all_clients_pvc_state(); + } } } @@ -349,7 +353,17 @@ runs on FR_Emulation_CT { for (var integer i:= 0; i < sizeof(ConnectionTable); i := i + 1) { if (ConnectionTable[i].vc_conn != null) { - CLIENT.send(evt) to ConnectionTable[i].vc_conn; + notify_client(ConnectionTable[i].vc_conn, evt); + } + } +} + +private function notify_all_clients_pvc_state() +runs on FR_Emulation_CT { + for (var integer i:= 0; i < sizeof(ConnectionTable); i := i + 1) { + if (ConnectionTable[i].vc_conn != null) { + notify_client(ConnectionTable[i].vc_conn, + FRemu_Event:{pvc_status:=ConnectionTable[i].q933_status}); } } } @@ -437,9 +451,22 @@ " when ", vc_conn, " tries to register for it"); mtc.stop; } - ConnectionTable[dlci].vc_conn := vc_conn; - /* optionally send async Q.933 STATUS? */ + /* on the network side, every DLC is immediately active */ + ConnectionTable[dlci] := { + vc_conn := vc_conn, + q933_status := { + dlci := dlci, + new := true, + delete := false, + active := true + } + }; PROC.reply(FRemu_register:{dlci}) to vc_conn; + if (not q933em.cfg.ats_is_user) { + notify_client(vc_conn, + FRemu_Event:{pvc_status:=ConnectionTable[dlci].q933_status}); + } + /* optionally send async Q.933 STATUS? */ } [] PROC.getcall(FRemu_unregister:{?}) -> param(dlci) sender vc_conn { -- To view, visit https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: titan.TestPorts.AF_PACKET Gerrit-Branch: master Gerrit-Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655 Gerrit-Change-Number: 22934 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:00:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:00:53 +0000 Subject: Change in titan.TestPorts.AF_PACKET[master]: FrameRelay_Emulation: Fix network side emulation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 ) Change subject: FrameRelay_Emulation: Fix network side emulation ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: titan.TestPorts.AF_PACKET Gerrit-Branch: master Gerrit-Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655 Gerrit-Change-Number: 22934 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 19:00:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:00:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:00:55 +0000 Subject: Change in titan.TestPorts.AF_PACKET[master]: FrameRelay_Emulation: Fix network side emulation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 ) Change subject: FrameRelay_Emulation: Fix network side emulation ...................................................................... FrameRelay_Emulation: Fix network side emulation On the network side, by definition all PVCs are always active. Only the user side detects the active PVCs from the network side. In order to make higher-layer code agnostic, we need to spoof the related status events up the stack. Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655 --- M src/FrameRelay_Emulation.ttcn 1 file changed, 31 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/src/FrameRelay_Emulation.ttcn b/src/FrameRelay_Emulation.ttcn index fbca3bd..bc581c6 100644 --- a/src/FrameRelay_Emulation.ttcn +++ b/src/FrameRelay_Emulation.ttcn @@ -80,7 +80,7 @@ }; -/* FR Emulation user/client component/dispatcher. Exists once per FR_CODEC_PT */ +/* FR Emulation user/client component/dispatcher. Exists once per DLC */ type component FR_Client_CT { /* message port towards the Frame Relay Emulation */ port FRemu_PT FR; @@ -198,6 +198,10 @@ q933em.service_affecting_condition := false; log("Detecting no more service affecting condition after N392 consecutive good cycles"); notify_all_clients(FRemu_Event:{link_status:=FR_LINK_STS_AVAILABLE}); + if (not q933em.cfg.ats_is_user) { + /* on the network side, all DLCs are active immediately */ + notify_all_clients_pvc_state(); + } } } @@ -349,7 +353,17 @@ runs on FR_Emulation_CT { for (var integer i:= 0; i < sizeof(ConnectionTable); i := i + 1) { if (ConnectionTable[i].vc_conn != null) { - CLIENT.send(evt) to ConnectionTable[i].vc_conn; + notify_client(ConnectionTable[i].vc_conn, evt); + } + } +} + +private function notify_all_clients_pvc_state() +runs on FR_Emulation_CT { + for (var integer i:= 0; i < sizeof(ConnectionTable); i := i + 1) { + if (ConnectionTable[i].vc_conn != null) { + notify_client(ConnectionTable[i].vc_conn, + FRemu_Event:{pvc_status:=ConnectionTable[i].q933_status}); } } } @@ -437,9 +451,22 @@ " when ", vc_conn, " tries to register for it"); mtc.stop; } - ConnectionTable[dlci].vc_conn := vc_conn; - /* optionally send async Q.933 STATUS? */ + /* on the network side, every DLC is immediately active */ + ConnectionTable[dlci] := { + vc_conn := vc_conn, + q933_status := { + dlci := dlci, + new := true, + delete := false, + active := true + } + }; PROC.reply(FRemu_register:{dlci}) to vc_conn; + if (not q933em.cfg.ats_is_user) { + notify_client(vc_conn, + FRemu_Event:{pvc_status:=ConnectionTable[dlci].q933_status}); + } + /* optionally send async Q.933 STATUS? */ } [] PROC.getcall(FRemu_unregister:{?}) -> param(dlci) sender vc_conn { -- To view, visit https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: titan.TestPorts.AF_PACKET Gerrit-Branch: master Gerrit-Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655 Gerrit-Change-Number: 22934 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:02:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:02:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Provider_FR: Fix typos in log lines References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22935 ) Change subject: NS_Provider_FR: Fix typos in log lines ...................................................................... NS_Provider_FR: Fix typos in log lines Change-Id: I5661ba61dc0de78bc480c49d4aba6436a8694706 --- M library/NS_Provider_FR.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/22935/1 diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn index 30aadef..eb2fb24 100644 --- a/library/NS_Provider_FR.ttcn +++ b/library/NS_Provider_FR.ttcn @@ -51,7 +51,7 @@ alt { [not link_available] FR.receive(FrameRelayFrame:?) -> value rx_fr { - log("Dropoing Rx Msg because FR link not yet available", rx_fr); + log("Dropping Rx Msg because FR link not yet available", rx_fr); /* this can happen if the remote side has not yet recognized the * link is dead; don' fail here */ } @@ -60,10 +60,10 @@ NSE.send(ns); } [not pvc_active] FR.receive(tr_FR(config.provider.fr.dlci)) -> value rx_fr { - log("Dropoing Rx Msg because FR DLC not yet available", rx_fr); + log("Dropping Rx Msg because FR DLC not yet available", rx_fr); } [] FR.receive(tr_FR(?)) -> value rx_fr { - log("Dropoing Rx Msg because DLCI unknown", rx_fr); + log("Dropping Rx Msg because DLCI unknown", rx_fr); setverdict(fail); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22935 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: I5661ba61dc0de78bc480c49d4aba6436a8694706 Gerrit-Change-Number: 22935 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:02:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:02:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update AF_PACKET dependency to 0.1-5-g89ebea6 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22936 ) Change subject: update AF_PACKET dependency to 0.1-5-g89ebea6 ...................................................................... update AF_PACKET dependency to 0.1-5-g89ebea6 This includes the fix of https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 which makes fr <-> fr-net pass again. Change-Id: Ifa551fc9df340c9a02176f6644fa8ec4884431ae --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/22936/1 diff --git a/deps/Makefile b/deps/Makefile index c9cc53d..9057463 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-4-g9c6d89b +titan.TestPorts.AF_PACKET_commit= 0.1-5-g89ebea6 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22936 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: Ifa551fc9df340c9a02176f6644fa8ec4884431ae Gerrit-Change-Number: 22936 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:03:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:03:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Provider_FR: Fix typos in log lines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22935 ) Change subject: NS_Provider_FR: Fix typos in log lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22935 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: I5661ba61dc0de78bc480c49d4aba6436a8694706 Gerrit-Change-Number: 22935 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 19:03:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:03:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:03:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update AF_PACKET dependency to 0.1-5-g89ebea6 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22936 ) Change subject: update AF_PACKET dependency to 0.1-5-g89ebea6 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22936 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: Ifa551fc9df340c9a02176f6644fa8ec4884431ae Gerrit-Change-Number: 22936 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 19:03:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:03:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:03:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Provider_FR: Fix typos in log lines In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22935 ) Change subject: NS_Provider_FR: Fix typos in log lines ...................................................................... NS_Provider_FR: Fix typos in log lines Change-Id: I5661ba61dc0de78bc480c49d4aba6436a8694706 --- M library/NS_Provider_FR.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn index 30aadef..eb2fb24 100644 --- a/library/NS_Provider_FR.ttcn +++ b/library/NS_Provider_FR.ttcn @@ -51,7 +51,7 @@ alt { [not link_available] FR.receive(FrameRelayFrame:?) -> value rx_fr { - log("Dropoing Rx Msg because FR link not yet available", rx_fr); + log("Dropping Rx Msg because FR link not yet available", rx_fr); /* this can happen if the remote side has not yet recognized the * link is dead; don' fail here */ } @@ -60,10 +60,10 @@ NSE.send(ns); } [not pvc_active] FR.receive(tr_FR(config.provider.fr.dlci)) -> value rx_fr { - log("Dropoing Rx Msg because FR DLC not yet available", rx_fr); + log("Dropping Rx Msg because FR DLC not yet available", rx_fr); } [] FR.receive(tr_FR(?)) -> value rx_fr { - log("Dropoing Rx Msg because DLCI unknown", rx_fr); + log("Dropping Rx Msg because DLCI unknown", rx_fr); setverdict(fail); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22935 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: I5661ba61dc0de78bc480c49d4aba6436a8694706 Gerrit-Change-Number: 22935 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:03:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:03:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update AF_PACKET dependency to 0.1-5-g89ebea6 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22936 ) Change subject: update AF_PACKET dependency to 0.1-5-g89ebea6 ...................................................................... update AF_PACKET dependency to 0.1-5-g89ebea6 This includes the fix of https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934 which makes fr <-> fr-net pass again. Change-Id: Ifa551fc9df340c9a02176f6644fa8ec4884431ae --- M deps/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index c9cc53d..9057463 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -112,7 +112,7 @@ titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45 titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3 -titan.TestPorts.AF_PACKET_commit= 0.1-4-g9c6d89b +titan.TestPorts.AF_PACKET_commit= 0.1-5-g89ebea6 titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0 titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994 titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22936 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: Ifa551fc9df340c9a02176f6644fa8ec4884431ae Gerrit-Change-Number: 22936 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:16:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 19:16:57 +0000 Subject: Change in libosmocore[master]: gsm_08_58, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22932 to look at the new patch set (#2). Change subject: gsm_08_58, gsm_44_004: add struct for l1 information ...................................................................... gsm_08_58, gsm_44_004: add struct for l1 information Libosmocore currently does not offer any structs to encode and decode the l1 information on RSL level and the sacch l1 header on the air interface level. Both structs are identical but the field order in the first octet is reversed. Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 --- M include/Makefile.am M include/osmocom/gsm/protocol/gsm_08_58.h A include/osmocom/gsm/protocol/gsm_44_004.h 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/22932/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:41:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:41:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 ) Change subject: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow ...................................................................... sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow This was introduced in I7d859fd710dba96eb9b46c428243281183e1be12 and caused Iu related TTCN3 tests to fail with: SGSN_Tests.ttcn:771 Dynamic test case error: Index overflow in a value of type @SGSN_Tests.BssgpCellIds: The index is 3, but the value has only 3 elements. Change-Id: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 --- M Common.cfg M gbproxy/GBProxy_Tests.ttcn M gbproxy/osmo-gbproxy.fr.cfg M sgsn/SGSN_Tests.ttcn 4 files changed, 26 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/22937/1 diff --git a/Common.cfg b/Common.cfg index b8c76e6..8233f23 100644 --- a/Common.cfg +++ b/Common.cfg @@ -15,5 +15,5 @@ ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP; [EXTERNAL_COMMANDS] -BeginTestCase := $TCPDUMP_START -EndTestCase := $TCPDUMP_STOP +#BeginTestCase := $TCPDUMP_START +#EndTestCase := $TCPDUMP_STOP diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index f1e5c79..15ecf91 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -3362,6 +3362,16 @@ /* TODO: test case for UL-STATUS(PAGING-by-IMSI) after sending an actual PAGIN-by-IMSI in DL first */ control { + for (var integer i:=0; i< 10000; i := i+1) { + var verdicttype v; + //v := execute( TC_bvc_reset_sig_from_sgsn() ); + v := execute( TC_paging_ps_ptp_lac() ); + if (v != pass) { + break; + } + } + +/* execute( TC_BVC_bringup() ); execute( TC_ul_unitdata() ); execute( TC_dl_unitdata() ); @@ -3382,11 +3392,9 @@ execute( TC_bvc_reset_ptp_from_sgsn() ); execute( TC_bvc_reset_sig_from_sgsn() ); if (mp_enable_bss_load_sharing) { - /* don't enable this by default, as we don't yet have any automatic test setup for FR with 4 NS-VC */ execute( TC_load_sharing_dl() ); } - /* PAGING-PS over PTP BVC */ execute( TC_paging_ps_ptp_bss() ); execute( TC_paging_ps_ptp_lac() ); execute( TC_paging_ps_ptp_lac_unknown() ); @@ -3399,7 +3407,6 @@ execute( TC_paging_ps_reject_ptp_bvci_imsi() ); execute( TC_dummy_paging_ps_ptp() ); - /* PAGING-PS over SIG BVC */ execute( TC_paging_ps_sig_bss() ); execute( TC_paging_ps_sig_lac() ); execute( TC_paging_ps_sig_lac_unknown() ); @@ -3412,7 +3419,6 @@ execute( TC_paging_ps_reject_sig_bvci_imsi() ); execute( TC_dummy_paging_ps_sig() ); - /* PAGING-CS over PTP BVC */ execute( TC_paging_cs_ptp_bss() ); execute( TC_paging_cs_ptp_lac() ); execute( TC_paging_cs_ptp_lac_unknown() ); @@ -3421,7 +3427,6 @@ execute( TC_paging_cs_ptp_bvci() ); execute( TC_paging_cs_ptp_bvci_unknown() ); - /* PAGING-CS over SIG BVC */ execute( TC_paging_cs_sig_bss() ); execute( TC_paging_cs_sig_lac() ); execute( TC_paging_cs_sig_lac_unknown() ); @@ -3430,7 +3435,6 @@ execute( TC_paging_cs_sig_bvci() ); execute( TC_paging_cs_sig_bvci_unknown() ); - /* RAN Information Management */ execute( TC_rim_info_req() ); execute( TC_rim_info() ); execute( TC_rim_info_ack() ); @@ -3444,15 +3448,14 @@ execute( TC_fc_ms() ); execute( TC_ms_reg_enq() ); - /* Uplink STATUS */ execute( TC_status_sig_ul_tlli() ); execute( TC_status_sig_ul_tmsi() ); execute( TC_status_ptp_ul_tlli() ); execute( TC_status_ptp_ul_tmsi() ); - /* Downlink STATUS */ execute( TC_status_sig_dl_bvci() ); execute( TC_status_ptp_dl_bvci() ); +*/ } diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index 9595475..ba59f60 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -3,7 +3,17 @@ !! ! log stderr + logging print category 1 + logging print level 1 + logging print file 1 last logging level lns debug + logging level lbssgp debug + logging level gprs debug +log gsmtap 127.0.0.1 + logging filter all 1 + logging level lns debug + logging level lbssgp debug + logging level gprs debug line vty no login ! diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index c6e22cc..b79aae4 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -768,7 +768,9 @@ function f_process_attach_accept(PDU_GMM_AttachAccept aa, integer ran_index := 0) runs on BSSGP_ConnHdlr { /* mandatory IE */ var hexstring aa_plmn := f_RAI_to_plmn_hexstr(aa.routingAreaIdentification); - if (not (g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc == aa_plmn)) { + /* we cannot use ran_index here, as it would overflow the cell_id object, since ran_idx > NUM_GB + * indicates an Iu RAN connection. All cells are expected to run the same MCC/MNC anyway... */ + if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) { setverdict(fail, "mismatching PLMN in Attach Accept: " & hex2str(aa_plmn) & "; expected " & hex2str(g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc)); mtc.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 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: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 Gerrit-Change-Number: 22937 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:43:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:43:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 ) Change subject: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow ...................................................................... Patch Set 1: Code-Review-2 too much unrelated unintended stuff :( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 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: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 Gerrit-Change-Number: 22937 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 19:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:44:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:44:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 to look at the new patch set (#2). Change subject: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow ...................................................................... sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow This was introduced in I7d859fd710dba96eb9b46c428243281183e1be12 and caused Iu related TTCN3 tests to fail with: SGSN_Tests.ttcn:771 Dynamic test case error: Index overflow in a value of type @SGSN_Tests.BssgpCellIds: The index is 3, but the value has only 3 elements. Change-Id: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/22937/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 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: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 Gerrit-Change-Number: 22937 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 19:44:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 19:44:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 ) Change subject: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow ...................................................................... Removed Code-Review-2 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 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: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 Gerrit-Change-Number: 22937 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:02:25 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 20:02:25 +0000 Subject: Change in osmo-bts[master]: gsm_data: handle l1_info with structs References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22938 ) Change subject: gsm_data: handle l1_info with structs ...................................................................... gsm_data: handle l1_info with structs in struct gsm_lchan and also in other places l1_info is handled in its binary form. Libosmocore now offers structs to handle l1 info, so lets use those structs to get rid of all the manual decoding of l1_info. Depends: libosmocore I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Change-Id: I5eb516d7849750f3dd174d48c9f07dabf2c80515 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c M src/common/rsl.c M src/osmo-bts-virtual/l1_if.c 4 files changed, 15 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/22938/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 05b6cf2..6caad14 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -323,7 +323,7 @@ uint8_t num_ul_meas; struct bts_ul_meas uplink[MAX_NUM_UL_MEAS]; /* last L1 header from the MS */ - uint8_t l1_info[2]; + struct rsl_l1_info l1_info; struct gsm_meas_rep_unidir ul_res; int16_t ms_toa256; /* Frame number of the last measurement indication receceived */ @@ -411,11 +411,6 @@ struct msgb *rep_sacch; }; -static inline uint8_t lchan_get_ta(const struct gsm_lchan *lchan) -{ - return lchan->meas.l1_info[1]; -} - extern const struct value_string lchan_ciph_state_names[]; static inline const char *lchan_ciph_state_name(uint8_t state) { return get_value_string(lchan_ciph_state_names, state); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index ed7b4e7..0a46b23 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -979,7 +980,7 @@ /* When the MS sets the SRR bit in the UL-SACCH L1 header * (repeated SACCH requested) then it makes sense to enable * FACCH repetition too. */ - if ((lchan->meas.l1_info[0] >> 1) & 1) { + if (lchan->meas.l1_info.srr_sro) { lchan->repeated_dl_facch_active = true; return; } @@ -1028,7 +1029,7 @@ * SACCH repetition. */ if (lchan->rep_sacch) { - if (((lchan->meas.l1_info[0] >> 1) & 1) == 0) { + if (lchan->meas.l1_info.srr_sro == 0) { /* Toss previous repetition candidate */ msgb_free(lchan->rep_sacch); lchan->rep_sacch = NULL; @@ -1457,6 +1458,7 @@ uint32_t fn; int8_t rssi; enum osmo_ph_pres_info_type pr_info = data_ind->pdch_presence_info; + struct gsm_sacch_l1_hdr *l1_hdr; rssi = data_ind->rssi; chan_nr = data_ind->chan_nr; @@ -1557,10 +1559,11 @@ * fields on the Um interface is different from the * order of fields in RSL. See 3GPP TS 44.004 (section 7.2) * vs. 3GPP TS 48.058 (section 9.3.10). */ - lchan->meas.l1_info[0] = data[0] << 3; - lchan->meas.l1_info[0] |= ((data[0] >> 5) & 1) << 2; /* FPC/EPC */ - lchan->meas.l1_info[0] |= ((data[0] >> 6) & 1) << 1; /* SRR */ - lchan->meas.l1_info[1] = data[1]; + l1_hdr = (struct gsm_sacch_l1_hdr*)data; + lchan->meas.l1_info.ms_pwr = l1_hdr->ms_pwr; + lchan->meas.l1_info.fpc_epc = l1_hdr->fpc_epc; + lchan->meas.l1_info.srr_sro = l1_hdr->srr_sro; + lchan->meas.l1_info.ta = l1_hdr->ta; lchan->meas.flags |= LC_UL_M_F_L1_VALID; lchan_ms_pwr_ctrl(lchan, data[0] & 0x1f, data_ind->rssi); diff --git a/src/common/rsl.c b/src/common/rsl.c index 3023ffa..525b637 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3202,8 +3202,8 @@ lchan->meas.ul_res.sub.rx_lev, lchan->meas.ul_res.full.rx_qual, lchan->meas.ul_res.sub.rx_qual, - lchan->meas.l1_info[0], - lchan->meas.l1_info[1], l3_len, ms_to2rsl(lchan, le) - MEAS_MAX_TIMING_ADVANCE); + lchan->meas.l1_info.ms_pwr, + lchan->meas.l1_info.ta, l3_len, ms_to2rsl(lchan, le) - MEAS_MAX_TIMING_ADVANCE); msgb_tv_put(msg, RSL_IE_MEAS_RES_NR, lchan->meas.res_nr++); size_t ie_len = gsm0858_rsl_ul_meas_enc(&lchan->meas.ul_res, @@ -3222,7 +3222,7 @@ * to know the total propagation time between MS and BTS, we need to add * the actual TA value applied by the MS plus the respective toa256 value in * 1/256 symbol periods. */ - int16_t ta256 = lchan_get_ta(lchan) * 256; + int16_t ta256 = lchan->meas.l1_info.ta * 256; smi->toa256_mean = htons(ta256 + lchan->meas.ms_toa256); smi->toa256_min = htons(ta256 + lchan->meas.ext.toa256_min); smi->toa256_max = htons(ta256 + lchan->meas.ext.toa256_max); @@ -3234,7 +3234,7 @@ } msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power_ctrl.current / 2); if (lchan->meas.flags & LC_UL_M_F_L1_VALID) { - msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, lchan->meas.l1_info); + msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, sizeof(lchan->meas.l1_info), (uint8_t*)&lchan->meas.l1_info); lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; } diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index ed3b601..78da639 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -329,7 +329,7 @@ DEBUGPFN(DMEAS, fn, "RX L1 frame %s chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS " "ber=%.2f%% (%d/%d bits) L1_ta=%d rqd_ta=%d toa=%.2f\n", gsm_lchan_name(lchan), chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.max), - rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info[1], lchan->rqd_ta, toa); + rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info.ta, lchan->rqd_ta, toa); l1if_fill_meas_res(&l1sap, chan_nr, lchan->rqd_ta + toa, ber, rssi, fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5eb516d7849750f3dd174d48c9f07dabf2c80515 Gerrit-Change-Number: 22938 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:18:06 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 16 Feb 2021 20:18:06 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22913 ) Change subject: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 20:18:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:18:21 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 20:18:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: update sns configuration to use ip-sns-bind References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... gbproxy: update sns configuration to use ip-sns-bind With libosmocore commit the SNS configuration requires a ip-sns-bind vty configuration to define the binds which should be use. Related: SYS#5354 Depends-on: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Change-Id: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 --- M gbproxy/osmo-gbproxy.cfg M gbproxy/osmo-gbproxy.fr.cfg 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/22939/1 diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index 15f9f04..efd0499 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -28,8 +28,10 @@ listen 127.0.0.1 23000 accept-ipaccess nse 101 + ip-sns-bind local ip-sns-remote 127.0.0.10 7777 nse 102 + ip-sns-bind local ip-sns-remote 127.0.0.11 8888 timer tns-block 3 timer tns-block-retries 3 diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index 9595475..b7eb538 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -34,8 +34,10 @@ timer tns-alive 3 timer tns-alive-retries 10 nse 101 + ip-sns-bind local ip-sns-remote 127.0.0.10 7777 nse 102 + ip-sns-bind local ip-sns-remote 127.0.0.11 8888 nse 2001 nsvc fr hdlcnet1 dlci 16 nsvci 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 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: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 Gerrit-Change-Number: 22939 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:25:18 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 20:25:18 +0000 Subject: Change in docker-playground[master]: gbproxy: update sns configuration to use ip-sns-bind References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/22940 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... gbproxy: update sns configuration to use ip-sns-bind With libosmocore commit the SNS configuration requires a ip-sns-bind vty configuration to define the binds which should be use. Related: SYS#5354 Depends-on: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg M ttcn3-gbproxy-test/osmo-gbproxy.cfg 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/22940/1 diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index f5bda9d..7123158 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -31,8 +31,10 @@ bind udp local listen 172.18.25.10 23000 nse 101 + ip-sns-bind local ip-sns-remote 172.18.25.103 7777 nse 102 + ip-sns-bind local ip-sns-remote 172.18.25.103 8888 bind fr hdlcnet1 fr hdlcnet1 frnet diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg index c817e2c..3a73a30 100644 --- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg @@ -32,8 +32,10 @@ listen 172.18.24.10 23000 accept-ipaccess nse 101 + ip-sns-bind local ip-sns-remote 172.18.24.103 7777 nse 102 + ip-sns-bind local ip-sns-remote 172.18.24.103 8888 timer tns-block 3 timer tns-block-retries 3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 Gerrit-Change-Number: 22940 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:42:10 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 20:42:10 +0000 Subject: Change in libosmocore[master]: gsm_08_58, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22932 to look at the new patch set (#3). Change subject: gsm_08_58, gsm_44_004: add struct for l1 information ...................................................................... gsm_08_58, gsm_44_004: add struct for l1 information Libosmocore currently does not offer any structs to encode and decode the l1 information on RSL level and the sacch l1 header on the air interface level. Both structs are identical but the field order in the first octet is reversed. Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 --- M include/Makefile.am M include/osmocom/gsm/protocol/gsm_08_58.h A include/osmocom/gsm/protocol/gsm_44_004.h 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/22932/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:43:40 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 20:43:40 +0000 Subject: Change in libosmocore[master]: gsm_08_58, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_58, gsm_44_004: add struct for l1 information ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG at 1 PS1, Line 1: Parent: 52489850 (gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types) > Huh, you forgot that amazing comment from src/common/l1sap.c? [?] :o) https://gerrit.osmocom.org/c/libosmocore/+/22932/1//COMMIT_MSG at 7 PS1, Line 7: gsm_08_59 > 08_58 Done https://gerrit.osmocom.org/c/libosmocore/+/22932/1/include/osmocom/gsm/protocol/gsm_44_004.h File include/osmocom/gsm/protocol/gsm_44_004.h: https://gerrit.osmocom.org/c/libosmocore/+/22932/1/include/osmocom/gsm/protocol/gsm_44_004.h at 17 PS1, Line 17: > ws? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 16 Feb 2021 20:43:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 20:44:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 16 Feb 2021 20:44:40 +0000 Subject: Change in libosmocore[master]: gsm_08_58, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_58, gsm_44_004: add struct for l1 information ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 20:44:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:12:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:12:16 +0000 Subject: Change in osmo-cbc[master]: cbc-apitool: compatibility with python < 3.7 References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22941 ) Change subject: cbc-apitool: compatibility with python < 3.7 ...................................................................... cbc-apitool: compatibility with python < 3.7 The "required" parameter to argparse.add_subparsers() was only added in python 3.7. However, given that it defaults to 'required' and was always unconditionally required even in python 2.x, we can safely remove it. Change-Id: Ia0ffca055f47016fb29ef009acecac2a139e4077 --- M contrib/cbc-apitool.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/41/22941/1 diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 7d0fedf..0c5028a 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -117,7 +117,7 @@ parser.add_argument("-p", "--port", help="TCP port to connect to", default=12345) parser.add_argument("-v", "--verbose", help="increase output verbosity", action='count', default=0) - subparsers = parser.add_subparsers(required=True) + subparsers = parser.add_subparsers() parser_c_cbs = subparsers.add_parser('create-cbs', help='Create a new CBS message') parser_c_cbs.add_argument("--msg-id", type=int, help='Message Identifier', required=True) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia0ffca055f47016fb29ef009acecac2a139e4077 Gerrit-Change-Number: 22941 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:24:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 16 Feb 2021 21:24:23 +0000 Subject: Change in osmo-trx[master]: Add VTY parameter for Rx/Tx freq. shifting References: Message-ID: Hello fixeria, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 to review the following change. Change subject: Add VTY parameter for Rx/Tx freq. shifting ...................................................................... Add VTY parameter for Rx/Tx freq. shifting Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Related: SYS#4454 --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp 4 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/22942/1 diff --git a/CommonLibs/config_defs.h b/CommonLibs/config_defs.h index a9ed25e..ce6c1e7 100644 --- a/CommonLibs/config_defs.h +++ b/CommonLibs/config_defs.h @@ -46,6 +46,7 @@ enum FillerType filler; bool multi_arfcn; double offset; + double freq_offset; double rssi_offset; bool force_rssi_offset; /* Force value set in VTY? */ bool swap_channels; diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 0bb83fe..fdd05b1 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -258,6 +258,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_freq_offset, cfg_freq_offset_cmd, + "freq-offset OFFSET", + "Shift the baseband frequency\n" + "Frequency shift in kHz (e.g. -145300)\n") +{ + struct trx_ctx *trx = trx_from_vty(vty); + + trx->cfg.freq_offset = atoi(argv[0]); + + return CMD_SUCCESS; +} + DEFUN(cfg_swap_channels, cfg_swap_channels_cmd, "swap-channels (disable|enable)", "Swap primary and secondary channels of the PHY (if any)\n" @@ -759,6 +771,7 @@ install_element(TRX_NODE, &cfg_multi_arfcn_cmd); install_element(TRX_NODE, &cfg_offset_cmd); install_element(TRX_NODE, &cfg_rssi_offset_cmd); + install_element(TRX_NODE, &cfg_freq_offset_cmd); install_element(TRX_NODE, &cfg_swap_channels_cmd); install_element(TRX_NODE, &cfg_egprs_cmd); install_element(TRX_NODE, &cfg_ext_rach_cmd); diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 0a1ba6f..3384c6e 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -954,7 +954,7 @@ // tune receiver int freqKhz; sscanf(params, "%d", &freqKhz); - mRxFreq = freqKhz * 1e3; + mRxFreq = (freqKhz + cfg->freq_offset) * 1e3; if (!mRadioInterface->tuneRx(mRxFreq, chan)) { LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune"; sprintf(response,"RSP RXTUNE 1 %d",freqKhz); @@ -965,7 +965,7 @@ // tune txmtr int freqKhz; sscanf(params, "%d", &freqKhz); - mTxFreq = freqKhz * 1e3; + mTxFreq = (freqKhz + cfg->freq_offset) * 1e3; if (!mRadioInterface->tuneTx(mTxFreq, chan)) { LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune"; sprintf(response,"RSP TXTUNE 1 %d",freqKhz); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 2d45932..bf11f9f 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -542,7 +542,8 @@ ost << " Filler Burst TSC........ " << trx->cfg.rtsc << std::endl; ost << " Filler Burst RACH Delay. " << trx->cfg.rach_delay << std::endl; ost << " Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl; - ost << " Tuning offset........... " << trx->cfg.offset << std::endl; + ost << " LO freq. offset......... " << trx->cfg.offset << std::endl; + ost << " Tune freq. offset....... " << trx->cfg.freq_offset << std::endl; ost << " RSSI to dBm offset...... " << trx->cfg.rssi_offset << (trx->cfg.force_rssi_offset ? "" : " (relative)") << std::endl; ost << " Swap channels........... " << trx->cfg.swap_channels << std::endl; ost << " Tx Antennas............."; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:29:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:29:48 +0000 Subject: Change in osmo-cbc[master]: cbc-apitool: compatibility with python < 3.7 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22941 ) Change subject: cbc-apitool: compatibility with python < 3.7 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia0ffca055f47016fb29ef009acecac2a139e4077 Gerrit-Change-Number: 22941 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 21:29:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:29:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:29:53 +0000 Subject: Change in osmo-cbc[master]: cbc-apitool: compatibility with python < 3.7 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22941 ) Change subject: cbc-apitool: compatibility with python < 3.7 ...................................................................... cbc-apitool: compatibility with python < 3.7 The "required" parameter to argparse.add_subparsers() was only added in python 3.7. However, given that it defaults to 'required' and was always unconditionally required even in python 2.x, we can safely remove it. Change-Id: Ia0ffca055f47016fb29ef009acecac2a139e4077 --- M contrib/cbc-apitool.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 7d0fedf..0c5028a 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -117,7 +117,7 @@ parser.add_argument("-p", "--port", help="TCP port to connect to", default=12345) parser.add_argument("-v", "--verbose", help="increase output verbosity", action='count', default=0) - subparsers = parser.add_subparsers(required=True) + subparsers = parser.add_subparsers() parser_c_cbs = subparsers.add_parser('create-cbs', help='Create a new CBS message') parser_c_cbs.add_argument("--msg-id", type=int, help='Message Identifier', required=True) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia0ffca055f47016fb29ef009acecac2a139e4077 Gerrit-Change-Number: 22941 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:31:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:31:10 +0000 Subject: Change in libosmocore[master]: gsm_08_58, gsm_44_004: add struct for l1 information In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22932 ) Change subject: gsm_08_58, gsm_44_004: add struct for l1 information ...................................................................... gsm_08_58, gsm_44_004: add struct for l1 information Libosmocore currently does not offer any structs to encode and decode the l1 information on RSL level and the sacch l1 header on the air interface level. Both structs are identical but the field order in the first octet is reversed. Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 --- M include/Makefile.am M include/osmocom/gsm/protocol/gsm_08_58.h A include/osmocom/gsm/protocol/gsm_44_004.h 3 files changed, 36 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 10f0221..8dae3d9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -144,6 +144,7 @@ osmocom/gsm/protocol/gsm_23_003.h \ osmocom/gsm/protocol/gsm_23_041.h \ osmocom/gsm/protocol/gsm_29_118.h \ + osmocom/gsm/protocol/gsm_44_004.h \ osmocom/gsm/protocol/gsm_44_318.h \ osmocom/gsm/protocol/gsm_48_049.h \ osmocom/gsm/protocol/gsm_48_071.h \ diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index e9c14e6..6f974ce 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -945,4 +945,20 @@ struct ipac_preproc_ho_ctl_param ho_ctl_param; }; +struct rsl_l1_info { +#if OSMO_IS_BIG_ENDIAN + uint8_t ms_pwr:5, + fpc_epc:1, + srr_sro:1, + reserved:1; + uint8_t ta; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t reserved:1, + srr_sro:1, + fpc_epc:1, + ms_pwr:5; + uint8_t ta; +#endif +} __attribute__ ((packed)); + /*! @} */ diff --git a/include/osmocom/gsm/protocol/gsm_44_004.h b/include/osmocom/gsm/protocol/gsm_44_004.h new file mode 100644 index 0000000..83be9bf --- /dev/null +++ b/include/osmocom/gsm/protocol/gsm_44_004.h @@ -0,0 +1,19 @@ +#pragma once + +/* TS 44.004 Section 7.1 */ + +struct gsm_sacch_l1_hdr { +#if OSMO_IS_BIG_ENDIAN + uint8_t reserved:1, + srr_sro:1, + fpc_epc:1, + ms_pwr:5; + uint8_t ta; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t ms_pwr:5, + fpc_epc:1, + srr_sro:1, + reserved:1; + uint8_t ta; +#endif +} __attribute__ ((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Gerrit-Change-Number: 22932 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:31:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:31:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 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: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 Gerrit-Change-Number: 22939 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 21:31:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:32:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:32:19 +0000 Subject: Change in docker-playground[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22940 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 Gerrit-Change-Number: 22940 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 21:32:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:32:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:32:30 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22913 ) Change subject: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 21:32:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:32:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:32:47 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22913 ) Change subject: gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse ...................................................................... gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse Add support for multiple SNS endpoints. Move the NSE allocation to the top in preparation of IP-SNS binds. The future gprs_ns2 library will require to manual add every bind to the NSE for IP-SNS. Rename the function to match more it's purpose. Related: SYS#5354 Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb --- M src/gprs_bssgp_pcu.c 1 file changed, 40 insertions(+), 26 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index a6b6f7e..7d793be 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -975,12 +975,22 @@ osmo_timer_schedule(&the_pcu->bssgp.bvc_timer, the_pcu->vty.fc_interval, 0); } -static int ns_create_nsvc(struct gprs_rlcmac_bts *bts, - uint16_t nsei, - const struct osmo_sockaddr *local, - const struct osmo_sockaddr *remote, - const uint16_t *nsvci, - uint16_t valid) +/*! configure NS layer + * + * \param bts pointer to the bts object + * \param nsei the NSEI of the BSS + * \param local pointer to an array of local address to bind on. + * \param remote pointer to an array of remote address SGSNs. If dynamic IP-SNS is used remote is used as initial SGSN endpoints. + * \param nsvci pointer to an array of nsvcis + * \param valid bitmask. a 1 means the position in the array contains a valid entry for local, remote, nsvci + * \returns 0 if the configuration has succeeded. on error != 0 + */ +static int ns_configure_nse(struct gprs_rlcmac_bts *bts, + uint16_t nsei, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + const uint16_t *nsvci, + uint16_t valid) { int i, rc; uint16_t binds = 0; @@ -988,10 +998,20 @@ struct gprs_ns2_vc *nsvc; struct gprs_ns2_vc_bind *bind[PCU_IF_NUM_NSVC] = { }; char name[5]; + bool sns_configured = false; if (!valid) return -1; + bts->nse = gprs_ns2_nse_by_nsei(the_pcu->nsi, nsei); + if (!bts->nse) + bts->nse = gprs_ns2_create_nse(the_pcu->nsi, nsei, + GPRS_NS2_LL_UDP, the_pcu->vty.ns_dialect); + if (!bts->nse) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n"); + return -1; + } + for (i = 0; i < PCU_IF_NUM_NSVC; i++) { if (!(valid & (1 << i))) continue; @@ -1010,31 +1030,22 @@ if (!binds) { LOGP(DBSSGP, LOGL_ERROR, "Failed to bind to any NS-VC\n"); + gprs_ns2_free_nses(the_pcu->nsi); return -1; } - bts->nse = gprs_ns2_nse_by_nsei(the_pcu->nsi, nsei); - if (!bts->nse) - bts->nse = gprs_ns2_create_nse(the_pcu->nsi, nsei, - GPRS_NS2_LL_UDP, the_pcu->vty.ns_dialect); - - if (!bts->nse) { - LOGP(DBSSGP, LOGL_ERROR, "Failed to create NSE\n"); - gprs_ns2_free_binds(the_pcu->nsi); - return 1; - } - for (i = 0; i < PCU_IF_NUM_NSVC; i++) { if (!(binds & (1 << i))) continue; - /* FIXME: for SNS we just use the first successful NS-VC instead of all for the initial connect */ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) { rc = gprs_ns2_sns_add_endpoint(bts->nse, &remote[i]); - if (!rc) + if (rc && rc != -EALREADY) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to add SNS endpoint %s!\n", osmo_sockaddr_to_str(&remote[i])); return rc; - else - LOGP(DBSSGP, LOGL_ERROR, "Failed to connect to (SNS) towards SGSN %s!\n", osmo_sockaddr_to_str(&remote[i])); + } else { + sns_configured = true; + } } else { nsvc = gprs_ns2_ip_connect(bind[i], &remote[i], bts->nse, nsvci[i]); if (nsvc) @@ -1044,7 +1055,10 @@ } } - return nsvcs ? 0 : -1; + if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) + return sns_configured ? 0 : -1; + else + return nsvcs ? 0 : -1; } struct nsvc_cb { @@ -1093,12 +1107,12 @@ /* there shouldn't any previous state. */ gprs_ns2_free_nses(the_pcu->nsi); gprs_ns2_free_binds(the_pcu->nsi); - rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid); + rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid); } else if (nsei != gprs_ns2_nse_nsei(bts->nse)) { /* the NSEI has changed */ gprs_ns2_free_nses(the_pcu->nsi); gprs_ns2_free_binds(the_pcu->nsi); - rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid); + rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid); } else if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) { /* SNS: check if the initial nsvc is the same, if not recreate it */ const struct osmo_sockaddr *initial = gprs_ns2_nse_sns_remote(bts->nse); @@ -1114,7 +1128,7 @@ gprs_ns2_free_nses(the_pcu->nsi); gprs_ns2_free_binds(the_pcu->nsi); - rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid); + rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid); } else { /* check if all NSVC are still the same. */ struct nsvc_cb data = { @@ -1134,7 +1148,7 @@ /* remove all found nsvcs from the valid field */ valid &= ~data.found; - rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid); + rc = ns_configure_nse(bts, nsei, local, remote, nsvci, valid); } if (rc) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I69cf48ab168a6dca4f649157bf6556d7cd27d4fb Gerrit-Change-Number: 22913 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:32:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:32:47 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22931 ) Change subject: gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config ...................................................................... gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config Improve the naming of the function to match it's purpose. Related: SYS#5354 Change-Id: Ib8e4ae734503fd6f6695d9d6767d809e1bf79d22 --- M src/gprs_bssgp_pcu.c M src/gprs_bssgp_pcu.h M src/pcu_l1_if.cpp M tests/emu/pcu_emu.cpp 4 files changed, 8 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 7d793be..ce36c6b 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -1097,10 +1097,11 @@ return 0; } -int gprs_ns_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, - const struct osmo_sockaddr *local, - const struct osmo_sockaddr *remote, - uint16_t *nsvci, uint16_t valid) +/* update the ns configuration if needed */ +int gprs_ns_update_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, + const struct osmo_sockaddr *local, + const struct osmo_sockaddr *remote, + uint16_t *nsvci, uint16_t valid) { int rc = 0; if (!bts->nse) { diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index 4b0e0aa..db77cbb 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -90,7 +90,7 @@ uint16_t mcc, uint16_t mnc, bool mnc_3_digits, uint16_t lac, uint16_t rac, uint16_t cell_id); -int gprs_ns_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, +int gprs_ns_update_config(struct gprs_rlcmac_bts *bts, uint16_t nsei, const struct osmo_sockaddr *local, const struct osmo_sockaddr *remote, uint16_t *nsvci, uint16_t valid); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 9873469..b6d6786 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -583,7 +583,7 @@ return -EINVAL; } - return gprs_ns_config(bts, info_ind->nsei, local, remote, nsvci, valid); + return gprs_ns_update_config(bts, info_ind->nsei, local, remote, nsvci, valid); } static int pcu_rx_info_ind(struct gprs_rlcmac_bts *bts, const struct gsm_pcu_if_info_ind *info_ind) diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index ef573a7..082f8ea 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -108,7 +108,7 @@ remote.u.sin.sin_port = htons(sgsn_port); pcu = gprs_bssgp_init(bts, 20, 20, 901, 99, false, 1, 0, 0); - gprs_ns_config(bts, nsei, &local, &remote, &nsvci, 1); + gprs_ns_update_config(bts, nsei, &local, &remote, &nsvci, 1); pcu->on_unblock_ack = bvci_unblocked; pcu->on_dl_unit_data = bssgp_data; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8e4ae734503fd6f6695d9d6767d809e1bf79d22 Gerrit-Change-Number: 22931 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:35:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:35:40 +0000 Subject: Change in osmo-bts[master]: gsm_data: handle l1_info with structs In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22938 ) Change subject: gsm_data: handle l1_info with structs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5eb516d7849750f3dd174d48c9f07dabf2c80515 Gerrit-Change-Number: 22938 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 21:35:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:37:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:37:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 ) Change subject: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 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: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 Gerrit-Change-Number: 22937 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 21:37:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:37:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:37:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 ) Change subject: sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow ...................................................................... sgsn: Fix regression regarding g_pars.bssgp.cell_id[] array overflow This was introduced in I7d859fd710dba96eb9b46c428243281183e1be12 and caused Iu related TTCN3 tests to fail with: SGSN_Tests.ttcn:771 Dynamic test case error: Index overflow in a value of type @SGSN_Tests.BssgpCellIds: The index is 3, but the value has only 3 elements. Change-Id: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index c6e22cc..b79aae4 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -768,7 +768,9 @@ function f_process_attach_accept(PDU_GMM_AttachAccept aa, integer ran_index := 0) runs on BSSGP_ConnHdlr { /* mandatory IE */ var hexstring aa_plmn := f_RAI_to_plmn_hexstr(aa.routingAreaIdentification); - if (not (g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc == aa_plmn)) { + /* we cannot use ran_index here, as it would overflow the cell_id object, since ran_idx > NUM_GB + * indicates an Iu RAN connection. All cells are expected to run the same MCC/MNC anyway... */ + if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) { setverdict(fail, "mismatching PLMN in Attach Accept: " & hex2str(aa_plmn) & "; expected " & hex2str(g_pars.bssgp_cell_id[ran_index].ra_id.lai.mcc_mnc)); mtc.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22937 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: Iaae0015f5e7c7eabc426add91b5de1b63bf6d9f6 Gerrit-Change-Number: 22937 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:39:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:39:54 +0000 Subject: =?UTF-8?Q?Change_in_osmo-cbc=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E3-d6a3_=E2=86=92_0=2E2=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22943 ) Change subject: Bump version: 0.2.0.3-d6a3 ? 0.2.1 ...................................................................... Bump version: 0.2.0.3-d6a3 ? 0.2.1 Change-Id: I305be54bf1abadeabfa77b7c3a2879e824075afe --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/43/22943/1 diff --git a/debian/changelog b/debian/changelog index 5a86382..1c658cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-cbc (0.2.1) unstable; urgency=medium + + [ Harald Welte ] + * VTY: don't save dynamically-allocated "unknown" peers + * cbc-apitool: compatibility with python < 3.7 + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Harald Welte Tue, 16 Feb 2021 22:39:23 +0100 + osmo-cbc (0.2.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I305be54bf1abadeabfa77b7c3a2879e824075afe Gerrit-Change-Number: 22943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:40:19 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 21:40:19 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22872 to look at the new patch set (#12). Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. This is a behaviour change of the API and must be synchronized with the osmo-pcu. Otherwise SNS won't work with osmo-pcu. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M tests/gb/osmo-ns-dummy.cfg 6 files changed, 469 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/22872/12 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:40:19 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 21:40:19 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22900 to look at the new patch set (#10). Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` A static configured UDP NSVC can have signalling and data weights Related: SYS#5354 Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f --- M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 2 files changed, 74 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22900/10 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:51:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:51:39 +0000 Subject: =?UTF-8?Q?Change_in_osmo-cbc=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E3-d6a3_=E2=86=92_0=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22943 ) Change subject: Bump version: 0.2.0.3-d6a3 ? 0.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I305be54bf1abadeabfa77b7c3a2879e824075afe Gerrit-Change-Number: 22943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 21:51:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:51:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:51:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-cbc=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E3-d6a3_=E2=86=92_0=2E2=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/22943 ) Change subject: Bump version: 0.2.0.3-d6a3 ? 0.2.1 ...................................................................... Bump version: 0.2.0.3-d6a3 ? 0.2.1 Change-Id: I305be54bf1abadeabfa77b7c3a2879e824075afe --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 5a86382..1c658cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-cbc (0.2.1) unstable; urgency=medium + + [ Harald Welte ] + * VTY: don't save dynamically-allocated "unknown" peers + * cbc-apitool: compatibility with python < 3.7 + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Harald Welte Tue, 16 Feb 2021 22:39:23 +0100 + osmo-cbc (0.2.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/22943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I305be54bf1abadeabfa77b7c3a2879e824075afe Gerrit-Change-Number: 22943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 21:54:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 16 Feb 2021 21:54:18 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Feb 2021 21:54:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 22:02:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 16 Feb 2021 22:02:19 +0000 Subject: Change in osmo-bts[master]: gsm_data: handle l1_info with structs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22938 ) Change subject: gsm_data: handle l1_info with structs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5eb516d7849750f3dd174d48c9f07dabf2c80515 Gerrit-Change-Number: 22938 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Feb 2021 22:02:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 22:06:58 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 16 Feb 2021 22:06:58 +0000 Subject: Change in libosmocore[master]: gprs_ns2: ensure no duplicate UDP NSVC can be created References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22944 ) Change subject: gprs_ns2: ensure no duplicate UDP NSVC can be created ...................................................................... gprs_ns2: ensure no duplicate UDP NSVC can be created Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 --- M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/22944/1 diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 36f6a97..3081680 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -402,6 +402,10 @@ return NULL; } + /* duplicate */ + if (gprs_ns2_nsvc_by_sockaddr_bind(bind, remote)) + return NULL; + sockaddr_str = (char *)osmo_sockaddr_to_str(remote); osmo_identifier_sanitize_buf(sockaddr_str, NULL, '_'); snprintf(idbuf, sizeof(idbuf), "%s-NSE%05u-remote-%s", gprs_ns2_lltype_str(nse->ll), diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 4bd7cde..6214907 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1093,6 +1093,15 @@ goto err; } + nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, &remote); + if (nsvc) { + if (nsvc->nse == nse) + vty_out(vty, "Specified NSVC is already present in this NSE.%s", VTY_NEWLINE); + else + vty_out(vty, "Specified NSVC is already present in another NSE%05u.%s", nsvc->nse->nsei, VTY_NEWLINE); + goto err; + } + nsvc = gprs_ns2_ip_connect(bind, &remote, nse, 0); if (!nsvc) { vty_out(vty, "Can not create NS-VC.%s", VTY_NEWLINE); diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index a969881..f0253fc 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -61,3 +61,23 @@ NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +OsmoNSdummy# configure terminal +OsmoNSdummy(config)# ns +OsmoNSdummy(config-ns)# nse 1234 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 2 data-weight 2 +Specified NSVC is already present in this NSE. +OsmoNSdummy(config-ns-nse)# exit +OsmoNSdummy(config-ns)# nse 1235 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 2 data-weight 2 +Specified NSVC is already present in another NSE01234. +OsmoNSdummy(config-ns-nse)# exit +OsmoNSdummy(config-ns)# nse 2342 +OsmoNSdummy(config-ns-nse)# ip-sns-bind abc +OsmoNSdummy(config-ns-nse)# ip-sns-bind abc +Failed to add ip-sns-bind abc already present +OsmoNSdummy(config-ns-nse)# ip-sns-bind abc2 +Can not find the given bind 'abc2' +OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222 +OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222 +Specified SNS endpoint already part of the NSE. +OsmoNSdummy(config-ns-nse)# exit -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 Gerrit-Change-Number: 22944 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 16 22:28:18 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 16 Feb 2021 22:28:18 +0000 Subject: Change in osmo-bts[master]: gsm_data: handle l1_info with structs In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22938 ) Change subject: gsm_data: handle l1_info with structs ...................................................................... gsm_data: handle l1_info with structs in struct gsm_lchan and also in other places l1_info is handled in its binary form. Libosmocore now offers structs to handle l1 info, so lets use those structs to get rid of all the manual decoding of l1_info. Depends: libosmocore I23c1890b89d5a0574eb05dace9f64cc59d6f6df7 Change-Id: I5eb516d7849750f3dd174d48c9f07dabf2c80515 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c M src/common/rsl.c M src/osmo-bts-virtual/l1_if.c 4 files changed, 15 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 05b6cf2..6caad14 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -323,7 +323,7 @@ uint8_t num_ul_meas; struct bts_ul_meas uplink[MAX_NUM_UL_MEAS]; /* last L1 header from the MS */ - uint8_t l1_info[2]; + struct rsl_l1_info l1_info; struct gsm_meas_rep_unidir ul_res; int16_t ms_toa256; /* Frame number of the last measurement indication receceived */ @@ -411,11 +411,6 @@ struct msgb *rep_sacch; }; -static inline uint8_t lchan_get_ta(const struct gsm_lchan *lchan) -{ - return lchan->meas.l1_info[1]; -} - extern const struct value_string lchan_ciph_state_names[]; static inline const char *lchan_ciph_state_name(uint8_t state) { return get_value_string(lchan_ciph_state_names, state); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index ed7b4e7..0a46b23 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -979,7 +980,7 @@ /* When the MS sets the SRR bit in the UL-SACCH L1 header * (repeated SACCH requested) then it makes sense to enable * FACCH repetition too. */ - if ((lchan->meas.l1_info[0] >> 1) & 1) { + if (lchan->meas.l1_info.srr_sro) { lchan->repeated_dl_facch_active = true; return; } @@ -1028,7 +1029,7 @@ * SACCH repetition. */ if (lchan->rep_sacch) { - if (((lchan->meas.l1_info[0] >> 1) & 1) == 0) { + if (lchan->meas.l1_info.srr_sro == 0) { /* Toss previous repetition candidate */ msgb_free(lchan->rep_sacch); lchan->rep_sacch = NULL; @@ -1457,6 +1458,7 @@ uint32_t fn; int8_t rssi; enum osmo_ph_pres_info_type pr_info = data_ind->pdch_presence_info; + struct gsm_sacch_l1_hdr *l1_hdr; rssi = data_ind->rssi; chan_nr = data_ind->chan_nr; @@ -1557,10 +1559,11 @@ * fields on the Um interface is different from the * order of fields in RSL. See 3GPP TS 44.004 (section 7.2) * vs. 3GPP TS 48.058 (section 9.3.10). */ - lchan->meas.l1_info[0] = data[0] << 3; - lchan->meas.l1_info[0] |= ((data[0] >> 5) & 1) << 2; /* FPC/EPC */ - lchan->meas.l1_info[0] |= ((data[0] >> 6) & 1) << 1; /* SRR */ - lchan->meas.l1_info[1] = data[1]; + l1_hdr = (struct gsm_sacch_l1_hdr*)data; + lchan->meas.l1_info.ms_pwr = l1_hdr->ms_pwr; + lchan->meas.l1_info.fpc_epc = l1_hdr->fpc_epc; + lchan->meas.l1_info.srr_sro = l1_hdr->srr_sro; + lchan->meas.l1_info.ta = l1_hdr->ta; lchan->meas.flags |= LC_UL_M_F_L1_VALID; lchan_ms_pwr_ctrl(lchan, data[0] & 0x1f, data_ind->rssi); diff --git a/src/common/rsl.c b/src/common/rsl.c index 3023ffa..525b637 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3202,8 +3202,8 @@ lchan->meas.ul_res.sub.rx_lev, lchan->meas.ul_res.full.rx_qual, lchan->meas.ul_res.sub.rx_qual, - lchan->meas.l1_info[0], - lchan->meas.l1_info[1], l3_len, ms_to2rsl(lchan, le) - MEAS_MAX_TIMING_ADVANCE); + lchan->meas.l1_info.ms_pwr, + lchan->meas.l1_info.ta, l3_len, ms_to2rsl(lchan, le) - MEAS_MAX_TIMING_ADVANCE); msgb_tv_put(msg, RSL_IE_MEAS_RES_NR, lchan->meas.res_nr++); size_t ie_len = gsm0858_rsl_ul_meas_enc(&lchan->meas.ul_res, @@ -3222,7 +3222,7 @@ * to know the total propagation time between MS and BTS, we need to add * the actual TA value applied by the MS plus the respective toa256 value in * 1/256 symbol periods. */ - int16_t ta256 = lchan_get_ta(lchan) * 256; + int16_t ta256 = lchan->meas.l1_info.ta * 256; smi->toa256_mean = htons(ta256 + lchan->meas.ms_toa256); smi->toa256_min = htons(ta256 + lchan->meas.ext.toa256_min); smi->toa256_max = htons(ta256 + lchan->meas.ext.toa256_max); @@ -3234,7 +3234,7 @@ } msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power_ctrl.current / 2); if (lchan->meas.flags & LC_UL_M_F_L1_VALID) { - msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, lchan->meas.l1_info); + msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, sizeof(lchan->meas.l1_info), (uint8_t*)&lchan->meas.l1_info); lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; } diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index ed3b601..78da639 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -329,7 +329,7 @@ DEBUGPFN(DMEAS, fn, "RX L1 frame %s chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS " "ber=%.2f%% (%d/%d bits) L1_ta=%d rqd_ta=%d toa=%.2f\n", gsm_lchan_name(lchan), chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.max), - rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info[1], lchan->rqd_ta, toa); + rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info.ta, lchan->rqd_ta, toa); l1if_fill_meas_res(&l1sap, chan_nr, lchan->rqd_ta + toa, ber, rssi, fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5eb516d7849750f3dd174d48c9f07dabf2c80515 Gerrit-Change-Number: 22938 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 01:31:03 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 17 Feb 2021 01:31:03 +0000 Subject: Change in libosmocore[master]: WIP: gprs_bssgp: add remaining stuff for PCU to react on SGSN origina... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22945 ) Change subject: WIP: gprs_bssgp: add remaining stuff for PCU to react on SGSN originated BSSGP-RESET ...................................................................... WIP: gprs_bssgp: add remaining stuff for PCU to react on SGSN originated BSSGP-RESET Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c 2 files changed, 43 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/22945/1 diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h index e55fa52..f8c1f0b 100644 --- a/include/osmocom/gprs/gprs_bssgp.h +++ b/include/osmocom/gprs/gprs_bssgp.h @@ -125,6 +125,7 @@ /*! default bucket leak rate of per-MS bucket in octests/s */ uint32_t r_default_ms; + bool is_sgsn; /* we might want to add this as a shortcut later, avoiding the NSVC * lookup for every packet, similar to a routing cache */ //struct gprs_nsvc *nsvc; diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 926b0ef..5c71699 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -126,6 +126,35 @@ return bssgp_ns_send(bssgp_ns_send_data, msg); } +/*! Transmit a BVC-RESET-ACK message with a given nsei and bvci (Chapter 10.4.12) + * \param[in] nsei The NSEI to transmit over + * \param[in] bvci BVCI of the BVC to reset + * \param[in] ra_id Pointer to the ra_id to include. If NULL no cell information will be included + * \param[in] cell_id The cell_id to include (if ra_id is not NULL) + */ +int bssgp_tx_bvc_reset_ack_nsei_bvci(uint16_t nsei, uint16_t bvci, const struct gprs_ra_id *ra_id, uint16_t cell_id) +{ + struct msgb *msg = bssgp_msgb_alloc(); + struct bssgp_normal_hdr *bgph = + (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph)); + uint16_t _bvci = osmo_htons(bvci); + + msgb_nsei(msg) = nsei; + msgb_bvci(msg) = 0; /* Signalling */ + bgph->pdu_type = BSSGP_PDUT_BVC_RESET_ACK; + LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-RESET-ACK ", bvci); + + msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci); + if (ra_id) { + uint8_t bssgp_cid[8]; + bssgp_create_cell_id(bssgp_cid, ra_id, cell_id); + msgb_tvlv_put(msg, BSSGP_IE_CELL_ID, sizeof(bssgp_cid), bssgp_cid); + } + + /* Optional: Feature Bitmap */ + return bssgp_ns_send(bssgp_ns_send_data, msg); +} + /*! Initiate reset procedure for all PTP BVC on a given NSEI. * * This function initiates reset procedure for all PTP BVC with a given cause. @@ -178,6 +207,7 @@ return NULL; ctx->bvci = bvci; ctx->nsei = nsei; + ctx->is_sgsn = true; /* FIXME: BVCI is not unique, only BVCI+NSEI ?!? */ ctx->ctrg = rate_ctr_group_alloc(ctx, &bssgp_ctrg_desc, bvci); if (!ctx->ctrg) @@ -350,7 +380,7 @@ /* When we receive a BVC-RESET PDU (at least of a PTP BVCI), the BSS * informs us about its RAC + Cell ID, so we can create a mapping */ - if (bvci != 0 && bvci != 1) { + if (bctx->is_sgsn && bvci != 0 && bvci != 1) { if (!TLVP_PRES_LEN(tp, BSSGP_IE_CELL_ID, 8)) { LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx RESET " "missing mandatory IE\n", bvci); @@ -363,6 +393,13 @@ osmo_rai_name(&bctx->ra_id), bctx->cell_id, bvci); } + /* Acknowledge the RESET to the BTS */ + if (bvci == 0 || bvci == 1 || bctx->is_sgsn) + bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_RESET_ACK, + nsei, bvci, ns_bvci); + else + bssgp_tx_bvc_reset_ack_nsei_bvci(nsei, bvci, &bctx->ra_id, bctx->cell_id); + /* Send NM_BVC_RESET.ind to NM */ memset(&nmp, 0, sizeof(nmp)); nmp.nsei = nsei; @@ -372,10 +409,6 @@ osmo_prim_init(&nmp.oph, SAP_BSSGP_NM, PRIM_NM_BVC_RESET, PRIM_OP_INDICATION, msg); bssgp_prim_cb(&nmp.oph, NULL); - - /* Acknowledge the RESET to the BTS */ - bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_RESET_ACK, - nsei, bvci, ns_bvci); return 0; } @@ -972,6 +1005,9 @@ case BSSGP_PDUT_STATUS: /* This is already handled in bssgp_rcvmsg() */ break; + case BSSGP_PDUT_BVC_RESET: + rc = bssgp_rx_bvc_reset(msg, tp, bctx->bvci); + break; case BSSGP_PDUT_DOWNLOAD_BSS_PFC: case BSSGP_PDUT_CREATE_BSS_PFC_ACK: case BSSGP_PDUT_CREATE_BSS_PFC_NACK: @@ -1060,7 +1096,7 @@ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx BVC-RESET-ACK\n", bvci); break; case BSSGP_PDUT_BVC_RESET: - /* BSS tells us that BVC init is required */ + /* SGSN or BSS tells us that BVC init is required */ if (!TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2) || !TLVP_PRES_LEN(tp, BSSGP_IE_CAUSE, 1)) { LOGP(DLBSSGP, LOGL_ERROR, "BSSGP Rx BVC-RESET " -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 01:38:08 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 17 Feb 2021 01:38:08 +0000 Subject: Change in osmo-pcu[master]: WIP: gprs_bssgp: add remaining stuff for PCU to react on SGSN origina... References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22946 ) Change subject: WIP: gprs_bssgp: add remaining stuff for PCU to react on SGSN originated BSSGP-RESET ...................................................................... WIP: gprs_bssgp: add remaining stuff for PCU to react on SGSN originated BSSGP-RESET Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 --- M src/gprs_bssgp_pcu.c 1 file changed, 43 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/22946/1 diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index a6b6f7e..ff37451 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -418,6 +418,7 @@ uint16_t ns_bvci = msgb_bvci(msg), nsei = msgb_nsei(msg); int data_len; int rc = 0; + uint16_t bvci; struct bssgp_bvc_ctx *bctx; switch (pdu_type) { @@ -461,14 +462,12 @@ if (ns_bvci != BVCI_SIGNALLING) return rc; - if (TLVP_PRES_LEN(&tp, BSSGP_IE_CAUSE, 1)) - cause = (enum gprs_bssgp_cause)*TLVP_VAL(&tp, BSSGP_IE_CAUSE); - else + if (TLVP_PRES_LEN(&tp, BSSGP_IE_BVCI, 1)) { + bvci = osmo_ntohs(tlvp_val16_unal(&tp, BSSGP_IE_BVCI)); + } else { LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u BVC RESET without cause?!\n", nsei); - - rc = bssgp_tx_bvc_ptp_reset(nsei, cause); - if (rc < 0) - LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u BVC PTP reset procedure failed: %d\n", nsei, rc); + return rc; + } return rc; } @@ -558,12 +557,47 @@ int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { struct osmo_bssgp_prim *bp; + int rc; + enum gprs_bssgp_cause cause; bp = container_of(oph, struct osmo_bssgp_prim, oph); switch (oph->sap) { case SAP_BSSGP_NM: - if (oph->primitive == PRIM_NM_STATUS) + switch (oph->primitive) { + case PRIM_NM_STATUS: handle_nm_status(bp); + break; + case PRIM_NM_BVC_RESET: + /* received a BVC PTP reset */ + LOGP(DPCU, LOGL_ERROR, "PRIM: rx BVC_RESET on bvci %d\n", bp->bvci); + LOGP(DPCU, LOGL_ERROR, "PRIM: flags %d %d %d\n", + the_pcu->bssgp.bvc_sig_reset, + the_pcu->bssgp.bvc_reset, + the_pcu->bssgp.bvc_unblocked); + /* Rx Reset from SGSN */ + if (bp->bvci == 0) { + if (TLVP_PRES_LEN(bp->tp, BSSGP_IE_CAUSE, 1)) + cause = (enum gprs_bssgp_cause)*TLVP_VAL(bp->tp, BSSGP_IE_CAUSE); + else { + LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u BVC RESET without cause?!\n", bp->nsei); + break; + } + + rc = bssgp_tx_bvc_ptp_reset(bp->nsei, cause); + if (rc < 0) { + LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u BVC PTP reset procedure failed: %d\n", bp->nsei, rc); + break; + } + the_pcu->bssgp.bvc_sig_reset = 1; + the_pcu->bssgp.bvc_reset = 0; + the_pcu->bssgp.bvc_unblocked = 0; + } else if (bp->bvci == the_pcu->bssgp.bctx->bvci) { + the_pcu->bssgp.bvc_reset = 1; + the_pcu->bssgp.bvc_unblocked = 0; + bvc_timeout(NULL); + } + break; + } break; case SAP_BSSGP_RIM: return handle_rim(bp); @@ -1161,6 +1195,7 @@ the_pcu->bssgp.bts->nse = NULL; return NULL; } + the_pcu->bssgp.bctx->is_sgsn = false; the_pcu->bssgp.bctx->ra_id.mcc = spoof_mcc ? : mcc; if (spoof_mnc) { the_pcu->bssgp.bctx->ra_id.mnc = spoof_mnc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 Gerrit-Change-Number: 22946 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 17 04:31:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 17 Feb 2021 04:31:40 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602c9c45ccc8c_6c892abbc860c5f81687612@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 254s] [COMPILING apps/dfu/main.c] [ 254s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 254s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 254s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 255s] Memory region Used Size Region Size %age Used [ 255s] rom: 16580 B 16 KB 101.20% [ 255s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 255s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 255s] collect2: error: ld returned 1 exit status [ 255s] % [ 255s] make[2]: *** [Makefile:234: flash] Error 1 [ 255s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 255s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 255s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 255s] dh_auto_build: error: make -j1 returned exit code 2 [ 255s] make: *** [debian/rules:16: build] Error 25 [ 255s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 255s] ### VM INTERACTION START ### [ 258s] [ 240.669582] sysrq: Power Off [ 258s] [ 240.674451] reboot: Power down [ 258s] ### VM INTERACTION END ### [ 258s] [ 258s] lamb51 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 17 04:31:38 UTC 2021. [ 258s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 17 06:17:24 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 17 Feb 2021 06:17:24 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602cb4fe3d238_6c892abbc860c5f817112b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 171s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 171s] [COMPILING libboard/qmod/source/card_pres.c] [ 171s] [COMPILING libboard/qmod/source/wwan_led.c] [ 171s] [COMPILING libboard/qmod/source/i2c.c] [ 172s] [COMPILING libboard/qmod/source/board_qmod.c] [ 172s] [COMPILING apps/dfu/main.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 172s] Memory region Used Size Region Size %age Used [ 172s] rom: 16588 B 16 KB 101.25% [ 172s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 172s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 172s] collect2: error: ld returned 1 exit status [ 172s] % [ 172s] make[2]: *** [Makefile:234: flash] Error 1 [ 172s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 172s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] dh_auto_build: error: make -j1 returned exit code 2 [ 172s] make: *** [debian/rules:16: build] Error 25 [ 172s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 173s] ### VM INTERACTION START ### [ 176s] [ 164.015722] sysrq: Power Off [ 176s] [ 164.020808] reboot: Power down [ 176s] ### VM INTERACTION END ### [ 176s] [ 176s] lamb54 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 17 06:17:15 UTC 2021. [ 176s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:05:06 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Wed, 17 Feb 2021 12:05:06 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories References: Message-ID: iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... stats: add SIGN/SPEECH assignment subcategories Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bts.c 3 files changed, 142 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/22947/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9a226f5..6b58c7e 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -76,14 +76,26 @@ BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK, BTS_CTR_TS_BORKEN_EV_TEARDOWN, BTS_CTR_ASSIGNMENT_ATTEMPTED, + BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN, + BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH, BTS_CTR_ASSIGNMENT_COMPLETED, + BTS_CTR_ASSIGNMENT_COMPLETED_SIGN, + BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH, BTS_CTR_ASSIGNMENT_STOPPED, + BTS_CTR_ASSIGNMENT_STOPPED_SIGN, + BTS_CTR_ASSIGNMENT_STOPPED_SPEECH, BTS_CTR_ASSIGNMENT_NO_CHANNEL, BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN, BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH, BTS_CTR_ASSIGNMENT_TIMEOUT, + BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN, + BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH, BTS_CTR_ASSIGNMENT_FAILED, + BTS_CTR_ASSIGNMENT_FAILED_SIGN, + BTS_CTR_ASSIGNMENT_FAILED_SPEECH, BTS_CTR_ASSIGNMENT_ERROR, + BTS_CTR_ASSIGNMENT_ERROR_SIGN, + BTS_CTR_ASSIGNMENT_ERROR_SPEECH, BTS_CTR_LOCATION_UPDATE_ACCEPT, BTS_CTR_LOCATION_UPDATE_REJECT, BTS_CTR_LOCATION_UPDATE_DETACH, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 39219a4..df05a8a 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -72,6 +72,19 @@ LOG_ASSIGNMENT(_conn, LOGL_ERROR, "Assignment failed in state %s, cause %s: " fmt "\n", \ osmo_fsm_inst_state_name(fi), gsm0808_cause_name(cause), ## args); \ assignment_count_result(CTR_ASSIGNMENT_ERROR); \ + struct rate_ctr_group *_bts_ctrs = _conn->lchan->ts->trx->bts->bts_ctrs; \ + switch (_conn->lchan->ch_mode_rate.chan_mode) { \ + case GSM48_CMODE_SIGN: \ + rate_ctr_inc(&_bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN]); \ + break; \ + case GSM48_CMODE_SPEECH_V1: \ + case GSM48_CMODE_SPEECH_EFR: \ + case GSM48_CMODE_SPEECH_AMR: \ + rate_ctr_inc(&_bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH]); \ + break; \ + default: \ + break; \ + } \ on_assignment_failure(_conn); \ } while(0) @@ -265,6 +278,20 @@ osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; + switch (conn->lchan->ch_mode_rate.chan_mode) { + case GSM48_CMODE_SIGN: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_COMPLETED_SIGN]); + break; + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH]); + break; + default: + break; + } } static void assignment_fsm_update_id(struct gsm_subscriber_connection *conn) @@ -429,6 +456,20 @@ assignment_count(CTR_ASSIGNMENT_ATTEMPTED); + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; + switch (conn->lchan->ch_mode_rate.chan_mode) { + case GSM48_CMODE_SIGN: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN]); + break; + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH]); + break; + default: + break; + } + fi = osmo_fsm_inst_alloc_child(&assignment_fsm, conn->fi, GSCON_EV_ASSIGNMENT_END); OSMO_ASSERT(fi); conn->assignment.fi = fi; @@ -465,6 +506,18 @@ * the fi will be gone from error handling in there. */ if (conn->assignment.fi) { assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + switch (conn->lchan->ch_mode_rate.chan_mode) { + case GSM48_CMODE_SIGN: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_COMPLETED_SIGN]); + break; + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH]); + break; + default: + break; + } osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); } return; @@ -626,6 +679,19 @@ case ASSIGNMENT_EV_RR_ASSIGNMENT_FAIL: assignment_count_result(CTR_ASSIGNMENT_FAILED); + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; + switch (conn->lchan->ch_mode_rate.chan_mode) { + case GSM48_CMODE_SIGN: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_FAILED_SIGN]); + break; + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_FAILED_SPEECH]); + break; + default: + break; + } assignment_fail(get_cause(data), "Rx RR Assignment Failure"); return; @@ -795,6 +861,19 @@ case ASSIGNMENT_EV_CONN_RELEASING: assignment_count_result(CTR_ASSIGNMENT_STOPPED); + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; + switch (conn->lchan->ch_mode_rate.chan_mode) { + case GSM48_CMODE_SIGN: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_STOPPED_SIGN]); + break; + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_STOPPED_SPEECH]); + break; + default: + break; + } osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, 0); return; @@ -814,7 +893,22 @@ int assignment_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + assignment_count_result(CTR_ASSIGNMENT_TIMEOUT); + + struct rate_ctr_group *bts_ctrs = conn->lchan->ts->trx->bts->bts_ctrs; + switch (conn->lchan->ch_mode_rate.chan_mode) { + case GSM48_CMODE_SIGN: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN]); + break; + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + rate_ctr_inc(&bts_ctrs->ctr[BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH]); + break; + default: + break; + } assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, "Timeout"); return 0; } diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 628d301..548d724 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -938,12 +938,30 @@ [BTS_CTR_ASSIGNMENT_ATTEMPTED] = \ { "assignment:attempted", "Assignment attempts" }, + [BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN] = \ + { "assignment:attempted_sign", + "Assignment of signaling lchan attempts" }, + [BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH] = \ + { "assignment:attempted_speech", + "Assignment of speech lchan attempts" }, [BTS_CTR_ASSIGNMENT_COMPLETED] = \ { "assignment:completed", "Assignment completed" }, + [BTS_CTR_ASSIGNMENT_COMPLETED_SIGN] = \ + { "assignment:completed_sign", + "Assignment of signaling lchan completed" }, + [BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH] = \ + { "assignment:completed_speech", + "Assignment if speech lchan completed" }, [BTS_CTR_ASSIGNMENT_STOPPED] = \ { "assignment:stopped", "Connection ended during Assignment" }, + [BTS_CTR_ASSIGNMENT_STOPPED_SIGN] = \ + { "assignment:stopped_sign", + "Connection ended during signaling lchan Assignment" }, + [BTS_CTR_ASSIGNMENT_STOPPED_SPEECH] = \ + { "assignment:stopped_speech", + "Connection ended during speech lchan Assignment" }, [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = \ { "assignment:no_channel", "Failure to allocate lchan for Assignment" }, @@ -956,12 +974,30 @@ [BTS_CTR_ASSIGNMENT_TIMEOUT] = \ { "assignment:timeout", "Assignment timed out" }, + [BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN] = \ + { "assignment:timeout_sign", + "Assignment of signaling lchan timed out" }, + [BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH] = \ + { "assignment:timeout_speech", + "Assignment of speech lchan timed out" }, [BTS_CTR_ASSIGNMENT_FAILED] = \ { "assignment:failed", "Received Assignment Failure message" }, + [BTS_CTR_ASSIGNMENT_FAILED_SIGN] = \ + { "assignment:failed_sign", + "Received Assignment Failure message on signaling lchan" }, + [BTS_CTR_ASSIGNMENT_FAILED_SPEECH] = \ + { "assignment:failed_speech", + "Received Assignment Failure message on speech lchan" }, [BTS_CTR_ASSIGNMENT_ERROR] = \ { "assignment:error", "Assignment failed for other reason" }, + [BTS_CTR_ASSIGNMENT_ERROR_SIGN] = \ + { "assignment:error_sign", + "Assignment of signaling lchan failed for other reason" }, + [BTS_CTR_ASSIGNMENT_ERROR_SPEECH] = \ + { "assignment:error_speech", + "Assignment of speech lchan failed for other reason" }, [BTS_CTR_LOCATION_UPDATE_ACCEPT] = \ { "location_update:accept", "Location Update Accept" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:07:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 12:07:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 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: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 Gerrit-Change-Number: 22939 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 12:07:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:08:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 12:08:20 +0000 Subject: Change in docker-playground[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22940 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 Gerrit-Change-Number: 22940 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 12:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:11:37 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Wed, 17 Feb 2021 12:11:37 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: iedemam has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... stats: add SIGN/SPEECH assignment subcategories Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bts.c 3 files changed, 142 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/22947/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:12:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 12:12:28 +0000 Subject: Change in libosmocore[master]: gprs_ns2: ensure no duplicate UDP NSVC can be created In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22944 ) Change subject: gprs_ns2: ensure no duplicate UDP NSVC can be created ...................................................................... Patch Set 1: Code-Review+1 Not sure if we want to print a vty message or simply make it a no-op in that case. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 Gerrit-Change-Number: 22944 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 12:12:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:17:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 12:17:22 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c at 102 PS2, Line 102: #define assignment_count_result(counter) do { \ did you think about extending this one with a "chan_mode" param and do the rate_ctr_inc only once here? as in ##counter_SIGN and ##counter_SPEECH or alike. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 12:17:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 12:45:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 12:45:53 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22800 to look at the new patch set (#3). Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... gsm: Introduce API osmo_gsm48_rest_octets_si13_decode Related: SYS#5358 Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb --- M include/osmocom/gsm/gsm48_rest_octets.h M src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm48/rest_octets_test.c A tests/gsm48/rest_octets_test.ok M tests/testsuite.at 7 files changed, 249 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/22800/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 13:03:18 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Wed, 17 Feb 2021 13:03:18 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... Patch Set 2: (1 comment) Hi, Thanks for the review. Let me know if it's clearer (and worth it) to refactor underlying macros. -Michael https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c at 102 PS2, Line 102: #define assignment_count_result(counter) do { \ > did you think about extending this one with a "chan_mode" param and do the rate_ctr_inc only once he [?] If that's preferable, I can rework the underlying macros as I had to do for ASSIGNMENT_ERROR. I wanted to leave as much alone as possible. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 13:03:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 13:10:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 13:10:39 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c at 102 PS2, Line 102: #define assignment_count_result(counter) do { \ > If that's preferable, I can rework the underlying macros as I had to do for ASSIGNMENT_ERROR. [?] I would at least give it a try if you don't mind, I fear otherwise we are filling lots of code with counter related switch-case everywhere and makes it harder to spot non-counter stuff. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 13:10:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 13:42:08 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 17 Feb 2021 13:42:08 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 17 Feb 2021 13:42:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 14:03:43 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 17 Feb 2021 14:03:43 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Feb 2021 14:03:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 14:03:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 17 Feb 2021 14:03:53 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: use epoch from debian/changelog In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22922 ) Change subject: OBS: nightly: use epoch from debian/changelog ...................................................................... OBS: nightly: use epoch from debian/changelog If epoch is used in debian/changelog, prepend it to the version from git-version-gen. Also set the epoch in the spec file. For example, the version in debian/changelog may be 1:0.0.1. The epoch is 1, therefore a 0.0.1.18.b5d18 version from git-version-gen would turn into 1:0.0.1.18.b5d18. Setting epoch=1 is needed for osmo-gbproxy, so apt on debian 10 with the nightly Osmocom repository enabled does not try to install osmo-gbproxy 1.3.0 from the debian repositories instead of 0.0.1 from the Omsocom repository. Related: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version Related: OS#4992 Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 --- M scripts/common-obs.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 24 insertions(+), 5 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Verified diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index 366d72e..edd48df 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -113,6 +113,7 @@ local spec="$oscdir/$name.spec" local tarball local version + local epoch if [ -z "$spec_in" ]; then echo "WARNING: RPM spec missing: $name.spec.in" @@ -123,9 +124,19 @@ osmo_obs_add_depend_rpm "$spec" "$name" "$depend" "$dependver" - # Set version - version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)" - sed -i "s/^Version:.*/Version: $version/g" "$spec" + # Set version and epoch from "Version: [EPOCH:]VERSION" in .dsc + version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2- | xargs)" + case $version in + *:*) + epoch=$(echo "$version" | cut -d : -f 1) + version=$(echo "$version" | cut -d : -f 2) + ;; + esac + if [ -n "$epoch" ]; then + sed -i "s/^Version:.*/Version: $version\nEpoch: $epoch/g" "$spec" + else + sed -i "s/^Version:.*/Version: $version/g" "$spec" + fi # Set source file tarball="$(ls -1 "${name}_"*".tar."*)" diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index d8338ae..c90ed2f 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -70,9 +70,17 @@ version=$(echo "$version" | sed 's/-/./g' ) # deb version + deb_version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') if [ -z "$version" ] || [ "$version" = "UNKNOWN" ]; then - version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') - version="$version.$DT" + version="$deb_version.$DT" + else + # add epoch from debian/changelog + case $deb_version in + *:*) + epoch=$(echo "$deb_version" | cut -d : -f 1) + version=$epoch:$version + ;; + esac fi echo -n "$version" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 Gerrit-Change-Number: 22922 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 15:14:13 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Wed, 17 Feb 2021 15:14:13 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 to look at the new patch set (#3). Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... stats: add SIGN/SPEECH assignment subcategories Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bts.c 3 files changed, 64 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/22947/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 15:18:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 15:18:15 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... Patch Set 3: Code-Review+1 That looks much better imho, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 15:18:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 15:18:53 2021 From: gerrit-no-reply at lists.osmocom.org (iedemam) Date: Wed, 17 Feb 2021 15:18:53 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... Patch Set 3: (1 comment) Hi, Much cleaner now I think. All switch()ing is now done within assignment_count(). There is, however, a special case for BTS_CTR_ASSIGNMENT_NO_CHANNEL as chan_mode is not available in lchan but only in the unfulfilled request. -Michael https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22947/2/src/osmo-bsc/assignment_fsm.c at 102 PS2, Line 102: #define assignment_count_result(counter) do { \ > I would at least give it a try if you don't mind, I fear otherwise we are filling lots of code with [?] Pushed in patchset 3. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 15:18:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:08:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:08:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: Implement SystemInformation13 Rest Octets types In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 to look at the new patch set (#2). Change subject: WIP: Implement SystemInformation13 Rest Octets types ...................................................................... WIP: Implement SystemInformation13 Rest Octets types Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 --- M bsc/BSC_Tests.ttcn M library/GSM_RestOctets.ttcn M library/GSM_SystemInformation.ttcn M library/RLCMAC_CSN1_Types.ttcn 4 files changed, 134 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/22802/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:08:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:08:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Implement SystemInformation13 Rest Octets types In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 to look at the new patch set (#3). Change subject: Implement SystemInformation13 Rest Octets types ...................................................................... Implement SystemInformation13 Rest Octets types Related: SYS#5358 Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 --- M bsc/BSC_Tests.ttcn M library/GSM_RestOctets.ttcn M library/GSM_SystemInformation.ttcn M library/RLCMAC_CSN1_Types.ttcn 4 files changed, 134 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/22802/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:11:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:11:28 +0000 Subject: Change in osmo-bsc[master]: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22799 ) Change subject: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS ...................................................................... Patch Set 2: -Code-Review Fixed with latest version of https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 Gerrit-Change-Number: 22799 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 16:11:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:15:19 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 17 Feb 2021 16:15:19 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Feb 2021 16:15:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:16:24 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 17 Feb 2021 16:16:24 +0000 Subject: Change in osmo-bsc[master]: stats: add SIGN/SPEECH assignment subcategories In-Reply-To: References: Message-ID: daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22947 ) Change subject: stats: add SIGN/SPEECH assignment subcategories ...................................................................... stats: add SIGN/SPEECH assignment subcategories Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bts.c 3 files changed, 64 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9a226f5..6b58c7e 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -76,14 +76,26 @@ BTS_CTR_TS_BORKEN_EV_PDCH_DEACT_ACK_NACK, BTS_CTR_TS_BORKEN_EV_TEARDOWN, BTS_CTR_ASSIGNMENT_ATTEMPTED, + BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN, + BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH, BTS_CTR_ASSIGNMENT_COMPLETED, + BTS_CTR_ASSIGNMENT_COMPLETED_SIGN, + BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH, BTS_CTR_ASSIGNMENT_STOPPED, + BTS_CTR_ASSIGNMENT_STOPPED_SIGN, + BTS_CTR_ASSIGNMENT_STOPPED_SPEECH, BTS_CTR_ASSIGNMENT_NO_CHANNEL, BTS_CTR_ASSIGNMENT_NO_CHANNEL_SIGN, BTS_CTR_ASSIGNMENT_NO_CHANNEL_SPEECH, BTS_CTR_ASSIGNMENT_TIMEOUT, + BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN, + BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH, BTS_CTR_ASSIGNMENT_FAILED, + BTS_CTR_ASSIGNMENT_FAILED_SIGN, + BTS_CTR_ASSIGNMENT_FAILED_SPEECH, BTS_CTR_ASSIGNMENT_ERROR, + BTS_CTR_ASSIGNMENT_ERROR_SIGN, + BTS_CTR_ASSIGNMENT_ERROR_SPEECH, BTS_CTR_LOCATION_UPDATE_ACCEPT, BTS_CTR_LOCATION_UPDATE_REJECT, BTS_CTR_LOCATION_UPDATE_DETACH, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 39219a4..2f241e3 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -82,8 +82,23 @@ bsc_ctr_description[BSC_##counter].name, \ bsc_ctr_description[BSC_##counter].description); \ rate_ctr_inc(&conn->network->bsc_ctrs->ctr[BSC_##counter]); \ - if (bts) \ + if (bts) { \ rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter]); \ + if (BTS_##counter != BTS_CTR_ASSIGNMENT_NO_CHANNEL) { \ + switch (conn->lchan->ch_mode_rate.chan_mode) { \ + case GSM48_CMODE_SIGN: \ + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter##_SIGN]); \ + break; \ + case GSM48_CMODE_SPEECH_V1: \ + case GSM48_CMODE_SPEECH_EFR: \ + case GSM48_CMODE_SPEECH_AMR: \ + rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_##counter##_SPEECH]); \ + break; \ + default: \ + break; \ + } \ + } \ + } \ } while(0) #define assignment_count_result(counter) do { \ diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 628d301..548d724 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -938,12 +938,30 @@ [BTS_CTR_ASSIGNMENT_ATTEMPTED] = \ { "assignment:attempted", "Assignment attempts" }, + [BTS_CTR_ASSIGNMENT_ATTEMPTED_SIGN] = \ + { "assignment:attempted_sign", + "Assignment of signaling lchan attempts" }, + [BTS_CTR_ASSIGNMENT_ATTEMPTED_SPEECH] = \ + { "assignment:attempted_speech", + "Assignment of speech lchan attempts" }, [BTS_CTR_ASSIGNMENT_COMPLETED] = \ { "assignment:completed", "Assignment completed" }, + [BTS_CTR_ASSIGNMENT_COMPLETED_SIGN] = \ + { "assignment:completed_sign", + "Assignment of signaling lchan completed" }, + [BTS_CTR_ASSIGNMENT_COMPLETED_SPEECH] = \ + { "assignment:completed_speech", + "Assignment if speech lchan completed" }, [BTS_CTR_ASSIGNMENT_STOPPED] = \ { "assignment:stopped", "Connection ended during Assignment" }, + [BTS_CTR_ASSIGNMENT_STOPPED_SIGN] = \ + { "assignment:stopped_sign", + "Connection ended during signaling lchan Assignment" }, + [BTS_CTR_ASSIGNMENT_STOPPED_SPEECH] = \ + { "assignment:stopped_speech", + "Connection ended during speech lchan Assignment" }, [BTS_CTR_ASSIGNMENT_NO_CHANNEL] = \ { "assignment:no_channel", "Failure to allocate lchan for Assignment" }, @@ -956,12 +974,30 @@ [BTS_CTR_ASSIGNMENT_TIMEOUT] = \ { "assignment:timeout", "Assignment timed out" }, + [BTS_CTR_ASSIGNMENT_TIMEOUT_SIGN] = \ + { "assignment:timeout_sign", + "Assignment of signaling lchan timed out" }, + [BTS_CTR_ASSIGNMENT_TIMEOUT_SPEECH] = \ + { "assignment:timeout_speech", + "Assignment of speech lchan timed out" }, [BTS_CTR_ASSIGNMENT_FAILED] = \ { "assignment:failed", "Received Assignment Failure message" }, + [BTS_CTR_ASSIGNMENT_FAILED_SIGN] = \ + { "assignment:failed_sign", + "Received Assignment Failure message on signaling lchan" }, + [BTS_CTR_ASSIGNMENT_FAILED_SPEECH] = \ + { "assignment:failed_speech", + "Received Assignment Failure message on speech lchan" }, [BTS_CTR_ASSIGNMENT_ERROR] = \ { "assignment:error", "Assignment failed for other reason" }, + [BTS_CTR_ASSIGNMENT_ERROR_SIGN] = \ + { "assignment:error_sign", + "Assignment of signaling lchan failed for other reason" }, + [BTS_CTR_ASSIGNMENT_ERROR_SPEECH] = \ + { "assignment:error_speech", + "Assignment of speech lchan failed for other reason" }, [BTS_CTR_LOCATION_UPDATE_ACCEPT] = \ { "location_update:accept", "Location Update Accept" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I73f4dab6edb0951180f2bbcfc352ff34de647679 Gerrit-Change-Number: 22947 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:28:31 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 17 Feb 2021 16:28:31 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Feb 2021 16:28:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:28:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:28:58 +0000 Subject: Change in osmo-trx[master]: Threads.cpp: Use already existing gettid wrapper function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/22948 ) Change subject: Threads.cpp: Use already existing gettid wrapper function ...................................................................... Threads.cpp: Use already existing gettid wrapper function A wrapper function with better support already exists in debug.c and announced in debug.h. Let's use that one instead. Related: OS#5027 Change-Id: I2ccf94f95a531d5873da2a4681cf89cbc5b31422 --- M CommonLibs/Threads.cpp 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/48/22948/1 diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index 020d94e..d8dab57 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -32,12 +32,6 @@ #include "Timeval.h" #include "Logger.h" -#ifndef gettid -#include -#define gettid() syscall(SYS_gettid) -#endif - - using namespace std; #ifndef HAVE_ATOMIC_OPS @@ -114,7 +108,7 @@ void set_selfthread_name(const char *name) { pthread_t selfid = pthread_self(); - pid_t tid = gettid(); + pid_t tid = my_gettid(); if (pthread_setname_np(selfid, name) == 0) { LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccf94f95a531d5873da2a4681cf89cbc5b31422 Gerrit-Change-Number: 22948 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:56:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:56:06 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22949 ) Change subject: Introduce osmo_gettid() API ...................................................................... Introduce osmo_gettid() API This API wraps conventional gettid() linux-specific API, which even in Linux itself is sometimes not properly supported/announced. This API also allows future porting to other platforms if needed, and so far falls back to getpid() if no gettid(9 can be found. Related: OS#5027 Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 --- M configure.ac M include/Makefile.am A include/osmocom/core/thread.h M src/Makefile.am A src/thread.c 5 files changed, 105 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22949/1 diff --git a/configure.ac b/configure.ac index 2a6a180..f5af0d0 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,16 @@ CHECK_TM_INCLUDES_TM_GMTOFF +# Check if gettid is available (despite not being documented in glibc doc, +# it requires __USE_GNU on some systems) +# C compiler is used since __USE_GNU seems to be always defined for g++. +save_CPPFLAGS=$CPPFLAGS +AC_LANG_PUSH(C) +CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" +AC_CHECK_FUNCS([gettid]) +AC_LANG_POP(C) +CPPFLAGS=$save_CPPFLAGS + dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0: ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG diff --git a/include/Makefile.am b/include/Makefile.am index 8dae3d9..f0742d5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -53,6 +53,7 @@ osmocom/core/strrb.h \ osmocom/core/talloc.h \ osmocom/core/tdef.h \ + osmocom/core/thread.h \ osmocom/core/timer.h \ osmocom/core/timer_compat.h \ osmocom/core/utils.h \ diff --git a/include/osmocom/core/thread.h b/include/osmocom/core/thread.h new file mode 100644 index 0000000..40b5436 --- /dev/null +++ b/include/osmocom/core/thread.h @@ -0,0 +1,33 @@ +/*! \file thread.h + * Compatibility header with some thread related helpers + */ +/* + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/*! \defgroup thread Osmocom thread helpers + * @{ + * \file thread.h */ + +#pragma once + +#include + +pid_t osmo_gettid(void); diff --git a/src/Makefile.am b/src/Makefile.am index a2566a3..e56b57e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,6 +25,7 @@ conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ isdnhdlc.c \ tdef.c \ + thread.c \ sockaddr_str.c \ use_count.c \ exec.c \ diff --git a/src/thread.c b/src/thread.c new file mode 100644 index 0000000..956fee7 --- /dev/null +++ b/src/thread.c @@ -0,0 +1,60 @@ +/* + * (C) 2021 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/*! \addtogroup thread + * @{ + * \file thread.c + */ + +/*! \file thread.c + */ + +#include "config.h" + +/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */ +#if HAVE_GETTID +#define _GNU_SOURCE +#endif +#include +#include + +#include + +/*! Wrapper around Linux's gettid() to make it easily accessible on different system versions. + * If the gettid() API cannot be found, it will use the syscall directly if + * available. If no syscall is found available, then getpid() is called as + * fallback. See 'man 2 gettid' for further and details information. + * \returns This call is always successful and returns returns the thread ID of + * the calling thread (or the process ID of the current process if + * gettid() or its syscall are unavailable in the system). + */ +pid_t osmo_gettid(void) +{ +#if HAVE_GETTID + return gettid(); +#elif defined(LINUX) && defined(__NR_gettid) + return (pid_t) syscall(__NR_gettid); +#else + #pragma message ("use pid as tid") + return getpid(); +#endif +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:58:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:58:06 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/22949 ) Change subject: Introduce osmo_gettid() API ...................................................................... Introduce osmo_gettid() API This API wraps conventional gettid() linux-specific API, which even in Linux itself is sometimes not properly supported/announced. This API also allows future porting to other platforms if needed, and so far falls back to getpid() if no gettid(9 can be found. Related: OS#5027 Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 --- M configure.ac M include/Makefile.am A include/osmocom/core/thread.h M src/Makefile.am A src/thread.c 5 files changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22949/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 16:59:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 16:59:46 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/libosmocore/+/22949 ) Change subject: Introduce osmo_gettid() API ...................................................................... Introduce osmo_gettid() API This API wraps conventional gettid() linux-specific API, which even in Linux itself is sometimes not properly supported/announced. This API also allows future porting to other platforms if needed, and so far falls back to getpid() if no gettid(9 can be found. Code ported from osmo-trx.git, see commit 7a07de1efd4eb7cc11c33d3ad25cb2df70aa1ef1. Related: OS#5027 Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 --- M configure.ac M include/Makefile.am A include/osmocom/core/thread.h M src/Makefile.am A src/thread.c 5 files changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22949/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 17:24:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 17:24:29 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22949 to look at the new patch set (#4). Change subject: Introduce osmo_gettid() API ...................................................................... Introduce osmo_gettid() API This API wraps conventional gettid() linux-specific API, which even in Linux itself is sometimes not properly supported/announced. This API also allows future porting to other platforms if needed, and so far falls back to getpid() if no gettid(9 can be found. Code ported from osmo-trx.git, see commit 7a07de1efd4eb7cc11c33d3ad25cb2df70aa1ef1. Related: OS#5027 Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 --- M configure.ac M include/Makefile.am A include/osmocom/core/thread.h M src/Makefile.am A src/thread.c 5 files changed, 105 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22949/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 17:27:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 17:27:53 +0000 Subject: Change in osmo-trx[master]: Replace my_gettid with libosmocore osmo_gettid API References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/22950 ) Change subject: Replace my_gettid with libosmocore osmo_gettid API ...................................................................... Replace my_gettid with libosmocore osmo_gettid API The API was moved to libosmocore, let's use it instead of defining our own here with all the complexity in build system involved. Depends: libosmocore.git Change-Id Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Related: OS#5027 Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd --- M CommonLibs/Threads.cpp M CommonLibs/debug.c M CommonLibs/debug.h M TODO-RELEASE M configure.ac 5 files changed, 7 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/50/22950/1 diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index d8dab57..b3ff52f 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -32,6 +32,8 @@ #include "Timeval.h" #include "Logger.h" +#include + using namespace std; #ifndef HAVE_ATOMIC_OPS @@ -108,7 +110,7 @@ void set_selfthread_name(const char *name) { pthread_t selfid = pthread_self(); - pid_t tid = my_gettid(); + pid_t tid = osmo_gettid(); if (pthread_setname_np(selfid, name) == 0) { LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name; } else { diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 7ee8184..08954f5 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -21,18 +21,6 @@ * See the COPYING file in the main directory for details. */ -#include "config.h" - -/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */ -#if HAVE_GETTID -#define _GNU_SOURCE -#endif - -#include -#include -#include -#include "config.h" - #include #include #include "debug.h" @@ -93,15 +81,3 @@ .cat = default_categories, .num_cat = ARRAY_SIZE(default_categories), }; - -pid_t my_gettid(void) -{ -#if HAVE_GETTID - return gettid(); -#elif defined(LINUX) && defined(__NR_gettid) - return (pid_t) syscall(__NR_gettid); -#else - #pragma message ("use pid as tid") - return getpid(); -#endif -} diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index dd78168..ddb5c75 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -1,9 +1,9 @@ #pragma once #include -#include #include +#include extern const struct log_info log_info; @@ -19,12 +19,10 @@ DCTR, }; -pid_t my_gettid(void); - #define CLOGC(category, level, fmt, args...) do { \ - LOGP(category, level, "[tid=%ld] " fmt, (long int) my_gettid(), ##args); \ + LOGP(category, level, "[tid=%ld] " fmt, (long int) osmo_gettid(), ##args); \ } while(0) #define CLOGCHAN(chan, category, level, fmt, args...) do { \ - LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) my_gettid(), chan, ##args); \ + LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) osmo_gettid(), chan, ##args); \ } while(0) diff --git a/TODO-RELEASE b/TODO-RELEASE index 84ecf22..c916fb1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,3 +1,4 @@ * update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread() * update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. * update libosmocore dependency to > 1.4.x for osmo_fd_{read,write}_{enable,disable}() +* update libosmocore dependency to > 1.4.2 for osmo_gettid() diff --git a/configure.ac b/configure.ac index 7f6aef7..8067fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -82,15 +82,6 @@ AC_HEADER_TIME AC_C_BIGENDIAN -# Check if gettid is available (despite not being documented in glibc doc, it requires __USE_GNU on some systems) -# C compiler is used since __USE_GNU seems to be always defined for g++. -save_CPPFLAGS=$CPPFLAGS -AC_LANG_PUSH(C) -CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" -AC_CHECK_FUNCS([gettid]) -AC_LANG_POP(C) -CPPFLAGS=$save_CPPFLAGS - PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd Gerrit-Change-Number: 22950 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 17:52:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 17:52:44 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fix fill PID field not stored in network byte order References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22951 ) Change subject: logging: gsmtap: Fix fill PID field not stored in network byte order ...................................................................... logging: gsmtap: Fix fill PID field not stored in network byte order Recent commit filling this field forgot to convert it to network byte order. Related: OS#5027 Fixes: bb149ecda21a4f9b102245ffc6a2870592d32c0b Change-Id: I50857f35cb28138fa6f28100afeaa00f492f303a --- M src/logging_gsmtap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/22951/1 diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index 8947c5d..0524602 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -157,7 +157,7 @@ target->raw_output = _gsmtap_raw_output; if (!logging_gsmtap_pid) - logging_gsmtap_pid = (uint32_t)getpid(); + osmo_store32be((uint32_t)getpid(), &logging_gsmtap_pid); return target; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50857f35cb28138fa6f28100afeaa00f492f303a Gerrit-Change-Number: 22951 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 18:00:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 18:00:47 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Store TID instead of PID in pkt hdr References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22952 ) Change subject: logging: gsmtap: Store TID instead of PID in pkt hdr ...................................................................... logging: gsmtap: Store TID instead of PID in pkt hdr This allows differentiating threads withing an application, while still keeping same numbering for single-threaded application (since first thread ID is always the same as the process group ID). Related: OS#5027 Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81 --- M src/logging_gsmtap.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/22952/1 diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index 0524602..e190f88 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -51,10 +51,11 @@ #include #include #include +#include #define GSMTAP_LOG_MAX_SIZE 4096 -static uint32_t logging_gsmtap_pid; +static __thread uint32_t logging_gsmtap_tid; static void _gsmtap_raw_output(struct log_target *target, int subsys, unsigned int level, const char *file, @@ -85,7 +86,9 @@ /* Logging header */ golh = (struct gsmtap_osmocore_log_hdr *) msgb_put(msg, sizeof(*golh)); OSMO_STRLCPY_ARRAY(golh->proc_name, target->tgt_gsmtap.ident); - golh->pid = logging_gsmtap_pid; + if (logging_gsmtap_tid == 0) + osmo_store32be((uint32_t)osmo_gettid(), &logging_gsmtap_tid); + golh->pid = logging_gsmtap_tid; if (subsys_name) OSMO_STRLCPY_ARRAY(golh->subsys, subsys_name + 1); else @@ -156,9 +159,6 @@ target->type = LOG_TGT_TYPE_GSMTAP; target->raw_output = _gsmtap_raw_output; - if (!logging_gsmtap_pid) - osmo_store32be((uint32_t)getpid(), &logging_gsmtap_pid); - return target; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81 Gerrit-Change-Number: 22952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 19:26:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 17 Feb 2021 19:26:37 +0000 Subject: Change in osmo-pcu[master]: vty: Write 'neighbor resolution' config to file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22953 ) Change subject: vty: Write 'neighbor resolution' config to file ...................................................................... vty: Write 'neighbor resolution' config to file Fixes: c0a250d17d79e08763f77cdf58e970dc2e65e7d3 Related: SYS#4909 Change-Id: I44eef3826939e05ba88e0c5a67e1fef535582ba7 --- M src/pcu_vty.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/22953/1 diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 6db8b05..92ff8eb 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -250,6 +250,11 @@ else vty_out(vty, " gb-dialect classic%s", VTY_NEWLINE); + if (the_pcu->vty.neigh_ctrl_addr) { + vty_out(vty, " neighbor resolution %s %u%s", + the_pcu->vty.neigh_ctrl_addr, the_pcu->vty.neigh_ctrl_port, VTY_NEWLINE); + } + osmo_tdef_vty_write(vty, the_pcu->T_defs, " timer "); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I44eef3826939e05ba88e0c5a67e1fef535582ba7 Gerrit-Change-Number: 22953 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 20:37:56 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Feb 2021 20:37:56 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 to look at the new patch set (#3). Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... l1sap: Store status of SRR in an lchan struct memeber The MS sets the SRR bit in the L1 SACCH header to request DL-SACCH repetition from the BTS. At the moment we access the l1_info stored in tle lchan struct each time we want to check the status of the SRR bit. However, it is more convinient to do this once at reception and store the status of the status of the flag in a separate struct member. Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Related: SYS#5114 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/28/22928/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 20:37:56 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 17 Feb 2021 20:37:56 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 to look at the new patch set (#4). Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... l1sap: add logging and VTY introspection for ACCH repetition At the moment osmo-bts is not looging much ACCH repetition related information. This makes testing ACCH repetition difficult. Lets add some debug output that informs the user when ACCH repetition is turned on or off. Lets also add an ACCH repetition status display to the show lchan VTY command. Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Related: SYS#5114 --- M src/common/l1sap.c M src/common/vty.c 2 files changed, 89 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/22888/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 17 23:30:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 17 Feb 2021 23:30:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Implement SystemInformation13 Rest Octets types In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 ) Change subject: Implement SystemInformation13 Rest Octets types ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802/3/library/GSM_RestOctets.ttcn File library/GSM_RestOctets.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802/3/library/GSM_RestOctets.ttcn at 715 PS3, Line 715: TODO Is there anything missing? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 17 Feb 2021 23:30:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:04:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 00:04:26 +0000 Subject: Change in osmo-pcu[master]: vty: Write 'neighbor resolution' config to file In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22953 ) Change subject: vty: Write 'neighbor resolution' config to file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I44eef3826939e05ba88e0c5a67e1fef535582ba7 Gerrit-Change-Number: 22953 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 00:04:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:06:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 00:06:09 +0000 Subject: Change in osmo-trx[master]: Threads.cpp: Use already existing gettid wrapper function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22948 ) Change subject: Threads.cpp: Use already existing gettid wrapper function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccf94f95a531d5873da2a4681cf89cbc5b31422 Gerrit-Change-Number: 22948 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 00:06:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:09:46 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 00:09:46 +0000 Subject: Change in osmo-trx[master]: Replace my_gettid with libosmocore osmo_gettid API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22950 ) Change subject: Replace my_gettid with libosmocore osmo_gettid API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd Gerrit-Change-Number: 22950 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 00:09:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:11:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 00:11:39 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22949 ) Change subject: Introduce osmo_gettid() API ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 00:11:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:12:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 00:12:36 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fix fill PID field not stored in network byte order In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22951 ) Change subject: logging: gsmtap: Fix fill PID field not stored in network byte order ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50857f35cb28138fa6f28100afeaa00f492f303a Gerrit-Change-Number: 22951 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 00:12:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:12:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 00:12:59 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Store TID instead of PID in pkt hdr In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22952 ) Change subject: logging: gsmtap: Store TID instead of PID in pkt hdr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81 Gerrit-Change-Number: 22952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 00:12:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:33:54 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 18 Feb 2021 00:33:54 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Set FSM pointer to NULL when changing BTS Type There is an OSMO_ASSERT check for !bts->rbs2000.bts_fi in om2k_bts_fsm_alloc() so (re)set the pointer to NULL when changing BTS type from the vty, before calling the FSM Allocate. Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 --- M src/osmo-bsc/bts.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/22954/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 548d724..dc897f0 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -507,6 +507,9 @@ model->started = true; } + if (bts->type == GSM_BTS_TYPE_RBS2000) + bts->rbs2000.bts_fi = NULL; + if (model->bts_init) { int rc = model->bts_init(bts); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:35:30 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 18 Feb 2021 00:35:30 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Set FSM pointer to NULL when changing BTS Type There is an OSMO_ASSERT check for !bts->rbs2000.bts_fi in om2k_bts_fsm_alloc() so (re)set the pointer to NULL when changing BTS type from the vty, before calling the FSM Allocate. Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 --- M src/osmo-bsc/bts.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/22954/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:39:07 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 18 Feb 2021 00:39:07 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Set FSM pointer to NULL when changing BTS Type There is an OSMO_ASSERT check for !bts->rbs2000.bts_fi in om2k_bts_fsm_alloc(), so (re)set the pointer to NULL before calling abis_om2k_bts_init() and atteppting to allocate the FSM. Otherwise we will hit the ASSERT when changing the BTS type from the vty. Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 --- M src/osmo-bsc/bts.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/22954/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:50:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:50:48 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Patch Set 3: I don't really think that this was ever suppored (changing the BTS model at runtime). Setting the field to NULL may be leaking memory, not sure if that's all the better... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 00:50:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:51:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:51:23 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22949 ) Change subject: Introduce osmo_gettid() API ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 00:51:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:52:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:52:16 +0000 Subject: Change in libosmocore[master]: Introduce osmo_gettid() API In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22949 ) Change subject: Introduce osmo_gettid() API ...................................................................... Introduce osmo_gettid() API This API wraps conventional gettid() linux-specific API, which even in Linux itself is sometimes not properly supported/announced. This API also allows future porting to other platforms if needed, and so far falls back to getpid() if no gettid(9 can be found. Code ported from osmo-trx.git, see commit 7a07de1efd4eb7cc11c33d3ad25cb2df70aa1ef1. Related: OS#5027 Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 --- M configure.ac M include/Makefile.am A include/osmocom/core/thread.h M src/Makefile.am A src/thread.c 5 files changed, 105 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 2a6a180..f5af0d0 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,16 @@ CHECK_TM_INCLUDES_TM_GMTOFF +# Check if gettid is available (despite not being documented in glibc doc, +# it requires __USE_GNU on some systems) +# C compiler is used since __USE_GNU seems to be always defined for g++. +save_CPPFLAGS=$CPPFLAGS +AC_LANG_PUSH(C) +CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" +AC_CHECK_FUNCS([gettid]) +AC_LANG_POP(C) +CPPFLAGS=$save_CPPFLAGS + dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7.3.0: ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG diff --git a/include/Makefile.am b/include/Makefile.am index 8dae3d9..f0742d5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -53,6 +53,7 @@ osmocom/core/strrb.h \ osmocom/core/talloc.h \ osmocom/core/tdef.h \ + osmocom/core/thread.h \ osmocom/core/timer.h \ osmocom/core/timer_compat.h \ osmocom/core/utils.h \ diff --git a/include/osmocom/core/thread.h b/include/osmocom/core/thread.h new file mode 100644 index 0000000..40b5436 --- /dev/null +++ b/include/osmocom/core/thread.h @@ -0,0 +1,33 @@ +/*! \file thread.h + * Compatibility header with some thread related helpers + */ +/* + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/*! \defgroup thread Osmocom thread helpers + * @{ + * \file thread.h */ + +#pragma once + +#include + +pid_t osmo_gettid(void); diff --git a/src/Makefile.am b/src/Makefile.am index a2566a3..e56b57e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,6 +25,7 @@ conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ isdnhdlc.c \ tdef.c \ + thread.c \ sockaddr_str.c \ use_count.c \ exec.c \ diff --git a/src/thread.c b/src/thread.c new file mode 100644 index 0000000..956fee7 --- /dev/null +++ b/src/thread.c @@ -0,0 +1,60 @@ +/* + * (C) 2021 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/*! \addtogroup thread + * @{ + * \file thread.c + */ + +/*! \file thread.c + */ + +#include "config.h" + +/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */ +#if HAVE_GETTID +#define _GNU_SOURCE +#endif +#include +#include + +#include + +/*! Wrapper around Linux's gettid() to make it easily accessible on different system versions. + * If the gettid() API cannot be found, it will use the syscall directly if + * available. If no syscall is found available, then getpid() is called as + * fallback. See 'man 2 gettid' for further and details information. + * \returns This call is always successful and returns returns the thread ID of + * the calling thread (or the process ID of the current process if + * gettid() or its syscall are unavailable in the system). + */ +pid_t osmo_gettid(void) +{ +#if HAVE_GETTID + return gettid(); +#elif defined(LINUX) && defined(__NR_gettid) + return (pid_t) syscall(__NR_gettid); +#else + #pragma message ("use pid as tid") + return getpid(); +#endif +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Gerrit-Change-Number: 22949 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:52:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:52:17 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Fix fill PID field not stored in network byte order In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22951 ) Change subject: logging: gsmtap: Fix fill PID field not stored in network byte order ...................................................................... logging: gsmtap: Fix fill PID field not stored in network byte order Recent commit filling this field forgot to convert it to network byte order. Related: OS#5027 Fixes: bb149ecda21a4f9b102245ffc6a2870592d32c0b Change-Id: I50857f35cb28138fa6f28100afeaa00f492f303a --- M src/logging_gsmtap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index 8947c5d..0524602 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -157,7 +157,7 @@ target->raw_output = _gsmtap_raw_output; if (!logging_gsmtap_pid) - logging_gsmtap_pid = (uint32_t)getpid(); + osmo_store32be((uint32_t)getpid(), &logging_gsmtap_pid); return target; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50857f35cb28138fa6f28100afeaa00f492f303a Gerrit-Change-Number: 22951 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:52:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:52:17 +0000 Subject: Change in libosmocore[master]: logging: gsmtap: Store TID instead of PID in pkt hdr In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22952 ) Change subject: logging: gsmtap: Store TID instead of PID in pkt hdr ...................................................................... logging: gsmtap: Store TID instead of PID in pkt hdr This allows differentiating threads withing an application, while still keeping same numbering for single-threaded application (since first thread ID is always the same as the process group ID). Related: OS#5027 Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81 --- M src/logging_gsmtap.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/logging_gsmtap.c b/src/logging_gsmtap.c index 0524602..e190f88 100644 --- a/src/logging_gsmtap.c +++ b/src/logging_gsmtap.c @@ -51,10 +51,11 @@ #include #include #include +#include #define GSMTAP_LOG_MAX_SIZE 4096 -static uint32_t logging_gsmtap_pid; +static __thread uint32_t logging_gsmtap_tid; static void _gsmtap_raw_output(struct log_target *target, int subsys, unsigned int level, const char *file, @@ -85,7 +86,9 @@ /* Logging header */ golh = (struct gsmtap_osmocore_log_hdr *) msgb_put(msg, sizeof(*golh)); OSMO_STRLCPY_ARRAY(golh->proc_name, target->tgt_gsmtap.ident); - golh->pid = logging_gsmtap_pid; + if (logging_gsmtap_tid == 0) + osmo_store32be((uint32_t)osmo_gettid(), &logging_gsmtap_tid); + golh->pid = logging_gsmtap_tid; if (subsys_name) OSMO_STRLCPY_ARRAY(golh->subsys, subsys_name + 1); else @@ -156,9 +159,6 @@ target->type = LOG_TGT_TYPE_GSMTAP; target->raw_output = _gsmtap_raw_output; - if (!logging_gsmtap_pid) - osmo_store32be((uint32_t)getpid(), &logging_gsmtap_pid); - return target; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I33da02524fc064e133b2b762af7060139c4cfd81 Gerrit-Change-Number: 22952 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:52:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:52:35 +0000 Subject: Change in osmo-trx[master]: Threads.cpp: Use already existing gettid wrapper function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22948 ) Change subject: Threads.cpp: Use already existing gettid wrapper function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccf94f95a531d5873da2a4681cf89cbc5b31422 Gerrit-Change-Number: 22948 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 00:52:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:52:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:52:39 +0000 Subject: Change in osmo-trx[master]: Threads.cpp: Use already existing gettid wrapper function In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22948 ) Change subject: Threads.cpp: Use already existing gettid wrapper function ...................................................................... Threads.cpp: Use already existing gettid wrapper function A wrapper function with better support already exists in debug.c and announced in debug.h. Let's use that one instead. Related: OS#5027 Change-Id: I2ccf94f95a531d5873da2a4681cf89cbc5b31422 --- M CommonLibs/Threads.cpp 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index 020d94e..d8dab57 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -32,12 +32,6 @@ #include "Timeval.h" #include "Logger.h" -#ifndef gettid -#include -#define gettid() syscall(SYS_gettid) -#endif - - using namespace std; #ifndef HAVE_ATOMIC_OPS @@ -114,7 +108,7 @@ void set_selfthread_name(const char *name) { pthread_t selfid = pthread_self(); - pid_t tid = gettid(); + pid_t tid = my_gettid(); if (pthread_setname_np(selfid, name) == 0) { LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2ccf94f95a531d5873da2a4681cf89cbc5b31422 Gerrit-Change-Number: 22948 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:53:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:53:15 +0000 Subject: Change in osmo-pcu[master]: vty: Write 'neighbor resolution' config to file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22953 ) Change subject: vty: Write 'neighbor resolution' config to file ...................................................................... vty: Write 'neighbor resolution' config to file Fixes: c0a250d17d79e08763f77cdf58e970dc2e65e7d3 Related: SYS#4909 Change-Id: I44eef3826939e05ba88e0c5a67e1fef535582ba7 --- M src/pcu_vty.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 6db8b05..92ff8eb 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -250,6 +250,11 @@ else vty_out(vty, " gb-dialect classic%s", VTY_NEWLINE); + if (the_pcu->vty.neigh_ctrl_addr) { + vty_out(vty, " neighbor resolution %s %u%s", + the_pcu->vty.neigh_ctrl_addr, the_pcu->vty.neigh_ctrl_port, VTY_NEWLINE); + } + osmo_tdef_vty_write(vty, the_pcu->T_defs, " timer "); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I44eef3826939e05ba88e0c5a67e1fef535582ba7 Gerrit-Change-Number: 22953 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:53:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:53:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Implement SystemInformation13 Rest Octets types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 ) Change subject: Implement SystemInformation13 Rest Octets types ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 18 Feb 2021 00:53:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:54:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:54:30 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 18 Feb 2021 00:54:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:54:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:54:33 +0000 Subject: Change in libosmocore[master]: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22800 ) Change subject: gsm: Introduce API osmo_gsm48_rest_octets_si13_decode ...................................................................... gsm: Introduce API osmo_gsm48_rest_octets_si13_decode Related: SYS#5358 Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb --- M include/osmocom/gsm/gsm48_rest_octets.h M src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm48/rest_octets_test.c A tests/gsm48/rest_octets_test.ok M tests/testsuite.at 7 files changed, 249 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h index 8f143be..f295824 100644 --- a/include/osmocom/gsm/gsm48_rest_octets.h +++ b/include/osmocom/gsm/gsm48_rest_octets.h @@ -120,7 +120,8 @@ uint8_t prio_acc_thr; }; -/* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ +/* Parse/Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ +int osmo_gsm48_rest_octets_si13_decode(struct osmo_gsm48_si13_info *si13, const uint8_t *data); int osmo_gsm48_rest_octets_si13_encode(uint8_t *data, const struct osmo_gsm48_si13_info *si13); /* Parse SI3 Rest Octets */ diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c index 1bab8e0..77fd349 100644 --- a/src/gsm/gsm48_rest_octets.c +++ b/src/gsm/gsm48_rest_octets.c @@ -749,6 +749,119 @@ return bv.data_len; } + +static unsigned int decode_t3192(unsigned int t3192) +{ + /* See also 3GPP TS 44.060 + Table 12.24.2: GPRS Cell Options information element details */ + static const unsigned int decode_t3192_tbl[8] = {500, 1000, 1500, 0, 80, 120, 160, 200}; + OSMO_ASSERT(t3192 <= 7); + return decode_t3192_tbl[t3192]; +} + +static unsigned int decode_drx_timer(unsigned int drx) +{ + static const unsigned int decode_drx_timer_tbl[8] = {0, 1, 2, 4, 8, 16, 32, 64}; + OSMO_ASSERT(drx <= 7); + return decode_drx_timer_tbl[drx]; +} + +static int decode_gprs_cell_opt(struct osmo_gprs_cell_options *gco, struct bitvec *bv) +{ + gco->nmo = bitvec_get_uint(bv, 2); + gco->t3168 = (bitvec_get_uint(bv, 3) + 1) * 500; + gco->t3192 = decode_t3192(bitvec_get_uint(bv, 3)); + gco->drx_timer_max = decode_drx_timer(bitvec_get_uint(bv, 3)); + + /* ACCESS_BURST_TYPE: */ + bitvec_get_uint(bv, 1); + /* CONTROL_ACK_TYPE: */ + gco->ctrl_ack_type_use_block = bitvec_get_uint(bv, 1); + gco->bs_cv_max = bitvec_get_uint(bv, 4); + + if (bitvec_get_uint(bv, 1)) { + bitvec_get_uint(bv, 3); /* DEC */ + bitvec_get_uint(bv, 3); /* INC */ + bitvec_get_uint(bv, 3); /* MAX */ + } + + if (bitvec_get_uint(bv, 1)) { + int ext_len = bitvec_get_uint(bv, 6); + if (ext_len < 0) + return ext_len; + unsigned int cur_bit = bv->cur_bit; + /* Extension Information */ + /* R99 extension: */ + gco->ext_info.egprs_supported = bitvec_get_uint(bv, 1); + if (gco->ext_info.egprs_supported) { + gco->ext_info.use_egprs_p_ch_req = !bitvec_get_uint(bv, 1); + gco->ext_info.bep_period = bitvec_get_uint(bv, 4); + } + gco->ext_info.pfc_supported = bitvec_get_uint(bv, 1); + gco->ext_info.dtm_supported = bitvec_get_uint(bv, 1); + gco->ext_info.bss_paging_coordination = bitvec_get_uint(bv, 1); + /* REL-4 extension: */ + gco->ext_info.ccn_active = bitvec_get_uint(bv, 1); + bitvec_get_uint(bv, 1); /* NW_EXT_UTBF */ + bv->cur_bit = cur_bit + ext_len + 1; + } + return 0; +} + +static void decode_gprs_pwr_ctrl_pars(struct osmo_gprs_power_ctrl_pars *pcp, struct bitvec *bv) +{ + pcp->alpha = bitvec_get_uint(bv, 4); + pcp->t_avg_w = bitvec_get_uint(bv,5); + pcp->t_avg_t = bitvec_get_uint(bv, 5); + pcp->pc_meas_chan = bitvec_get_uint(bv, 1); + pcp->n_avg_i = bitvec_get_uint(bv, 4); +} + +/*! Decode SI13 Rest Octests (04.08 Chapter 10.5.2.37b). + * \param[out] si13 decoded SI13 rest octets + * \param[in] encoded SI13 rest octets + * \returns parsed bits on success, negative on error */ +int osmo_gsm48_rest_octets_si13_decode(struct osmo_gsm48_si13_info *si13, const uint8_t *data) +{ + struct osmo_gprs_cell_options *co = &si13->cell_opts; + struct osmo_gprs_power_ctrl_pars *pcp = &si13->pwr_ctrl_pars; + struct bitvec bv; + int rc; + + memset(&bv, 0, sizeof(bv)); + bv.data = (uint8_t *) data; + bv.data_len = 20; + + memset(si13, 0, sizeof(*si13)); + + + if (bitvec_get_bit_high(&bv) == H) { + si13->bcch_change_mark = bitvec_get_uint(&bv, 3); + si13->si_change_field = bitvec_get_uint(&bv, 4); + if (bitvec_get_uint(&bv, 1)) { + si13->bcch_change_mark = bitvec_get_uint(&bv, 2); + /* FIXME: implement parsing GPRS Mobile Allocation IE */ + return -ENOTSUP; + } + if (bitvec_get_uint(&bv, 1)) { + /* PBCCH present in cell */ + /* FIXME: parse not implemented */ + return -ENOTSUP; + } else { + /* PBCCH not present in cell */ + si13->rac = bitvec_get_uint(&bv, 8); + si13->spgc_ccch_sup = bitvec_get_uint(&bv, 1); + si13->prio_acc_thr = bitvec_get_uint(&bv, 3); + si13->net_ctrl_ord = bitvec_get_uint(&bv, 2); + if ((rc = decode_gprs_cell_opt(co, &bv)) < 0) + return rc; + + decode_gprs_pwr_ctrl_pars(pcp, &bv); + } + } + return bv.cur_bit; +} + /* GPRS Mobile Allocation as per TS 04.60 Chapter 12.10a: < GPRS Mobile Allocation IE > ::= < HSN : bit (6) > diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index efa23e6..0ea0678 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -320,6 +320,7 @@ osmo_gsm48_rest_octets_si6_encode; osmo_gsm48_rest_octets_si3_encode; osmo_gsm48_rest_octets_si4_encode; +osmo_gsm48_rest_octets_si13_decode; osmo_gsm48_rest_octets_si13_encode; osmo_gsm48_rest_octets_si3_decode; osmo_gsm48_rest_octets_si4_decode; diff --git a/tests/Makefile.am b/tests/Makefile.am index 10306aa..158bc69 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,6 +42,7 @@ bsslap/bsslap_test \ bssmap_le/bssmap_le_test \ it_q/it_q_test \ + gsm48/rest_octets_test \ $(NULL) if ENABLE_MSGFILE @@ -139,6 +140,9 @@ gsm0408_gsm0408_test_SOURCES = gsm0408/gsm0408_test.c gsm0408_gsm0408_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +gsm48_rest_octets_test_SOURCES = gsm48/rest_octets_test.c +gsm48_rest_octets_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la + gprs_gprs_test_SOURCES = gprs/gprs_test.c gprs_gprs_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la @@ -399,6 +403,7 @@ bsslap/bsslap_test.ok \ bssmap_le/bssmap_le_test.ok \ it_q/it_q_test.ok \ + gsm48/rest_octets_test.ok \ $(NULL) if ENABLE_LIBSCTP diff --git a/tests/gsm48/rest_octets_test.c b/tests/gsm48/rest_octets_test.c new file mode 100644 index 0000000..beff6e4 --- /dev/null +++ b/tests/gsm48/rest_octets_test.c @@ -0,0 +1,120 @@ +/* + * (C) 2021 by sysmocom - s.m.f.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include + +#include +#include + +struct si13_test { + const char *name; + const struct osmo_gsm48_si13_info si; + int enc_rc; + int dec_rc; + void (*post_dec_cb)(const struct si13_test *test, const struct osmo_gsm48_si13_info* dec); +}; + +void post_dec_cb_test_alpha(const struct si13_test *test, const struct osmo_gsm48_si13_info* dec) +{ + OSMO_ASSERT(test->si.pwr_ctrl_pars.alpha == dec->pwr_ctrl_pars.alpha); +} + +static const struct si13_test test_si13_arr[] = { + { + .name = "test alpha", + .si = { + .cell_opts = { + .nmo = GPRS_NMO_II, + .t3168 = 2000, + .t3192 = 1500, + .drx_timer_max = 3, + .bs_cv_max = 15, + .ctrl_ack_type_use_block = true, + .ext_info_present = 0, + .ext_info = { + .egprs_supported = 1, + .use_egprs_p_ch_req = 1, + .bep_period = 5, + .pfc_supported = 0, + .dtm_supported = 0, + .bss_paging_coordination = 0, + .ccn_active = true, + }, + }, + .pwr_ctrl_pars = { + .alpha = 5, + .t_avg_w = 16, + .t_avg_t = 16, + .pc_meas_chan = 0, + .n_avg_i = 8, + }, + .bcch_change_mark = 1, + .si_change_field = 0, + .rac = 0x03, + .spgc_ccch_sup = 0, + .net_ctrl_ord = 0, + .prio_acc_thr = 6, + }, + .enc_rc = 20, + .dec_rc = 71, + .post_dec_cb = post_dec_cb_test_alpha, + }, +}; + +static void test_si13() +{ + int i, rc; + uint8_t data[GSM_MACBLOCK_LEN]; + struct osmo_gsm48_si13_info si13; + + for (i = 0; i < ARRAY_SIZE(test_si13_arr); i++) { + memset(data, 0, sizeof(data)); + rc = osmo_gsm48_rest_octets_si13_encode(data, &test_si13_arr[i].si); + if (rc >= 0) { + printf("si13_encode (%d): %s\n", rc, osmo_hexdump(data, rc)); + } else { + printf("si13_encode failed (%d)\n", rc); + } + OSMO_ASSERT(rc == test_si13_arr[i].enc_rc); + if (rc <= 0) + continue; + memset(&si13, 0 , sizeof(si13)); + rc = osmo_gsm48_rest_octets_si13_decode(&si13, data); + if (rc >= 0) { + printf("si13_decode (%d)\n", rc); + } else { + printf("si13_decode failed (%d)\n", rc); + } + OSMO_ASSERT(rc == test_si13_arr[i].dec_rc); + if (test_si13_arr[i].post_dec_cb) { + test_si13_arr[i].post_dec_cb(&test_si13_arr[i], &si13); + } + } +} + +int main(int argc, char **argv) +{ + test_si13(); + + return EXIT_SUCCESS; +} diff --git a/tests/gsm48/rest_octets_test.ok b/tests/gsm48/rest_octets_test.ok new file mode 100644 index 0000000..54204f2 --- /dev/null +++ b/tests/gsm48/rest_octets_test.ok @@ -0,0 +1,2 @@ +si13_encode (20): 90 00 d8 5a 6f c9 e5 84 10 ab 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +si13_decode (71) diff --git a/tests/testsuite.at b/tests/testsuite.at index d715a3e..d2a10dd 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -156,6 +156,12 @@ AT_CHECK([$abs_top_builddir/tests/gsm0408/gsm0408_test], [0], [expout], [ignore]) AT_CLEANUP +AT_SETUP([gsm48_rest_octets]) +AT_KEYWORDS([gsm48_rest_octets]) +cat $abs_srcdir/gsm48/rest_octets_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/gsm48/rest_octets_test], [0], [expout], [ignore]) +AT_CLEANUP + AT_SETUP([gprs]) AT_KEYWORDS([gprs]) cat $abs_srcdir/gprs/gprs_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I74fb0a3afc1ac4aadbfc609b882d929401f790eb Gerrit-Change-Number: 22800 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:56:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:56:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Implement SystemInformation13 Rest Octets types In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 ) Change subject: Implement SystemInformation13 Rest Octets types ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 18 Feb 2021 00:56:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:56:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:56:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Implement SystemInformation13 Rest Octets types In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 ) Change subject: Implement SystemInformation13 Rest Octets types ...................................................................... Implement SystemInformation13 Rest Octets types Related: SYS#5358 Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 --- M bsc/BSC_Tests.ttcn M library/GSM_RestOctets.ttcn M library/GSM_SystemInformation.ttcn M library/RLCMAC_CSN1_Types.ttcn 4 files changed, 134 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 52b4906..dc94b74 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -165,8 +165,7 @@ SI2quaterRestOctetsList si2quater optional, SystemInformationType3 si3 optional, SystemInformationType4 si4 optional, - /* TODO: replace with proper decoding of SI13, implement SI13 in GSM_SystemInformation.ttcn */ - octetstring si13 optional, + SystemInformationType13 si13 optional, SystemInformationType5 si5 optional, SystemInformationType5bis si5bis optional, SystemInformationType5ter si5ter optional, @@ -371,7 +370,44 @@ s := omit } }, - si13 := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O, + si13 := { + rest_octets := { + presence := '1'B, + bcch_change_mark := ?, + si_change_field := '0000'B, + presence2 := '0'B, + si13_change_mark := omit, + gprs_ma := omit, + zero := '0'B, /* PBCCH not present in cell */ + rac := 0, + spgc_ccch_sup := '0'B, + priority_access_thr := '110'B, + network_control_order := '00'B, + gprs_cell_opts := { + nmo := '01'B, + t3168 := '011'B, + t3192 := '010'B, + drx_timer_max := '011'B, + access_burst_type := '0'B, + control_ack_type := '1'B, + bs_cv_max := 15, + pan_presence := '1'B, + pan_dec := 1, + pan_inc := 1, + pan_max := '111'B, + ext_info_presence := ?, + ext_info_length := *, + ext_info := * + }, + gprs_pwr_ctrl_params := { + alpha := 0, + t_avg_w := '10000'B, + t_avg_t := '10000'B, + pc_meas_chan := '0'B, + n_avg_i := '1000'B + } + } + }, si5 := { bcch_freq_list := '10000000000000000000000000000000'O }, @@ -480,7 +516,7 @@ if (not isbound(data)) { si.si13 := omit; } else { - si.si13 := dec_SystemInformation(data).payload.other; + si.si13 := dec_SystemInformation(data).payload.si13; } } else { handled := false; diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index d47e510..9aa1217 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from Osmocom_Types all; +import from RLCMAC_CSN1_Types all; /* 10.5.2.33b SI 2quater Rest Octets */ type record SI2quaterRestOctets { @@ -692,6 +693,34 @@ variant "PADDING(yes), PADDING_PATTERN('00101011'B)" }; +/* 10.5.2.37b SI 13 Rest Octets (O & S) */ +type record SI13RestOctets { + BIT1 presence, // L/H + uint3_t bcch_change_mark, + BIT4 si_change_field, + BIT1 presence2, + BIT2 si13_change_mark optional, + GprsMobileAllocation gprs_ma optional, + BIT1 zero ('0'B), /* PBCCH not present in cell */ + uint8_t rac, + BIT1 spgc_ccch_sup, + BIT3 priority_access_thr, + BIT2 network_control_order, + GprsCellOptions gprs_cell_opts, + GprsPowerControlParameters gprs_pwr_ctrl_params + /* TODO: Additions in release 99 */ +} with { + + variant (presence) "CSN.1 L/H" + /* TODO: for all fields after presencte: variant () "PRESENCE(presence = '1'B)" */ + variant (si13_change_mark) "PRESENCE(presence2 = '1'B)" + variant (gprs_ma) "PRESENCE(presence2 = '1'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + /* Selection Parameters */ type record SelectionParams { boolean cbq, @@ -777,6 +806,11 @@ external function dec_SI4RestOctets(in octetstring stream) return SI4RestOctets with { extension "prototype(convert) decode(RAW)" }; +external function enc_SI13RestOctets(in SI13RestOctets ro) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_SI13RestOctets(in octetstring stream) return SI13RestOctets + with { extension "prototype(convert) decode(RAW)" }; + /* Basic templates to be extended in place */ template (value) SI3RestOctets ts_SI3RestOctets := { diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 85abb7f..0356e7d 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -196,6 +196,11 @@ RestOctets rest_octets length(0..7) } with { variant "" }; + /* 44.018 9.1.43a */ + type record SystemInformationType13 { + SI13RestOctets rest_octets + } with { variant "" }; + type union SystemInformationUnion { SystemInformationType1 si1, SystemInformationType2 si2, @@ -208,6 +213,7 @@ SystemInformationType5bis si5bis, SystemInformationType5ter si5ter, SystemInformationType6 si6, + SystemInformationType13 si13, octetstring other } with { variant "" }; @@ -225,6 +231,7 @@ si5bis, header.message_type = SYSTEM_INFORMATION_TYPE_5bis; si5ter, header.message_type = SYSTEM_INFORMATION_TYPE_5ter; si6, header.message_type = SYSTEM_INFORMATION_TYPE_6; + si13, header.message_type = SYSTEM_INFORMATION_TYPE_13; other, OTHERWISE; )" }; diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index af8b8d6..0dd8a8b 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -929,7 +929,7 @@ }; type record FreqDirect1 { uint6_t maio, - GprsMobileAllication mobile_allocation + GprsMobileAllocation mobile_allocation } type record FreqDirect2 { uint6_t maio, @@ -953,6 +953,15 @@ variant (direct2) "PRESENCE(presence = '11'B)" }; + /* 12.9a GPRS Power Control Parameters */ + type record GprsPowerControlParameters { + uint4_t alpha, + BIT5 t_avg_w, + BIT5 t_avg_t, + BIT1 pc_meas_chan, + BIT4 n_avg_i + }; + /* 12.10 Global TFI */ type record GlobalTfi { boolean is_dl_tfi, @@ -967,7 +976,7 @@ } with { variant (rfl_number_list) "PRESENCE(presence = '1'B)" }; - type record GprsMobileAllication { + type record GprsMobileAllocation { uint6_t hsn, BIT1 rfl_number_list_present, RflNumberList rfl_number_list optional, @@ -1036,6 +1045,48 @@ variant (relative_k) "PRESENCE(presence = '1'B)" }; + /* 12.24 GPRS Cell Options */ + type record ExtensionInformation { + BIT1 egprs_supported, + BIT1 egprs_pkt_channel_req optional, + BIT4 bep_period optional, + BIT1 pfc_feature_mode, + BIT1 dtm_support, + BIT1 bss_paging_coordination, + /* REL-4 extension */ + BIT1 ccn_active optional, + BIT1 nw_ext_utbf optional + /* TODO: REL-6 extension */ + /* TODO: REL-7 extension */ + /* TODO: REL-10 extension */ + } with { + variant (egprs_pkt_channel_req) "PRESENCE(egprs_supported = '1'B)" + variant (bep_period) "PRESENCE(egprs_supported = '1'B)" + }; + type record GprsCellOptions { + BIT2 nmo, + BIT3 t3168, + BIT3 t3192, + BIT3 drx_timer_max, + BIT1 access_burst_type, + BIT1 control_ack_type, + uint4_t bs_cv_max, + BIT1 pan_presence, + uint3_t pan_dec optional, + uint3_t pan_inc optional, + BIT3 pan_max optional, + BIT1 ext_info_presence, + BIT6 ext_info_length optional, + ExtensionInformation ext_info optional + } with { + variant (pan_dec) "PRESENCE(pan_presence = '1'B)" + variant (pan_inc) "PRESENCE(pan_presence = '1'B)" + variant (pan_max) "PRESENCE(pan_presence = '1'B)" + variant (ext_info_length) "PRESENCE(ext_info_presence = '1'B)" + variant (ext_info) "PRESENCE(ext_info_presence = '1'B)" + /* TODO: mark REL-4 and upwards in ext_info as omit based on ext_info_length ? */ + }; + /* 3GPP TS 44.060, table 11.2.5a.2 "EGPRS PACKET CHANNEL REQUEST" */ type union EGPRSPktChRequest { EGPRSPktChRequest_MC5P2RB3 one_phase, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802 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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 Gerrit-Change-Number: 22802 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:56:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:56:13 +0000 Subject: Change in osmo-bsc[master]: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22799 ) Change subject: SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS ...................................................................... SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS The EGPRS bits are anyway conditionally enabled by egprs_supported. Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 094c35e..fae1355 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1296,10 +1296,10 @@ switch (bts->gprs.mode) { case BTS_GPRS_EGPRS: - si13_default.cell_opts.ext_info_present = 1; si13_default.cell_opts.ext_info.egprs_supported = 1; /* fallthrough */ case BTS_GPRS_GPRS: + si13_default.cell_opts.ext_info_present = 1; si_info.gprs_ind.present = 1; break; case BTS_GPRS_NONE: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie7a438419eb416ce3d29794febab5f952661e5c5 Gerrit-Change-Number: 22799 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:56:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:56:42 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 ) Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 18 Feb 2021 00:56:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:57:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:57:02 +0000 Subject: Change in osmo-gbproxy[master]: Add SDU length for an NSE (== BSSGP PDU size) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 ) Change subject: Add SDU length for an NSE (== BSSGP PDU size) ...................................................................... Add SDU length for an NSE (== BSSGP PDU size) Prepare tracking the SDU from NS. Initialize with a conservative default. The value is not yet updated, that will happen in a later patch. Related: OS#4889 Depends: I5016b295db6185ec131d83089cf6c806e34ef1b6 (libosmocore.git) Depends: I9bb82ead27366b7370c9ff968e03ca2113ec11f0 (libosmocore.git) Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e --- M include/osmocom/sgsn/gb_proxy.h M src/gb_proxy.c M src/gb_proxy_peer.c M src/gb_proxy_vty.c 4 files changed, 13 insertions(+), 0 deletions(-) Approvals: lynxis lazus: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index a36f305..c9d2fca 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -21,6 +22,9 @@ #define GBPROXY_INIT_VU_GEN_TX 256 #define GBPROXY_MAX_NR_SGSN 16 +/* Set conservative default BSSGP SDU (FR SDU - size of NS UNITDATA IEs) */ +#define DEFAULT_NSE_SDU (FRAME_RELAY_SDU - 4) + /* BVCI uses 16 bits */ #define BVC_LOG_CTX_FLAG (1<<17) @@ -161,6 +165,9 @@ /* NSEI of the NSE */ uint16_t nsei; + /* Maximum side of the NS-UNITDATA NS SDU that can be transported by the NSE */ + uint16_t max_sdu_len; + /* Are we facing towards a SGSN (true) or BSS (false) */ bool sgsn_facing; diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 8b57315..7f4af5b 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -684,6 +684,7 @@ sgsn_bvc->fi = bssgp_bvc_fsm_alloc_ptp_bss(sgsn_bvc, cfg->nsi, sgsn_nse->nsei, bvci, ra_id, cell_id); OSMO_ASSERT(sgsn_bvc->fi); + bssgp_bvc_fsm_set_max_pdu_len(sgsn_bvc->fi, sgsn_nse->max_sdu_len); bssgp_bvc_fsm_set_ops(sgsn_bvc->fi, &sgsn_ptp_bvc_fsm_ops, sgsn_bvc); gbproxy_cell_add_sgsn_bvc(bvc->cell, sgsn_bvc); @@ -828,6 +829,7 @@ gbproxy_bvc_free(from_bvc); return -ENOMEM; } + bssgp_bvc_fsm_set_max_pdu_len(from_bvc->fi, nse->max_sdu_len); bssgp_bvc_fsm_set_ops(from_bvc->fi, &bss_sig_bvc_fsm_ops, from_bvc); } } else { @@ -844,6 +846,7 @@ gbproxy_bvc_free(from_bvc); return -ENOMEM; } + bssgp_bvc_fsm_set_max_pdu_len(from_bvc->fi, nse->max_sdu_len); bssgp_bvc_fsm_set_ops(from_bvc->fi, &bss_ptp_bvc_fsm_ops, from_bvc); } #if 0 @@ -1500,6 +1503,7 @@ { /* TODO: bss nsei available/unavailable bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_BLOCK, nsvc->nsei, bvc->bvci, 0); * TODO: sgsn nsei available/unavailable + * TODO: Update MTU */ struct gbproxy_bvc *bvc; diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 27d73b8..a9471f0 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -447,6 +447,7 @@ return NULL; nse->nsei = nsei; + nse->max_sdu_len = DEFAULT_NSE_SDU; nse->cfg = cfg; nse->sgsn_facing = sgsn_facing; diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index 04c7173..3a52e32 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -241,6 +241,7 @@ bvc->fi = bssgp_bvc_fsm_alloc_sig_bss(bvc, nse->cfg->nsi, nsei, features); if (!bvc->fi) goto free_bvc; + bssgp_bvc_fsm_set_max_pdu_len(bvc->fi, nse->max_sdu_len); bssgp_bvc_fsm_set_ops(bvc->fi, &sgsn_sig_bvc_fsm_ops, bvc); osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ic1080abde942ec5a2ae7cdee0ffe716a2fbddb1e Gerrit-Change-Number: 22877 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 00:57:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 00:57:04 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Use bssgp2_enc_status when sending STATUS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 ) Change subject: gbproxy: Use bssgp2_enc_status when sending STATUS ...................................................................... gbproxy: Use bssgp2_enc_status when sending STATUS bssgp_tx_status() is not aware of the MTU and cannot truncate the PDU if needed. Use the newer bssgp2_enc_status() which supports truncating the PDU. Related: OS#4889 Depends: Ic39d918c56399ceb0431299ce938e3bf276f678a (libosmocore.git) Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 --- M src/gb_proxy.c 1 file changed, 66 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 7f4af5b..78e1e1d 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -84,9 +84,25 @@ static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_bvc *bvc, uint16_t ns_bvci); +int tx_status(struct gbproxy_nse *nse, uint16_t ns_bvci, enum gprs_bssgp_cause cause, const uint16_t *bvci, const struct msgb *old_msg) +{ + int rc; -/* generate BVC-STATUS message with cause value derived from TLV-parser error */ -static int tx_status_from_tlvp(enum osmo_tlv_parser_error tlv_p_err, struct msgb *orig_msg) + struct msgb *msg = bssgp2_enc_status(cause, bvci, old_msg, nse->max_sdu_len); + if (!msg) { + LOGPNSE(nse, LOGL_NOTICE, "Unable to encode STATUS message\n"); + return -ENOMEM; + } + + rc = bssgp2_nsi_tx_ptp(nse->cfg->nsi, nse->nsei, ns_bvci, msg, 0); + if (rc < 0) + LOGPNSE(nse, LOGL_NOTICE, "Unable to send STATUS message\n"); + return rc; +} + +/* generate BVC-STATUS mess +age with cause value derived from TLV-parser error */ +static int tx_status_from_tlvp(struct gbproxy_nse *nse, enum osmo_tlv_parser_error tlv_p_err, struct msgb *orig_msg) { uint8_t bssgp_cause; switch (tlv_p_err) { @@ -96,7 +112,7 @@ default: bssgp_cause = BSSGP_CAUSE_PROTO_ERR_UNSPEC; } - return bssgp_tx_status(bssgp_cause, NULL, orig_msg); + return tx_status(nse, msgb_bvci(orig_msg), bssgp_cause, NULL, orig_msg); } /* strip off the NS header */ @@ -380,31 +396,31 @@ if (ns_bvci == 0 || ns_bvci == 1) { LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not PTP\n", log_pfx, ns_bvci); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_PTP)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in PTP BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_UL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in uplink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } bss_bvc = gbproxy_bvc_by_bvci(nse, ns_bvci); if (!bss_bvc) { LOGP(DGPRS, LOGL_NOTICE, "%s %s - Didn't find BVC for PTP message, discarding\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); } /* UL_UNITDATA has a different header than all other uplink PDUs */ if (bgph->pdu_type == BSSGP_PDUT_UL_UNITDATA) { const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg); if (msgb_bssgp_len(msg) < sizeof(*budh)) - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data, msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx); /* populate TLLI from the fixed headser into the TLV-parsed array so later code @@ -417,7 +433,7 @@ } if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); - return tx_status_from_tlvp(rc, msg); + return tx_status_from_tlvp(nse, rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ msgb_bcid(msg) = (void *)&tp; @@ -505,17 +521,17 @@ if (ns_bvci == 0 || ns_bvci == 1) { LOGP(DGPRS, LOGL_NOTICE, "%s BVCI is not PTP\n", log_pfx); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_PTP)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in PTP BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_DL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } sgsn_bvc = gbproxy_bvc_by_bvci(nse, ns_bvci); @@ -523,20 +539,20 @@ LOGP(DGPRS, LOGL_NOTICE, "%s %s - Didn't find BVC for for PTP message, discarding\n", log_pfx, pdut_name); rate_ctr_inc(&nse->cfg->ctrg-> ctr[GBPROX_GLOB_CTR_INV_BVCI]); - return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ns_bvci, msg); } if (!bssgp_bvc_fsm_is_unblocked(sgsn_bvc->fi)) { LOGPBVC(sgsn_bvc, LOGL_NOTICE, "Rx %s: Dropping on blocked BVC\n", pdut_name); rate_ctr_inc(&sgsn_bvc->ctrg->ctr[GBPROX_PEER_CTR_DROPPED]); - return bssgp_tx_status(BSSGP_CAUSE_BVCI_BLOCKED, &ns_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_BVCI_BLOCKED, &ns_bvci, msg); } /* DL_UNITDATA has a different header than all other uplink PDUs */ if (bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) { const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg); if (msgb_bssgp_len(msg) < sizeof(*budh)) - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data, msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx); /* populate TLLI from the fixed headser into the TLV-parsed array so later code @@ -549,7 +565,7 @@ } if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); - return tx_status_from_tlvp(rc, msg); + return tx_status_from_tlvp(nse, rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ msgb_bcid(msg) = (void *)&tp; @@ -858,7 +874,7 @@ if (!nse_new) { LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) Got PtP BVC reset before signalling reset for " "BVCI=%05u\n", bvci, nsei); - bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_STATE, NULL, msg); + tx_status(nse, ns_bvci, BSSGP_CAUSE_PDU_INCOMP_STATE, NULL, msg); return 0; } @@ -895,25 +911,26 @@ int rc; char ri_src_str[64]; char ri_dest_str[64]; + uint16_t ns_bvci = msgb_bvci(msg); rc = bssgp_parse_rim_ri(&dest_ri, TLVP_VAL(&tp[0], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Since gbproxy is 2G only we do not expect to get RIM messages only from GERAN cells. */ if (src_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { LOGP(DGPRS, LOGL_ERROR, "%s %s source RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* Lookup source cell to make sure that the source RIM routing information actually belongs @@ -922,7 +939,7 @@ if (!src_cell) { LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for source RIM routing info (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* TODO: Use bssgp_bvc_get_features_negotiated(src_cell->bss_bvc->fi) to check if the the BSS sided BVC actually @@ -952,7 +969,7 @@ LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot route RIM message (%s to %s) since no RIM capable SGSN is found!\n", log_pfx, pdut_name, bssgp_rim_ri_name(&src_ri), bssgp_rim_ri_name(&dest_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } LOGP(DLBSSGP, LOGL_DEBUG, "%s %s relaying to SGSN(%05u/%s) RIM-PDU: src=%s, dest=%s\n", log_pfx, pdut_name, sgsn->nse->nsei, sgsn->name, @@ -982,24 +999,24 @@ if (ns_bvci != 0 && ns_bvci != 1) { LOGP(DGPRS, LOGL_NOTICE, "%s %s BVCI=%05u is not signalling\n", log_pfx, pdut_name, ns_bvci); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_UL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in uplink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]); - return tx_status_from_tlvp(rc, msg); + return tx_status_from_tlvp(nse, rc, msg); } /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */ msgb_bcid(msg) = (void *)tp; @@ -1082,7 +1099,7 @@ osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); nse = gbproxy_nse_by_imsi(nse->cfg, mi.imsi); if (!nse) { - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } OSMO_ASSERT(nse->sgsn_facing); rc = gbprox_relay2nse(msg, nse, 0); @@ -1097,7 +1114,7 @@ err_no_bvc: LOGPNSE(nse, LOGL_ERROR, "Rx %s: cannot find BVC for BVCI=%05u\n", pdut_name, ptp_bvci); rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_NSEI]); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Receive paging request from SGSN, we need to relay to proper BSS */ @@ -1201,7 +1218,7 @@ if (!from_bvc) { LOGPNSE(nse, LOGL_ERROR, "Rx BVC-RESET BVCI=%05u: Cannot find BVC\n", ptp_bvci); rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_INV_BVCI]); - return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &ptp_bvci, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKNOWN_BVCI, &ptp_bvci, msg); } osmo_fsm_inst_dispatch(from_bvc->fi, BSSGP_BVCFSM_E_RX_RESET, msg); } @@ -1220,6 +1237,7 @@ int rc; char ri_src_str[64]; char ri_dest_str[64]; + uint16_t ns_bvci = msgb_bvci(msg); /* TODO: Reply with STATUS if BSSGP didn't negotiate RIM feature, see also comments in gbprox_rx_rim_from_bss() */ @@ -1228,20 +1246,20 @@ TLVP_LEN(&tp[0], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse destination RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } rc = bssgp_parse_rim_ri(&src_ri, TLVP_VAL(&tp[1], BSSGP_IE_RIM_ROUTING_INFO), TLVP_LEN(&tp[1], BSSGP_IE_RIM_ROUTING_INFO)); if (rc < 0) { LOGP(DGPRS, LOGL_ERROR, "%s %s cannot parse source RIM routing info\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Since gbproxy is 2G only we do not expect to get RIM messages that target non-GERAN cells. */ if (dest_ri.discr != BSSGP_RIM_ROUTING_INFO_GERAN) { LOGP(DGPRS, LOGL_ERROR, "%s %s destination RIM routing info is not GERAN (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&dest_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* Lookup destination cell */ @@ -1249,7 +1267,7 @@ if (!dest_cell) { LOGP(DGPRS, LOGL_NOTICE, "%s %s cannot find cell for destination RIM routing info (%s)\n", log_pfx, pdut_name, bssgp_rim_ri_name(&dest_ri)); - return bssgp_tx_status(BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_UNKN_RIM_AI, NULL, msg); } /* TODO: Check if the BVC of the destination cell actually did negotiate RIM support, see also comments @@ -1288,17 +1306,17 @@ if (ns_bvci != 0 && ns_bvci != 1) { LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not signalling\n", log_pfx, ns_bvci); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling BVC\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_DL)) { LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink direction\n", log_pfx, pdut_name); - return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); } data_len = msgb_bssgp_len(msg) - sizeof(*bgph); @@ -1306,7 +1324,7 @@ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp, ARRAY_SIZE(tp), pdu_type, bgph->data, data_len, 0, 0, DGPRS, log_pfx); if (rc < 0) { - rc = tx_status_from_tlvp(rc, msg); + rc = tx_status_from_tlvp(nse, rc, msg); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); return rc; } @@ -1396,7 +1414,7 @@ if (!nse_peer) { LOGPNSE(nse, LOGL_ERROR, "Rx %s: Cannot find NSE\n", pdut_name); /* TODO: Counter */ - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } /* Delete the entry after we're done */ gbproxy_tlli_cache_remove(cfg, tlli); @@ -1421,7 +1439,7 @@ default: LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name); rate_ctr_inc(&cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]); - rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); + rc = tx_status(nse, ns_bvci, BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg); break; } @@ -1430,7 +1448,7 @@ err_no_bvc: LOGPNSE(nse, LOGL_ERROR, "Rx %s: Cannot find BVC\n", pdut_name); rate_ctr_inc(&cfg->ctrg-> ctr[GBPROX_GLOB_CTR_INV_RAI]); - return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + return tx_status(nse, ns_bvci, BSSGP_CAUSE_INV_MAND_INF, NULL, msg); } @@ -1462,12 +1480,12 @@ uint16_t nsei = msgb_nsei(msg); struct gbproxy_nse *nse; - /* ensure minimum length to decode PCU type */ - if (msgb_bssgp_len(msg) < sizeof(struct bssgp_normal_hdr)) - return bssgp_tx_status(BSSGP_CAUSE_SEM_INCORR_PDU, NULL, msg); - nse = gbproxy_nse_by_nsei(cfg, nsei, NSE_F_SGSN); if (nse) { + /* ensure minimum length to decode PDU type */ + if (msgb_bssgp_len(msg) < sizeof(struct bssgp_normal_hdr)) + return tx_status(nse, ns_bvci, BSSGP_CAUSE_SEM_INCORR_PDU, NULL, msg); + if (ns_bvci == 0 || ns_bvci == 1) return gbprox_rx_sig_from_sgsn(nse, msg, ns_bvci); else @@ -1480,6 +1498,10 @@ nse = gbproxy_nse_alloc(cfg, nsei, false); } if (nse) { + /* ensure minimum length to decode PDU type */ + if (msgb_bssgp_len(msg) < sizeof(struct bssgp_normal_hdr)) + return tx_status(nse, ns_bvci, BSSGP_CAUSE_SEM_INCORR_PDU, NULL, msg); + if (ns_bvci == 0 || ns_bvci == 1) return gbprox_rx_sig_from_bss(nse, msg, ns_bvci); else -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Id5ddb10385655b339b2a4f04651c1da09b3efb62 Gerrit-Change-Number: 22876 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 01:19:19 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 18 Feb 2021 01:19:19 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Patch Set 3: > Patch Set 3: > > I don't really think that this was ever suppored (changing the BTS model at runtime). Setting the field to NULL may be leaking memory, not sure if that's all the better... OK. My skills on memory leakage being akin to my skill for leaking euros in a bar... I'm not sure what to do, but will try something else. - in gdb by the way, before I set it to null it was set to something unreachable. Config had type sysmobts on startup. I get that one shouldn't be changing BTS type at runtime, but we really don't want a running osmo-bsc to CRASH because the operator typed something in the vty, right? One might actually bring it up with a blank or default config and then try to configure via the vty. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 01:19:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Feb 18 04:03:11 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 18 Feb 2021 04:03:11 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602de71744370_6c892abbc860c5f82098133@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 163s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 163s] [COMPILING libboard/qmod/source/card_pres.c] [ 163s] [COMPILING libboard/qmod/source/wwan_led.c] [ 163s] [COMPILING libboard/qmod/source/i2c.c] [ 163s] [COMPILING libboard/qmod/source/board_qmod.c] [ 164s] [COMPILING apps/dfu/main.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 164s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 164s] Memory region Used Size Region Size %age Used [ 164s] rom: 16588 B 16 KB 101.25% [ 164s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 164s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 164s] collect2: error: ld returned 1 exit status [ 164s] % [ 164s] make[2]: *** [Makefile:234: flash] Error 1 [ 164s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 164s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 164s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 164s] dh_auto_build: error: make -j1 returned exit code 2 [ 164s] make: *** [debian/rules:16: build] Error 25 [ 164s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 164s] ### VM INTERACTION START ### [ 167s] [ 156.027463] sysrq: Power Off [ 167s] [ 156.035409] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb24 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 18 04:02:59 UTC 2021. [ 167s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 18 05:41:07 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 18 Feb 2021 05:41:07 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602dfe105b8a9_6c892abbc860c5f821187d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 157s] [COMPILING apps/dfu/main.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 157s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 157s] Memory region Used Size Region Size %age Used [ 157s] rom: 16580 B 16 KB 101.20% [ 157s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 157s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 157s] collect2: error: ld returned 1 exit status [ 157s] % [ 157s] make[2]: *** [Makefile:234: flash] Error 1 [ 157s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 157s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 157s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 157s] dh_auto_build: error: make -j1 returned exit code 2 [ 157s] make: *** [debian/rules:16: build] Error 25 [ 157s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 157s] ### VM INTERACTION START ### [ 160s] [ 149.958577] sysrq: Power Off [ 160s] [ 149.961591] reboot: Power down [ 161s] ### VM INTERACTION END ### [ 161s] [ 161s] build74 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 18 05:40:52 UTC 2021. [ 161s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Feb 18 07:38:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 07:38:46 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Patch Set 3: > I get that one shouldn't be changing BTS type at runtime, but we really don't want a running osmo-bsc to CRASH because the operator typed something in the vty, right? of course. > One might actually bring it up with a blank or default config and then try to configure via the vty. yes. Probably come up either with a new "undefined" type, have that set at start-up and then only allow undefined -> specific changes via VTY and prevent all further chnages sounds good. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 07:38:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 13:02:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 13:02:58 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix line indentation References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22955 ) Change subject: cosmetic: fix line indentation ...................................................................... cosmetic: fix line indentation Change-Id: Ia8335ce5c005885e4db1864faf775c4bff509c53 --- M src/gprs_rlcmac_sched.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/55/22955/1 diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 5f029a0..b95d779 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -482,7 +482,7 @@ block_nr, poll_fn, tbf_name(tbf_cand.poll)); usf = USF_UNUSED; /* else. check for sba */ -} else if ((sba_fn = bts_sba(bts)->sched(trx, ts, fn, block_nr)) != 0xffffffff) { + } else if ((sba_fn = bts_sba(bts)->sched(trx, ts, fn, block_nr)) != 0xffffffff) { LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d " "TS=%d FN=%d block_nr=%d scheduling free USF for " "single block allocation at FN=%d\n", trx, ts, fn, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia8335ce5c005885e4db1864faf775c4bff509c53 Gerrit-Change-Number: 22955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 13:16:30 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Thu, 18 Feb 2021 13:16:30 +0000 Subject: Change in osmo-msc[master]: gsm_network: drop unused neighbor_list member References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22956 ) Change subject: gsm_network: drop unused neighbor_list member ...................................................................... gsm_network: drop unused neighbor_list member Change-Id: I57463ab94773de1377526f9a1c72fe3d37a31827 --- M include/osmocom/msc/gsm_data.h 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/22956/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 438ee08..1870804 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -230,10 +230,6 @@ struct sccp_ran_inst *sri; } a; - /* A list of neighbor BSCs. This list is defined statically via VTY and does not - * necessarily correspond to BSCs attached to the A interface at a given moment. */ - struct neighbor_ident_list *neighbor_list; - struct { /* MSISDN to which to route MO emergency calls */ char *route_to_msisdn; @@ -245,6 +241,8 @@ * and will be of the form 'MSC-00-00-00-00-00-00' */ char *msc_ipa_name; + /* A list of neighbor BSCs. This list is defined statically via VTY and does not + * necessarily correspond to BSCs attached to the A interface at a given moment. */ struct llist_head neighbor_ident_list; struct { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I57463ab94773de1377526f9a1c72fe3d37a31827 Gerrit-Change-Number: 22956 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 13:35:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 13:35:16 +0000 Subject: Change in osmo-msc[master]: gsm_network: drop unused neighbor_list member In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22956 ) Change subject: gsm_network: drop unused neighbor_list member ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I57463ab94773de1377526f9a1c72fe3d37a31827 Gerrit-Change-Number: 22956 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 13:35:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 13:36:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 13:36:16 +0000 Subject: Change in osmo-pcu[master]: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22957 ) Change subject: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned ...................................................................... sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned The DL NACC related message (PKT Cell Neighbor Data/Change Continue) are filled with the TFI of the target TBF. Hence, only select the tbf for NACC transmission if the related TBF already has a TFI assigned. Related: SYS#4909 Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d --- M src/gprs_rlcmac_sched.cpp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/57/22957/1 diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index b95d779..eaea406 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -72,8 +72,8 @@ if (ul_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS) || ul_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ)) tbf_cand->ul_ass = ul_tbf; - /* NACC ready to send */ - if (ms_nacc_rts(ul_tbf->ms())) + /* NACC ready to send. TFI assigned is needed to send messages */ + if (ul_tbf->is_tfi_assigned() && ms_nacc_rts(ul_tbf->ms())) tbf_cand->nacc = ul_tbf; /* FIXME: Is this supposed to be fair? The last TBF for each wins? Maybe use llist_add_tail and skip once we have all states? */ @@ -92,8 +92,8 @@ if (dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS) || dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ)) tbf_cand->ul_ass = dl_tbf; - /* NACC ready to send */ - if (ms_nacc_rts(dl_tbf->ms())) + /* NACC ready to send. TFI assigned is needed to send messages */ + if (dl_tbf->is_tfi_assigned() && ms_nacc_rts(dl_tbf->ms())) tbf_cand->nacc = dl_tbf; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d Gerrit-Change-Number: 22957 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 13:58:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 13:58:36 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix line indentation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22955 ) Change subject: cosmetic: fix line indentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia8335ce5c005885e4db1864faf775c4bff509c53 Gerrit-Change-Number: 22955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 13:58:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 13:59:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 13:59:58 +0000 Subject: Change in libosmocore[master]: support for stats static userspace probes via systemtap References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22958 ) Change subject: support for stats static userspace probes via systemtap ...................................................................... support for stats static userspace probes via systemtap We currently only have probes for the logging sub-system. This patch adds two tracepoints for tracing the performance impact of statistics reporting: stat_start and stat_done. They can be used to trace the amount of time a libosmocore-using application spends in reporting/exporting statistics. This includes both the CPU time for encoding the statistics, as well as the system calls for sending them. Change-Id: I7208c45f6d051505dd2435305c67b4d26c0b1dd2 Related: OS#4311 Related: SYS#4877 --- M src/probes.d M src/stats.c M tapset/libosmocore.stp 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/22958/1 diff --git a/src/probes.d b/src/probes.d index c16eb1e..e4150f0 100644 --- a/src/probes.d +++ b/src/probes.d @@ -1,4 +1,6 @@ provider libosmocore { probe log_start(); probe log_done(); + probe stats_start(); + probe stats_done(); }; diff --git a/src/stats.c b/src/stats.c index c91a978..a0834d2 100644 --- a/src/stats.c +++ b/src/stats.c @@ -90,6 +90,17 @@ #include #include +#ifdef HAVE_SYSTEMTAP +/* include the generated probes header and put markers in code */ +#include "probes.h" +#define TRACE(probe) probe +#define TRACE_ENABLED(probe) probe ## _ENABLED() +#else +/* Wrap the probe to allow it to be removed when no systemtap available */ +#define TRACE(probe) +#define TRACE_ENABLED(probe) (0) +#endif /* HAVE_SYSTEMTAP */ + #define STATS_DEFAULT_INTERVAL 5 /* secs */ #define STATS_DEFAULT_BUFLEN 256 @@ -781,6 +792,7 @@ int osmo_stats_report() { /* per group actions */ + TRACE(LIBOSMOCORE_STATS_START()); osmo_counters_for_each(handle_counter, NULL); rate_ctr_for_each_group(rate_ctr_group_handler, NULL); osmo_stat_item_for_each_group(osmo_stat_item_group_handler, NULL); @@ -788,6 +800,7 @@ /* global actions */ osmo_stat_item_discard_all(¤t_stat_item_index); flush_all_reporters(); + TRACE(LIBOSMOCORE_STATS_DONE()); return 0; } diff --git a/tapset/libosmocore.stp b/tapset/libosmocore.stp index 0ec3c42..a3e8f21 100644 --- a/tapset/libosmocore.stp +++ b/tapset/libosmocore.stp @@ -16,3 +16,14 @@ { probestr = sprintf("%s", $$name); } + +probe libosmocore_stats_start = process("libosmocore").mark("statsd_start") +{ + count = $arg1; + probestr = sprintf("%s(count=%d), $$name, count); +} + +probe libosmocore_stats_done = process("libosmocore").mark("statsd_done") +{ + probestr = sprintf("%s", $$name); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7208c45f6d051505dd2435305c67b4d26c0b1dd2 Gerrit-Change-Number: 22958 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 14:49:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 14:49:18 +0000 Subject: Change in osmo-pcu[master]: cosmetic: fix line indentation In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22955 ) Change subject: cosmetic: fix line indentation ...................................................................... cosmetic: fix line indentation Change-Id: Ia8335ce5c005885e4db1864faf775c4bff509c53 --- M src/gprs_rlcmac_sched.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 5f029a0..b95d779 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -482,7 +482,7 @@ block_nr, poll_fn, tbf_name(tbf_cand.poll)); usf = USF_UNUSED; /* else. check for sba */ -} else if ((sba_fn = bts_sba(bts)->sched(trx, ts, fn, block_nr)) != 0xffffffff) { + } else if ((sba_fn = bts_sba(bts)->sched(trx, ts, fn, block_nr)) != 0xffffffff) { LOGP(DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: TRX=%d " "TS=%d FN=%d block_nr=%d scheduling free USF for " "single block allocation at FN=%d\n", trx, ts, fn, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia8335ce5c005885e4db1864faf775c4bff509c53 Gerrit-Change-Number: 22955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 14:49:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 14:49:45 +0000 Subject: Change in osmo-msc[master]: gsm_network: drop unused neighbor_list member In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22956 ) Change subject: gsm_network: drop unused neighbor_list member ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I57463ab94773de1377526f9a1c72fe3d37a31827 Gerrit-Change-Number: 22956 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 18 Feb 2021 14:49:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 14:49:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 14:49:49 +0000 Subject: Change in osmo-msc[master]: gsm_network: drop unused neighbor_list member In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22956 ) Change subject: gsm_network: drop unused neighbor_list member ...................................................................... gsm_network: drop unused neighbor_list member Change-Id: I57463ab94773de1377526f9a1c72fe3d37a31827 --- M include/osmocom/msc/gsm_data.h 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 438ee08..1870804 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -230,10 +230,6 @@ struct sccp_ran_inst *sri; } a; - /* A list of neighbor BSCs. This list is defined statically via VTY and does not - * necessarily correspond to BSCs attached to the A interface at a given moment. */ - struct neighbor_ident_list *neighbor_list; - struct { /* MSISDN to which to route MO emergency calls */ char *route_to_msisdn; @@ -245,6 +241,8 @@ * and will be of the form 'MSC-00-00-00-00-00-00' */ char *msc_ipa_name; + /* A list of neighbor BSCs. This list is defined statically via VTY and does not + * necessarily correspond to BSCs attached to the A interface at a given moment. */ struct llist_head neighbor_ident_list; struct { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I57463ab94773de1377526f9a1c72fe3d37a31827 Gerrit-Change-Number: 22956 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 14:50:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 14:50:32 +0000 Subject: Change in osmo-pcu[master]: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22957 ) Change subject: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d Gerrit-Change-Number: 22957 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 18 Feb 2021 14:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 14:51:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 14:51:20 +0000 Subject: Change in osmo-pcu[master]: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22957 to look at the new patch set (#2). Change subject: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned ...................................................................... sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned The DL NACC related message (PKT Cell Neighbor Data/Change Continue) are filled with the TFI of the target TBF. Hence, only select the tbf for NACC transmission if the related TBF already has a TFI assigned. Otherwise, "OSMO_ASSERT(tbf_is_tfi_assigned(tbf));" in nacc_fsm.c when generating messages may be hit. Related: SYS#4909 Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d --- M src/gprs_rlcmac_sched.cpp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/57/22957/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d Gerrit-Change-Number: 22957 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 16:42:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 16:42:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_d... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22959 ) Change subject: pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_dl_tbf ...................................................................... pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_dl_tbf Triggers osmo-pcu assert in nacc_fsm.c due to scheduler not checking if tbf has TFI assigned before deciding to transmit NACC related messages. Related: osmo-pcu.git Change-Id I72b2dff28aacdb04909c098c94834ff79f55b31d Related: SYS#4909 Change-Id: Id293e41e6b4380f2794007779ad430544bbe578a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 103 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/22959/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 34406b9..5266743 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -819,6 +819,22 @@ } +private function f_ms_gtfi_tmpl(inout GprsMS ms) +runs on MS_BTS_IFACE_CT return template (present) GlobalTfi { + var template (present) GlobalTfi gtfi; + if (ispresent(ms.ul_tbf) and ispresent(ms.dl_tbf)) { + gtfi := ({ is_dl_tfi := false, tfi := ms.ul_tbf.tfi }, + { is_dl_tfi := true, tfi := ms.dl_tbf.tfi }); + } else if (ispresent(ms.ul_tbf)) { + gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + } else if (ispresent(ms.dl_tbf)) { + gtfi := { is_dl_tfi := true, tfi := ms.dl_tbf.tfi }; + } else { + gtfi := ?; + } + return gtfi; +} + altstep as_ms_rx_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, inout uint5_t exp_container_idx /* := 0 */, inout integer si_offset /* := 0 */, @@ -827,7 +843,7 @@ runs on MS_BTS_IFACE_CT { var integer len; var octetstring exp_si_chunk; - var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + var template (present) GlobalTfi gtfi := f_ms_gtfi_tmpl(ms); var BTS_PDTCH_Block data_msg; var boolean do_repeat := true; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4699d3e..5ab208b 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4890,6 +4890,91 @@ } } +/* Test MS sending Pkt Cell Change Notification on an MS with an existing but unassigned (no TFI) DL TBF */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_unassigned_dl_tbf() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn, dl_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + var octetstring data := f_rnd_octstring(10); + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); + /* Make sure we leave some time for SGSN->PCU data to arrive to PCU */ + f_sleep(0.1); + /* rx DL assignment, don't ack it yet (keep TBF in state ASSIGN): */ + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); + + /* NACC: scheduler selects tx Pkt Cell Neighbor Data. Receive first one: */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, single_step := true); + /* ACK DL assignment (we do it here on purpose to test tx Pkt Neigh Cell + * Data with unassigned DL TBF in line above): */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + /* Continue receiving Pkt Cell Neighbor Data */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, f_ms_tx_TsTrxBtsNum(ms), 1, 16); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + /* Now that we confirmed the new assignment in the dl-tbf, lets receive the data and ack it */ + f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0); + f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B); + f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc), + f_dl_block_ack_fn(dl_block, dl_fn)); +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -5127,6 +5212,7 @@ execute( TC_nacc_outbound_pkt_cell_chg_notif_twice3() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice4() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice5() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_unassigned_dl_tbf() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22959 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: Id293e41e6b4380f2794007779ad430544bbe578a Gerrit-Change-Number: 22959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 16:54:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 16:54:59 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 to look at the new patch set (#2). Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Use ALPHA value received in SI13 from PCUIF The old VTY command is marked as deprecated and still overrides the use in case it's used. Related: SYS#5358 Depends: libosmocore.git Change-Id I74fb0a3afc1ac4aadbfc609b882d929401f790eb Depends: osmo-bsc.git Change-Id I8b97ea11bad5fe05f2f634945b5703ee9abde81d Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 --- M doc/examples/osmo-pcu.cfg M doc/manuals/chapters/configuration.adoc M src/bts.cpp M src/bts.h M src/gprs_pcu.c M src/gprs_pcu.h M src/pcu_l1_if.cpp M src/pcu_vty.c M src/tbf.cpp M tests/emu/pcu_emu.cpp 10 files changed, 43 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/22801/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:36:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 17:36:18 +0000 Subject: Change in libosmocore[master]: logging: Allow prefixing thread ID to each log line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22960 ) Change subject: logging: Allow prefixing thread ID to each log line ...................................................................... logging: Allow prefixing thread ID to each log line Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 4 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/22960/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index c7f89de..4361cad 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -281,6 +281,8 @@ unsigned int use_color:1; /*! should log messages be prefixed with a timestamp? */ unsigned int print_timestamp:1; + /*! should log messages be prefixed with the logger Thread ID? */ + unsigned int print_tid:1; /*! DEPRECATED: use print_filename2 instead. */ unsigned int print_filename:1; /*! should log messages be prefixed with a category name? */ @@ -374,6 +376,7 @@ void log_set_use_color(struct log_target *target, int); void log_set_print_extended_timestamp(struct log_target *target, int); void log_set_print_timestamp(struct log_target *target, int); +void log_set_print_tid(struct log_target *target, int); void log_set_print_filename(struct log_target *target, int); void log_set_print_filename2(struct log_target *target, enum log_filename_type lft); void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos); diff --git a/src/logging.c b/src/logging.c index a40008e..c2a0453 100644 --- a/src/logging.c +++ b/src/logging.c @@ -64,6 +64,7 @@ #include #include #include +#include #include /* for LOGGING_STR. */ @@ -83,6 +84,8 @@ void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); +static __thread long int logging_tid; + #if (!EMBEDDED) /*! This mutex must be held while using osmo_log_target_list or any of its log_targets in a multithread program. Prevents race conditions between threads @@ -473,6 +476,14 @@ buf[offset + ret - 1] = ' '; OSMO_SNPRINTF_RET(ret, rem, offset, len); } + if (target->print_tid) { + if (logging_tid == 0) + logging_tid = (long int)osmo_gettid(); + ret = snprintf(buf + offset, rem, "%ld ", logging_tid); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + } if (target->print_category) { ret = snprintf(buf + offset, rem, "%s%s%s%s ", target->use_color ? level_color(level) : "", @@ -778,6 +789,15 @@ target->print_ext_timestamp = print_timestamp; } +/*! Enable or disable printing of timestamps while logging + * \param[in] target Log target to be affected + * \param[in] print_tid Enable (1) or disable (0) Thread ID logging + */ +void log_set_print_tid(struct log_target *target, int print_tid) +{ + target->print_tid = print_tid; +} + /*! Use log_set_print_filename2() instead. * Call log_set_print_filename2() with LOG_FILENAME_PATH or LOG_FILENAME_NONE, *as well as* call * log_set_print_category_hex() with the argument passed to this function. This is to mirror legacy @@ -917,6 +937,7 @@ /* global settings */ target->use_color = 1; target->print_timestamp = 0; + target->print_tid = 0; target->print_filename2 = LOG_FILENAME_PATH; target->print_category_hex = true; diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 6a7a8f4..48b039b 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -225,6 +225,22 @@ RET_WITH_UNLOCK(CMD_SUCCESS); } +DEFUN(logging_prnt_tid, + logging_prnt_tid_cmd, + "logging print thread-id (0|1)", + LOGGING_STR "Log output settings\n" + "Configure log message logging Thread ID\n" + "Don't prefix each log message\n" + "Prefix each log message with current Thread ID\n") +{ + struct log_target *tgt; + + ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt); + + log_set_print_tid(tgt, atoi(argv[0])); + RET_WITH_UNLOCK(CMD_SUCCESS); +} + DEFUN(logging_prnt_cat, logging_prnt_cat_cmd, "logging print category (0|1)", @@ -1003,6 +1019,8 @@ tgt->print_category_hex ? 1 : 0, VTY_NEWLINE); vty_out(vty, " logging print category %d%s", tgt->print_category ? 1 : 0, VTY_NEWLINE); + vty_out(vty, " logging print thread-id %d%s", + tgt->print_tid ? 1 : 0, VTY_NEWLINE); if (tgt->print_ext_timestamp) vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE); else @@ -1134,6 +1152,7 @@ install_lib_element_ve(&logging_use_clr_cmd); install_lib_element_ve(&logging_prnt_timestamp_cmd); install_lib_element_ve(&logging_prnt_ext_timestamp_cmd); + install_lib_element_ve(&logging_prnt_tid_cmd); install_lib_element_ve(&logging_prnt_cat_cmd); install_lib_element_ve(&logging_prnt_cat_hex_cmd); install_lib_element_ve(&logging_prnt_level_cmd); @@ -1168,6 +1187,7 @@ install_lib_element(CFG_LOG_NODE, &logging_use_clr_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_timestamp_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_ext_timestamp_cmd); + install_lib_element(CFG_LOG_NODE, &logging_prnt_tid_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_cat_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_cat_hex_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_level_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index dd2db63..82db2cc 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -48,6 +48,7 @@ logging color (0|1) logging timestamp (0|1) logging print extended-timestamp (0|1) + logging print thread-id (0|1) logging print category (0|1) logging print category-hex (0|1) logging print level (0|1) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 Gerrit-Change-Number: 22960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:38:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 17:38:06 +0000 Subject: Change in libosmocore[master]: logging: Allow prefixing thread ID to each log line In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/22960 ) Change subject: logging: Allow prefixing thread ID to each log line ...................................................................... logging: Allow prefixing thread ID to each log line Related: OS#5032 Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 4 files changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/22960/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 Gerrit-Change-Number: 22960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:43:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:43:42 +0000 Subject: Change in libosmocore[master]: logging: Allow prefixing thread ID to each log line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22960 ) Change subject: logging: Allow prefixing thread ID to each log line ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 Gerrit-Change-Number: 22960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 17:43:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:44:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:44:47 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 17:44:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:45:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:45:03 +0000 Subject: Change in osmo-trx[master]: Replace my_gettid with libosmocore osmo_gettid API In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22950 ) Change subject: Replace my_gettid with libosmocore osmo_gettid API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd Gerrit-Change-Number: 22950 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 18 Feb 2021 17:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:45:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:45:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_d... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22959 ) Change subject: pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_dl_tbf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22959 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: Id293e41e6b4380f2794007779ad430544bbe578a Gerrit-Change-Number: 22959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 17:45:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:45:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:45:51 +0000 Subject: Change in osmo-pcu[master]: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22957 ) Change subject: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d Gerrit-Change-Number: 22957 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 18 Feb 2021 17:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:45:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:45:53 +0000 Subject: Change in osmo-pcu[master]: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22957 ) Change subject: sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned ...................................................................... sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned The DL NACC related message (PKT Cell Neighbor Data/Change Continue) are filled with the TFI of the target TBF. Hence, only select the tbf for NACC transmission if the related TBF already has a TFI assigned. Otherwise, "OSMO_ASSERT(tbf_is_tfi_assigned(tbf));" in nacc_fsm.c when generating messages may be hit. Related: SYS#4909 Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d --- M src/gprs_rlcmac_sched.cpp 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index b95d779..eaea406 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -72,8 +72,8 @@ if (ul_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS) || ul_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ)) tbf_cand->ul_ass = ul_tbf; - /* NACC ready to send */ - if (ms_nacc_rts(ul_tbf->ms())) + /* NACC ready to send. TFI assigned is needed to send messages */ + if (ul_tbf->is_tfi_assigned() && ms_nacc_rts(ul_tbf->ms())) tbf_cand->nacc = ul_tbf; /* FIXME: Is this supposed to be fair? The last TBF for each wins? Maybe use llist_add_tail and skip once we have all states? */ @@ -92,8 +92,8 @@ if (dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS) || dl_tbf->ul_ass_state_is(GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ)) tbf_cand->ul_ass = dl_tbf; - /* NACC ready to send */ - if (ms_nacc_rts(dl_tbf->ms())) + /* NACC ready to send. TFI assigned is needed to send messages */ + if (dl_tbf->is_tfi_assigned() && ms_nacc_rts(dl_tbf->ms())) tbf_cand->nacc = dl_tbf; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I72b2dff28aacdb04909c098c94834ff79f55b31d Gerrit-Change-Number: 22957 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:46:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 18 Feb 2021 17:46:47 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 17:46:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:48:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 17:48:42 +0000 Subject: Change in osmo-trx[master]: Replace my_gettid with libosmocore osmo_gettid API In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22950 ) Change subject: Replace my_gettid with libosmocore osmo_gettid API ...................................................................... Replace my_gettid with libosmocore osmo_gettid API The API was moved to libosmocore, let's use it instead of defining our own here with all the complexity in build system involved. Depends: libosmocore.git Change-Id Id7534beeb22fcd50813dab76dd68818e2ff87ec2 Related: OS#5027 Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd --- M CommonLibs/Threads.cpp M CommonLibs/debug.c M CommonLibs/debug.h M TODO-RELEASE M configure.ac 5 files changed, 7 insertions(+), 39 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/Threads.cpp b/CommonLibs/Threads.cpp index d8dab57..b3ff52f 100644 --- a/CommonLibs/Threads.cpp +++ b/CommonLibs/Threads.cpp @@ -32,6 +32,8 @@ #include "Timeval.h" #include "Logger.h" +#include + using namespace std; #ifndef HAVE_ATOMIC_OPS @@ -108,7 +110,7 @@ void set_selfthread_name(const char *name) { pthread_t selfid = pthread_self(); - pid_t tid = my_gettid(); + pid_t tid = osmo_gettid(); if (pthread_setname_np(selfid, name) == 0) { LOG(INFO) << "Thread "<< selfid << " (task " << tid << ") set name: " << name; } else { diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 7ee8184..08954f5 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -21,18 +21,6 @@ * See the COPYING file in the main directory for details. */ -#include "config.h" - -/* If HAVE_GETTID, then "_GNU_SOURCE" may need to be defined to use gettid() */ -#if HAVE_GETTID -#define _GNU_SOURCE -#endif - -#include -#include -#include -#include "config.h" - #include #include #include "debug.h" @@ -93,15 +81,3 @@ .cat = default_categories, .num_cat = ARRAY_SIZE(default_categories), }; - -pid_t my_gettid(void) -{ -#if HAVE_GETTID - return gettid(); -#elif defined(LINUX) && defined(__NR_gettid) - return (pid_t) syscall(__NR_gettid); -#else - #pragma message ("use pid as tid") - return getpid(); -#endif -} diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index dd78168..ddb5c75 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -1,9 +1,9 @@ #pragma once #include -#include #include +#include extern const struct log_info log_info; @@ -19,12 +19,10 @@ DCTR, }; -pid_t my_gettid(void); - #define CLOGC(category, level, fmt, args...) do { \ - LOGP(category, level, "[tid=%ld] " fmt, (long int) my_gettid(), ##args); \ + LOGP(category, level, "[tid=%ld] " fmt, (long int) osmo_gettid(), ##args); \ } while(0) #define CLOGCHAN(chan, category, level, fmt, args...) do { \ - LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) my_gettid(), chan, ##args); \ + LOGP(category, level, "[tid=%ld][chan=%zu] " fmt, (long int) osmo_gettid(), chan, ##args); \ } while(0) diff --git a/TODO-RELEASE b/TODO-RELEASE index 84ecf22..c916fb1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,3 +1,4 @@ * update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread() * update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. * update libosmocore dependency to > 1.4.x for osmo_fd_{read,write}_{enable,disable}() +* update libosmocore dependency to > 1.4.2 for osmo_gettid() diff --git a/configure.ac b/configure.ac index 7f6aef7..8067fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -82,15 +82,6 @@ AC_HEADER_TIME AC_C_BIGENDIAN -# Check if gettid is available (despite not being documented in glibc doc, it requires __USE_GNU on some systems) -# C compiler is used since __USE_GNU seems to be always defined for g++. -save_CPPFLAGS=$CPPFLAGS -AC_LANG_PUSH(C) -CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" -AC_CHECK_FUNCS([gettid]) -AC_LANG_POP(C) -CPPFLAGS=$save_CPPFLAGS - PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19e32fbc47bd88a668e0c912e89b001b0f8831dd Gerrit-Change-Number: 22950 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:48:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 17:48:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_d... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22959 ) Change subject: pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_dl_tbf ...................................................................... pcu: Introduce test TC_nacc_outbound_pkt_cell_chg_notif_nonassigned_dl_tbf Triggers osmo-pcu assert in nacc_fsm.c due to scheduler not checking if tbf has TFI assigned before deciding to transmit NACC related messages. Related: osmo-pcu.git Change-Id I72b2dff28aacdb04909c098c94834ff79f55b31d Related: SYS#4909 Change-Id: Id293e41e6b4380f2794007779ad430544bbe578a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 103 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 34406b9..5266743 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -819,6 +819,22 @@ } +private function f_ms_gtfi_tmpl(inout GprsMS ms) +runs on MS_BTS_IFACE_CT return template (present) GlobalTfi { + var template (present) GlobalTfi gtfi; + if (ispresent(ms.ul_tbf) and ispresent(ms.dl_tbf)) { + gtfi := ({ is_dl_tfi := false, tfi := ms.ul_tbf.tfi }, + { is_dl_tfi := true, tfi := ms.dl_tbf.tfi }); + } else if (ispresent(ms.ul_tbf)) { + gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + } else if (ispresent(ms.dl_tbf)) { + gtfi := { is_dl_tfi := true, tfi := ms.dl_tbf.tfi }; + } else { + gtfi := ?; + } + return gtfi; +} + altstep as_ms_rx_pkt_neighbor_cell_data(inout GprsMS ms, octetstring exp_si, inout uint5_t exp_container_idx /* := 0 */, inout integer si_offset /* := 0 */, @@ -827,7 +843,7 @@ runs on MS_BTS_IFACE_CT { var integer len; var octetstring exp_si_chunk; - var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi }; + var template (present) GlobalTfi gtfi := f_ms_gtfi_tmpl(ms); var BTS_PDTCH_Block data_msg; var boolean do_repeat := true; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4699d3e..5ab208b 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4890,6 +4890,91 @@ } } +/* Test MS sending Pkt Cell Change Notification on an MS with an existing but unassigned (no TFI) DL TBF */ +testcase TC_nacc_outbound_pkt_cell_chg_notif_unassigned_dl_tbf() runs on RAW_PCU_Test_CT { + var PollFnCtx pollctx; + var GprsMS ms; + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default); + var template (value) RlcmacUlCtrlMsg cell_chf_notif; + var RlcmacDlBlock dl_block; + var uint32_t sched_fn, dl_fn; + var CtrlMessage rx_ctrl; + var GsmArfcn req_arfcn := 862; + var uint6_t req_bsic := 43; + var octetstring data := f_rnd_octstring(10); + + /* Initialize osmo-bsc emulation neighbor resolution CTRL port */ + f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Make sure we are not affected by full cache from previous tests */ + f_pcuvty_flush_neigh_caches(); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Send PACKET RESOURCE REQUEST */ + pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def)); + /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts); + + /* Start NACC from MS side */ + cell_chf_notif := ts_RlcMacUlCtrl_PKT_CELL_CHG_NOTIF(ms.ul_tbf.tfi, req_arfcn, req_bsic); + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* osmo-pcu should now ask for resolution: */ + f_ipa_ctrl_wait_link_up(); + var charstring ctrl_var := "neighbor_resolve_cgi_ps_from_lac_ci." & + int2str(info_ind.lac) & "." & + int2str(info_ind.cell_id) & "." & + int2str(req_arfcn) & "." & + int2str(req_bsic); + f_ctrl_exp_get(IPA_CTRL, ctrl_var, "023-43-423-2-5"); + /* RIM procedure: */ + as_outbound_nacc_rim_resolve(info_ind); + + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); + /* Make sure we leave some time for SGSN->PCU data to arrive to PCU */ + f_sleep(0.1); + /* rx DL assignment, don't ack it yet (keep TBF in state ASSIGN): */ + f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS); + + /* NACC: scheduler selects tx Pkt Cell Neighbor Data. Receive first one: */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, single_step := true); + /* ACK DL assignment (we do it here on purpose to test tx Pkt Neigh Cell + * Data with unassigned DL TBF in line above): */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + /* Continue receiving Pkt Cell Neighbor Data */ + f_ms_handle_pkt_neighbor_cell_data(ms, si_default, f_ms_tx_TsTrxBtsNum(ms), 1, 16); + + /* Obtain a Downlink block and make sure it is a Pkt Cell Chg Continue */ + f_rx_rlcmac_dl_block(dl_block, sched_fn); + if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) { + setverdict(fail, "Rx unexpected DL block: ", dl_block); + f_shutdown(__BFILE__, __LINE__); + } + /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + if (dl_block.ctrl.mac_hdr.rrbp_valid) { + sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp); + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + } + + /* Now that we confirmed the new assignment in the dl-tbf, lets receive the data and ack it */ + f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0); + f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B); + f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc), + f_dl_block_ack_fn(dl_block, dl_fn)); +} + /* Send a RIM RAN info request to the PCU and verify the response, we expect * getting the system information back which we have transfered to the PCU via * PCUIF on startup. */ @@ -5127,6 +5212,7 @@ execute( TC_nacc_outbound_pkt_cell_chg_notif_twice3() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice4() ); execute( TC_nacc_outbound_pkt_cell_chg_notif_twice5() ); + execute( TC_nacc_outbound_pkt_cell_chg_notif_unassigned_dl_tbf() ); execute( TC_rim_ran_info_req_single_rep() ); execute( TC_rim_ran_info_req_single_rep_no_si() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22959 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: Id293e41e6b4380f2794007779ad430544bbe578a Gerrit-Change-Number: 22959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 17:49:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 17:49:38 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c at 746 PS1, Line 746: the_pcu->vty.force_alpha = atoi(argv[0]); > How about printing a warning that presence of 'alpha <0-10>' in the configuration file makes osmo-pc [?] I think the user, upon reading "deprecated" should really start using the correct way described here, instead of explaining him how can he still be using this. So, if user sees the warning above -> do the changes If user doesn't see the warning -> old behavior is kept. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 17:49:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 18:36:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 18:36:18 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... tests: Set print_category values explicitly This will alow easily changing default values for print_category vs print_category_hex later. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Related: OS#5034 Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 --- M tests/fsm/fsm_test.c M tests/gb/bssgp_fc_test.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns_test.c M tests/logging/logging_test.c M tests/loggingrb/loggingrb_test.c M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/write_queue/wqueue_test.c 9 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/22961/1 diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index fe48b2b..23e24cf 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -414,6 +414,8 @@ log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); log_set_use_color(stderr_target, 0); + log_set_print_category(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL); g_ctx = NULL; diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c index cc38777..23bcd57 100644 --- a/tests/gb/bssgp_fc_test.c +++ b/tests/gb/bssgp_fc_test.c @@ -149,6 +149,8 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); tall_msgb_ctx = msgb_talloc_ctx_init(ctx, 0); diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index 6d71a8c..dfd28be 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -431,6 +431,8 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_log_level(osmo_stderr_target, LOGL_INFO); unitdata = talloc_zero(ctx, struct osmo_wqueue); osmo_wqueue_init(unitdata, 100); diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index f70e493..e8e8b80 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -904,6 +904,8 @@ void *ctx = talloc_named_const(NULL, 0, "gprs_ns_test"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index b9cb57f..d036dc5 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -78,6 +78,7 @@ log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); log_set_print_filename(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 1); log_set_use_color(stderr_target, 0); diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c index 0b2ae5b..4a4d1f9 100644 --- a/tests/loggingrb/loggingrb_test.c +++ b/tests/loggingrb/loggingrb_test.c @@ -65,6 +65,8 @@ log_add_target(ringbuf_target); log_set_all_filter(ringbuf_target, 1); log_set_print_filename(ringbuf_target, 0); + log_set_print_category(ringbuf_target, 0); + log_set_print_category_hex(ringbuf_target, 0); log_parse_category_mask(ringbuf_target, "DRLL:DCC"); log_parse_category_mask(ringbuf_target, "DRLL"); diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c index e70b8be..9705038 100644 --- a/tests/socket/socket_sctp_test.c +++ b/tests/socket/socket_sctp_test.c @@ -223,6 +223,8 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); #ifdef HAVE_LIBSCTP test_sockinit2_multiaddr_simple(); test_sockinit2_multiaddr_several(); diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 0bf2127..9619553 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -401,6 +401,8 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_sockinit(); test_sockinit2(); diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c index 827e4e8..9c7a36e 100644 --- a/tests/write_queue/wqueue_test.c +++ b/tests/write_queue/wqueue_test.c @@ -73,6 +73,8 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); + log_set_print_category(stderr_target, 0); test_wqueue_limit(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 18:36:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 18:36:19 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 ) Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Drop use of log_set_print_filename() API inside libosmocore Let's use log_set_print_filename2() API instead, which has less ackward behavior implications like changing the print status of category-hex. Related: OS#5034 Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da --- M tests/fsm/fsm_dealloc_test.c M tests/fsm/fsm_test.c M tests/gb/bssgp_fc_test.c M tests/gb/gprs_bssgp_test.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns_test.c M tests/gsup/gsup_test.c M tests/logging/logging_test.c M tests/loggingrb/loggingrb_test.c M tests/oap/oap_client_test.c M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/tdef/tdef_test.c M tests/write_queue/wqueue_test.c M utils/osmo-ns-dummy.c 15 files changed, 18 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/22962/1 diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c index 48f80e5..f4be93d 100644 --- a/tests/fsm/fsm_dealloc_test.c +++ b/tests/fsm/fsm_dealloc_test.c @@ -443,7 +443,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 1); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 23e24cf..2cfdacd 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -412,7 +412,7 @@ log_init(&log_info, NULL); stderr_target = log_target_create_stderr(); log_add_target(stderr_target); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_use_color(stderr_target, 0); log_set_print_category(stderr_target, 0); log_set_print_category_hex(stderr_target, 0); diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c index 23bcd57..63e8308 100644 --- a/tests/gb/bssgp_fc_test.c +++ b/tests/gb/bssgp_fc_test.c @@ -148,7 +148,7 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c index 52e986e..43fc056 100644 --- a/tests/gb/gprs_bssgp_test.c +++ b/tests/gb/gprs_bssgp_test.c @@ -298,7 +298,7 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); msgb_talloc_ctx_init(ctx, 0); diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index dfd28be..2df5474 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -429,8 +429,7 @@ void *ctx = talloc_named_const(NULL, 0, "gprs_ns2_test"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_set_log_level(osmo_stderr_target, LOGL_INFO); diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index e8e8b80..454a29e 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -906,11 +906,9 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); - osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); - - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); + osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); setlinebuf(stdout); diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index f34ac7a..3d7ea40 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -749,9 +749,10 @@ { void *ctx = talloc_named_const(NULL, 0, "gsup_test"); osmo_init_logging2(ctx, &info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); test_gsup_messages_dec_enc(); diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index d036dc5..f873958 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -77,7 +77,7 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 1); log_set_use_color(stderr_target, 0); diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c index 4a4d1f9..19378c3 100644 --- a/tests/loggingrb/loggingrb_test.c +++ b/tests/loggingrb/loggingrb_test.c @@ -64,7 +64,7 @@ ringbuf_target = log_target_create_rb(0x1000); log_add_target(ringbuf_target); log_set_all_filter(ringbuf_target, 1); - log_set_print_filename(ringbuf_target, 0); + log_set_print_filename2(ringbuf_target, LOG_FILENAME_NONE); log_set_print_category(ringbuf_target, 0); log_set_print_category_hex(ringbuf_target, 0); diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c index dadf2ee..622912f 100644 --- a/tests/oap/oap_client_test.c +++ b/tests/oap/oap_client_test.c @@ -260,7 +260,8 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DLOAP,1"); diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c index 9705038..4ca52a3 100644 --- a/tests/socket/socket_sctp_test.c +++ b/tests/socket/socket_sctp_test.c @@ -222,7 +222,7 @@ ctx = talloc_named_const(NULL, 0, "socket_test_sctp"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); #ifdef HAVE_LIBSCTP diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 9619553..614db55 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -400,7 +400,7 @@ ctx = talloc_named_const(NULL, 0, "socket_test"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c index ede3082..d188eed 100644 --- a/tests/tdef/tdef_test.c +++ b/tests/tdef/tdef_test.c @@ -477,7 +477,7 @@ ctx = talloc_named_const(NULL, 0, "tdef_test.c"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c index 9c7a36e..3823ef5 100644 --- a/tests/write_queue/wqueue_test.c +++ b/tests/write_queue/wqueue_test.c @@ -72,7 +72,7 @@ log_init(&log_info, NULL); stderr_target = log_target_create_stderr(); log_add_target(stderr_target); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 0); diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c index ee7f591..0af1a89 100644 --- a/utils/osmo-ns-dummy.c +++ b/utils/osmo-ns-dummy.c @@ -227,8 +227,7 @@ osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); msgb_talloc_ctx_init(ctx, 0); osmo_stats_init(ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 18:36:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 18:36:19 +0000 Subject: Change in libosmocore[master]: logging: Deprecate API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22963 ) Change subject: logging: Deprecate API log_set_print_filename ...................................................................... logging: Deprecate API log_set_print_filename Let's flag the API as deprecated so that people start using log_set_print_filename2() API instead, which has less ackward behavior implications like changing the print status of category-hex. Related: OS#5034 Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a --- M include/osmocom/core/logging.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/22963/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index c7f89de..165b311 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -374,7 +374,7 @@ void log_set_use_color(struct log_target *target, int); void log_set_print_extended_timestamp(struct log_target *target, int); void log_set_print_timestamp(struct log_target *target, int); -void log_set_print_filename(struct log_target *target, int); +void log_set_print_filename(struct log_target *target, int) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; void log_set_print_filename2(struct log_target *target, enum log_filename_type lft); void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos); void log_set_print_category(struct log_target *target, int); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a Gerrit-Change-Number: 22963 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 18:36:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 18 Feb 2021 18:36:29 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c at 746 PS1, Line 746: the_pcu->vty.force_alpha = atoi(argv[0]); The problem is that these warnings are being printed in the beginning of the log without a prefix with category and logging level. And if you manage the services using systemd, it's unlikely that you check journald every time after updating the packages. If only we had some permanent buffer, from where one could retrieve all the warnings e.g. via the VTY ('show vty-depr-warnings' or so)... > ... instead of explaining him how can he still be using this. I am not asking you to explain how to use deprecated parameters. I am asking to warn the user about consequences of not using the new ones. It's not obvious what takes preference without looking into the code. And it's actually quite often that I see deprecated parameters in use, even in our testing infrastructure (docker-playground). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 18:36:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 18 18:40:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 18 Feb 2021 18:40:32 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c File src/pcu_vty.c: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/1/src/pcu_vty.c at 746 PS1, Line 746: the_pcu->vty.force_alpha = atoi(argv[0]); > The problem is that these warnings are being printed in the beginning of the log without a prefix wi [?] I'm sorry but I disagree, I see no point in spending time in doing that. If you are a user see something is deprecated, and the message is already pointing you to use the new command, do so, instead of thinking how using the old deprecated command is going to affect the program. You should stop using it in first place. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 18 Feb 2021 18:40:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 19 05:06:00 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 19 Feb 2021 05:06:00 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602f47569f644_6c892abbc860c5f82570417@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 161s] [COMPILING apps/dfu/main.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 161s] Memory region Used Size Region Size %age Used [ 161s] rom: 16580 B 16 KB 101.20% [ 161s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 161s] collect2: error: ld returned 1 exit status [ 161s] % [ 161s] make[2]: *** [Makefile:234: flash] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 161s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: error: make -j1 returned exit code 2 [ 161s] make: *** [debian/rules:16: build] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 152.792775] sysrq: Power Off [ 164s] [ 152.799906] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb19 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 19 05:05:46 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Feb 19 05:18:51 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 19 Feb 2021 05:18:51 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602f4a432fa40_6c892abbc860c5f82572728@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 122s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 122s] [COMPILING libboard/qmod/source/card_pres.c] [ 122s] [COMPILING libboard/qmod/source/wwan_led.c] [ 122s] [COMPILING libboard/qmod/source/i2c.c] [ 123s] [COMPILING libboard/qmod/source/board_qmod.c] [ 123s] [COMPILING apps/dfu/main.c] [ 123s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 123s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 123s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 123s] Memory region Used Size Region Size %age Used [ 123s] rom: 16588 B 16 KB 101.25% [ 123s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 123s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 123s] collect2: error: ld returned 1 exit status [ 123s] % [ 123s] make[2]: *** [Makefile:234: flash] Error 1 [ 123s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 123s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] dh_auto_build: error: make -j1 returned exit code 2 [ 123s] make: *** [debian/rules:16: build] Error 25 [ 123s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 124s] ### VM INTERACTION START ### [ 127s] [ 111.107076] sysrq: Power Off [ 127s] [ 111.114607] reboot: Power down [ 127s] ### VM INTERACTION END ### [ 127s] [ 127s] wildcard2 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 19 05:18:40 UTC 2021. [ 127s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 19 05:32:23 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 19 Feb 2021 05:32:23 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Disallow changing the type of an existing BTS from the vty Changing the BTS type is not supported, so don't allow it. For example, Changing from type sysmobts to type rbs2000 may hit an OSMO_ASSERT in om2k_bts_fsm_alloc() The default BTS type if osmo-bsc is started with an empty configuration and the operator issues config terminal->network->bts 0 will be "unknown". This type and only this type can be changed from the vty config node. Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/22964/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index d3f8a73..c8dfa8d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2333,6 +2333,9 @@ int rc; rc = gsm_set_bts_type(bts, str2btstype(argv[0])); + if (rc == -EBUSY) + vty_out(vty, "%% Changing the type of an existing BTS is not supported.%s", + VTY_NEWLINE); if (rc < 0) return CMD_WARNING; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 548d724..3784e7a 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -492,6 +492,9 @@ { struct gsm_bts_model *model; + if (bts->type) + return -EBUSY; + model = bts_model_find(type); if (!model) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 05:33:09 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 19 Feb 2021 05:33:09 +0000 Subject: Change in osmo-bsc[master]: Set FSM pointer to NULL when changing BTS Type In-Reply-To: References: Message-ID: keith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22954 ) Change subject: Set FSM pointer to NULL when changing BTS Type ...................................................................... Abandoned replaced with I0df97ef128a1bbd84c787654d1d842dce4dad819 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I634fe52d598253454a50cb782d93ada83e6d88d1 Gerrit-Change-Number: 22954 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 06:07:36 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 19 Feb 2021 06:07:36 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 to look at the new patch set (#2). Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Disallow changing the type of an existing BTS from the vty Changing the BTS type is not supported, so don't allow it. For example, Changing from type sysmobts to type rbs2000 may hit an OSMO_ASSERT in om2k_bts_fsm_alloc() The default BTS type if osmo-bsc is started with an empty configuration and the operator issues config terminal->network->bts 0 will be "unknown". This type and only this type can be changed from the vty config node. Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/22964/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:15:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:15:25 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:15:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:16:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:16:44 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:16:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:20:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:20:25 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 ) Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/gb/gprs_ns_test.c File tests/gb/gprs_ns_test.c: https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/gb/gprs_ns_test.c at 911 PS1, Line 911: osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); why moving this line? https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/gsup/gsup_test.c File tests/gsup/gsup_test.c: https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/gsup/gsup_test.c at 755 PS1, Line 755: log_set_print_category_hex(osmo_stderr_target, 0); looks like a chunk belonging to the previous patch? https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/oap/oap_client_test.c File tests/oap/oap_client_test.c: https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/oap/oap_client_test.c at 264 PS1, Line 264: log_set_print_category_hex(osmo_stderr_target, 0); also from previous patch? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:20:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:21:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:21:00 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... Patch Set 1: Code-Review+1 Some chunks from this patch ended up in the following one. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:21:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:22:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:22:04 +0000 Subject: Change in libosmocore[master]: logging: Deprecate API log_set_print_filename In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22963 ) Change subject: logging: Deprecate API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a Gerrit-Change-Number: 22963 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:22:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:24:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:24:47 +0000 Subject: Change in libosmocore[master]: logging: Deprecate API log_set_print_filename In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22963 ) Change subject: logging: Deprecate API log_set_print_filename ...................................................................... Patch Set 1: -Code-Review (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22963/1/include/osmocom/core/logging.h File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/22963/1/include/osmocom/core/logging.h at 377 PS1, Line 377: OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE As far as I can see, it's not used after your patches, so I would go for OSMO_DEPRECATED instead. Any reason to allow its use inside libosmocore? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a Gerrit-Change-Number: 22963 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:24:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:30:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:30:21 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... Patch Set 1: We may probably want a single function that would set/init the default configuration for logging, or a function that accepts a structure and structure with default parameters all together. Imagine we would want to have logging level printed by default, so this would require one to go through all tests and all projects again and ensure explicit setting. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 07:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 07:34:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 07:34:51 +0000 Subject: Change in osmo-bts[master]: sched_lchan_tchh: fix frame number and fill FACCH gap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21329 ) Change subject: sched_lchan_tchh: fix frame number and fill FACCH gap ...................................................................... Patch Set 3: Let's keep it WIP for now, I will work on this patch once I have time. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ad9fa3815feb2b4da608ab7df716a87ba1f2f91 Gerrit-Change-Number: 21329 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 07:34:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 09:46:33 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 09:46:33 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 09:46:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 09:49:57 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 09:49:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 09:49:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 09:50:07 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 09:50:07 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 09:50:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 09:54:25 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 09:54:25 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 09:54:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 09:59:19 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 09:59:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 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: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 Gerrit-Change-Number: 22939 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 09:59:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:04:29 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 10:04:29 +0000 Subject: Change in libosmocore[master]: gprs_ns2: ensure no duplicate UDP NSVC can be created In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22944 ) Change subject: gprs_ns2: ensure no duplicate UDP NSVC can be created ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 Gerrit-Change-Number: 22944 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 10:04:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:06:01 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 10:06:01 +0000 Subject: Change in libosmocore[master]: logging: Allow prefixing thread ID to each log line In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22960 ) Change subject: logging: Allow prefixing thread ID to each log line ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 Gerrit-Change-Number: 22960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 10:06:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:43 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:43 +0000 Subject: Change in libosmocore[master]: gprs_ns2: ensure no duplicate UDP NSVC can be created In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22944 ) Change subject: gprs_ns2: ensure no duplicate UDP NSVC can be created ...................................................................... Patch Set 1: Code-Review+2 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 Gerrit-Change-Number: 22944 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 10:41:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:50 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:50 +0000 Subject: Change in libosmocore[master]: gprs_ns2: rework IP-SNS binds In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22872 ) Change subject: gprs_ns2: rework IP-SNS binds ...................................................................... gprs_ns2: rework IP-SNS binds Introduce a `ip-sns-bind BINDID` vty command within a `nse` vty object. The ip-sns-bind defines the binds which will be used by the dynamic configuration with IP-SNS. This is only the first part which only uses the binds when doing a new SNS configuration. The outgoing add procedure will be supported in a later patch when the SNS fsm supports outgoing procedures. This is a behaviour change of the API and must be synchronized with the osmo-pcu. Otherwise SNS won't work with osmo-pcu. Related: SYS#5354 Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty.c M src/gb/libosmogb.map M tests/gb/osmo-ns-dummy.cfg 6 files changed, 469 insertions(+), 37 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index b406bb0..56a9b4f 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -230,6 +230,8 @@ const struct osmo_sockaddr *saddr); int gprs_ns2_sns_del_endpoint(struct gprs_ns2_nse *nse, const struct osmo_sockaddr *saddr); +int gprs_ns2_sns_add_bind(struct gprs_ns2_nse *nse, struct gprs_ns2_vc_bind *bind); +int gprs_ns2_sns_del_bind(struct gprs_ns2_nse *nse, struct gprs_ns2_vc_bind *bind); const struct osmo_sockaddr *gprs_ns2_nse_sns_remote(struct gprs_ns2_nse *nse); const struct osmo_sockaddr *gprs_ns2_ip_vc_remote(const struct gprs_ns2_vc *nsvc); diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 9302a16..bc4db53 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1269,6 +1269,7 @@ void gprs_ns2_free_bind(struct gprs_ns2_vc_bind *bind) { struct gprs_ns2_vc *nsvc, *tmp; + struct gprs_ns2_nse *nse; if (!bind) return; @@ -1276,6 +1277,12 @@ gprs_ns2_free_nsvc(nsvc); } + if (gprs_ns2_is_ip_bind(bind)) { + llist_for_each_entry(nse, &bind->nsi->nse, list) { + gprs_ns2_sns_del_bind(nse, bind); + } + } + if (bind->driver->free_bind) bind->driver->free_bind(bind); diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index ab8415d..dfa9afe 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -81,6 +81,8 @@ GPRS_SNS_EV_CHANGE_WEIGHT, GPRS_SNS_EV_NO_NSVC, GPRS_SNS_EV_NSVC_ALIVE, /*!< a NS-VC became alive */ + GPRS_SNS_EV_REQ_ADD_BIND, + GPRS_SNS_EV_REQ_DELETE_BIND, }; static const struct value_string gprs_sns_event_names[] = { @@ -95,6 +97,8 @@ { GPRS_SNS_EV_CHANGE_WEIGHT, "CHANGE_WEIGHT" }, { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" }, { GPRS_SNS_EV_NSVC_ALIVE, "NSVC_ALIVE"}, + { GPRS_SNS_EV_REQ_ADD_BIND, "ADD_BIND"}, + { GPRS_SNS_EV_REQ_DELETE_BIND, "DELETE_BIND"}, { 0, NULL } }; @@ -103,6 +107,11 @@ struct osmo_sockaddr saddr; }; +struct ns2_sns_bind { + struct llist_head list; + struct gprs_ns2_vc_bind *bind; +}; + struct ns2_sns_state { struct gprs_ns2_nse *nse; @@ -110,6 +119,10 @@ /* holds the list of initial SNS endpoints */ struct llist_head sns_endpoints; + /* list of used struct ns2_sns_bind */ + struct llist_head binds; + /* pointer to the bind which was used to initiate the SNS connection */ + struct ns2_sns_bind *initial_bind; /* prevent recursive reselection */ bool reselection_running; @@ -120,8 +133,6 @@ struct sns_endpoint *initial; /* all SNS PDU will be sent over this nsvc */ struct gprs_ns2_vc *sns_nsvc; - /* iterate over the binds after all remote has been tested */ - int bind_offset; /* timer N */ int N; /* true if at least one nsvc is alive */ @@ -718,7 +729,7 @@ struct gprs_ns_ie_ip4_elem *ip4_elems; struct gprs_ns_ie_ip6_elem *ip6_elems; struct gprs_ns2_vc_bind *bind; - struct gprs_ns2_inst *nsi = gss->nse->nsi; + struct ns2_sns_bind *sbind; struct osmo_sockaddr *remote; const struct osmo_sockaddr *sa; struct osmo_sockaddr local; @@ -741,23 +752,25 @@ remote = &gss->initial->saddr; /* count how many bindings are available (only UDP binds) */ - count = ns2_ip_count_bind(nsi, remote); + count = llist_count(&gss->binds); if (count == 0) { /* TODO: logging */ return; } - bind = ns2_ip_get_bind_by_index(nsi, remote, gss->bind_offset); - if (!bind) { - if (gss->bind_offset) { - gss->bind_offset = 0; - bind = ns2_ip_get_bind_by_index(nsi, remote, gss->bind_offset); + /* take the first bind or take the next bind */ + if (!gss->initial_bind) { + gss->initial_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list); + } else { + if (gss->initial_bind->list.next != &gss->binds) { + gss->initial_bind = llist_entry(gss->initial_bind->list.next, struct ns2_sns_bind, list); + } else { + gss->initial_bind = llist_first_entry(&gss->binds, struct ns2_sns_bind, list); } - - if (!bind) - return; } + bind = gss->initial_bind->bind; + /* setup the NSVC */ if (!gss->sns_nsvc) { gss->sns_nsvc = ns2_ip_bind_connect(bind, gss->nse, remote); @@ -773,11 +786,8 @@ return; gss->ip4_local = ip4_elems; - - llist_for_each_entry(bind, &nsi->binding, list) { - if (!gprs_ns2_is_ip_bind(bind)) - continue; - + llist_for_each_entry(sbind, &gss->binds, list) { + bind = sbind->bind; sa = gprs_ns2_ip_bind_sockaddr(bind); if (!sa) continue; @@ -813,10 +823,8 @@ gss->ip6_local = ip6_elems; - llist_for_each_entry(bind, &nsi->binding, list) { - if (!gprs_ns2_is_ip_bind(bind)) - continue; - + llist_for_each_entry(sbind, &gss->binds, list) { + bind = sbind->bind; sa = gprs_ns2_ip_bind_sockaddr(bind); if (!sa) continue; @@ -1409,6 +1417,8 @@ { struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); + struct ns2_sns_bind *sbind; + struct gprs_ns2_vc *nsvc, *nsvc2; /* reset when receiving GPRS_SNS_EV_NO_NSVC */ switch (event) { @@ -1428,19 +1438,16 @@ ns2_clear_ipv46_entries(gss); /* Choose the next sns endpoint. */ - if (llist_empty(&gss->sns_endpoints)) { + if (llist_empty(&gss->sns_endpoints) || llist_empty(&gss->binds)) { gss->initial = NULL; ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS); osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 3); return; } else if (!gss->initial) { gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list); - gss->bind_offset = 0; } else if (gss->initial->list.next == &gss->sns_endpoints) { /* last entry, continue with first */ gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list); - gss->bind_offset++; - gss->bind_offset %= ns2_ip_count_bind(nse->nsi, &gss->initial->saddr); } else { /* next element is an entry */ gss->initial = llist_entry(gss->initial->list.next, struct sns_endpoint, list); @@ -1449,6 +1456,50 @@ gss->reselection_running = false; osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 1); break; + case GPRS_SNS_EV_REQ_ADD_BIND: + sbind = data; + switch (fi->state) { + case GPRS_SNS_ST_UNCONFIGURED: + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + break; + case GPRS_SNS_ST_SIZE: + /* TODO: add the ip4 element to the list */ + break; + case GPRS_SNS_ST_CONFIG_BSS: + case GPRS_SNS_ST_CONFIG_SGSN: + case GPRS_SNS_ST_CONFIGURED: + /* TODO: add to SNS-IP procedure queue & add nsvc() */ + break; + } + break; + case GPRS_SNS_EV_REQ_DELETE_BIND: + sbind = data; + switch (fi->state) { + case GPRS_SNS_ST_UNCONFIGURED: + break; + case GPRS_SNS_ST_SIZE: + /* TODO: remove the ip4 element from the list */ + llist_for_each_entry_safe(nsvc, nsvc2, &nse->nsvc, list) { + if (nsvc->bind == sbind->bind) { + gprs_ns2_free_nsvc(nsvc); + } + } + break; + case GPRS_SNS_ST_CONFIG_BSS: + case GPRS_SNS_ST_CONFIG_SGSN: + case GPRS_SNS_ST_CONFIGURED: + /* TODO: do an delete SNS-IP procedure */ + /* TODO: remove the ip4 element to the list */ + llist_for_each_entry_safe(nsvc, nsvc2, &nse->nsvc, list) { + if (nsvc->bind == sbind->bind) { + gprs_ns2_free_nsvc(nsvc); + } + } + break; + } + /* if this is the last bind, the free_nsvc() will trigger a reselection */ + talloc_free(sbind); + break; } } @@ -1457,7 +1508,9 @@ .states = ns2_sns_bss_states, .num_states = ARRAY_SIZE(ns2_sns_bss_states), .allstate_event_mask = S(GPRS_SNS_EV_NO_NSVC) | - S(GPRS_SNS_EV_SELECT_ENDPOINT), + S(GPRS_SNS_EV_SELECT_ENDPOINT) | + S(GPRS_SNS_EV_REQ_ADD_BIND) | + S(GPRS_SNS_EV_REQ_DELETE_BIND), .allstate_action = ns2_sns_st_all_action, .cleanup = NULL, .timer_cb = ns2_sns_fsm_bss_timer_cb, @@ -1488,6 +1541,7 @@ fi->priv = gss; gss->nse = nse; INIT_LLIST_HEAD(&gss->sns_endpoints); + INIT_LLIST_HEAD(&gss->binds); return fi; err: @@ -1810,6 +1864,69 @@ } } +int gprs_ns2_sns_add_bind(struct gprs_ns2_nse *nse, + struct gprs_ns2_vc_bind *bind) +{ + struct ns2_sns_state *gss; + struct ns2_sns_bind *tmp; + + OSMO_ASSERT(nse->bss_sns_fi); + gss = nse->bss_sns_fi->priv; + + if (!gprs_ns2_is_ip_bind(bind)) { + return -EINVAL; + } + + if (!llist_empty(&gss->binds)) { + llist_for_each_entry(tmp, &gss->binds, list) { + if (tmp->bind == bind) + return -EALREADY; + } + } + + tmp = talloc_zero(gss, struct ns2_sns_bind); + if (!tmp) + return -ENOMEM; + tmp->bind = bind; + llist_add_tail(&tmp->list, &gss->binds); + + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_ADD_BIND, tmp); + return 0; +} + +/* Remove a bind from the SNS. All assosiated NSVC must be removed. */ +int gprs_ns2_sns_del_bind(struct gprs_ns2_nse *nse, + struct gprs_ns2_vc_bind *bind) +{ + struct ns2_sns_state *gss; + struct ns2_sns_bind *tmp, *tmp2; + bool found = false; + + if (!nse->bss_sns_fi) + return -EINVAL; + + gss = nse->bss_sns_fi->priv; + if (gss->initial_bind && gss->initial_bind->bind == bind) { + if (gss->initial_bind->list.prev == &gss->binds) + gss->initial_bind = NULL; + else + gss->initial_bind = llist_entry(gss->initial_bind->list.prev, struct ns2_sns_bind, list); + } + + llist_for_each_entry_safe(tmp, tmp2, &gss->binds, list) { + if (tmp->bind == bind) { + llist_del(&tmp->list); + found = true; + } + } + + if (!found) + return -ENOENT; + + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_DELETE_BIND, tmp); + return 0; +} + /* Update SNS weights * \param[in] nsvc the NSVC which should be updated */ diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 7a6b3ba..01409bb 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -58,6 +58,7 @@ static struct gprs_ns2_inst *vty_nsi = NULL; static struct osmo_fr_network *vty_fr_network = NULL; static struct llist_head binds; +static struct llist_head nses; struct vty_bind { struct llist_head list; @@ -70,6 +71,21 @@ uint8_t ip_sns_data_weight; }; +struct vty_nse { + struct llist_head list; + uint16_t nsei; + /* list of binds which are valid for this nse. Only IP-SNS uses this + * to allow `no listen ..` in the bind context. So "half" created binds are valid for + * IP-SNS. This allows changing the bind ip without modifying all NSEs afterwards */ + struct llist_head binds; +}; + +/* used by IP-SNS to connect multiple vty_nse_bind to a vty_nse */ +struct vty_nse_bind { + struct llist_head list; + struct vty_bind *vbind; +}; + /* TODO: this should into osmo timer */ static const struct value_string gprs_ns_timer_strs[] = { { 0, "tns-block" }, @@ -135,6 +151,94 @@ talloc_free(vbind); } +static struct vty_nse *vty_nse_by_nsei(uint16_t nsei) +{ + struct vty_nse *vnse; + llist_for_each_entry(vnse, &nses, list) { + if (vnse->nsei == nsei) + return vnse; + } + return NULL; +} + +static struct vty_nse *vty_nse_alloc(uint16_t nsei) +{ + struct vty_nse *vnse = talloc_zero(vty_nsi, struct vty_nse); + if (!vnse) + return NULL; + + vnse->nsei = nsei; + INIT_LLIST_HEAD(&vnse->binds); + llist_add(&vnse->list, &nses); + return vnse; +} + +static void vty_nse_free(struct vty_nse *vnse) +{ + if (!vnse) + return; + + llist_del(&vnse->list); + /* all vbind of the nse will be freed by talloc */ + talloc_free(vnse); +} + +static int vty_nse_add_vbind(struct vty_nse *vnse, struct vty_bind *vbind) +{ + struct vty_nse_bind *vnse_bind; + + if (vbind->ll != GPRS_NS2_LL_UDP) + return -EINVAL; + + llist_for_each_entry(vnse_bind, &vnse->binds, list) { + if (vnse_bind->vbind == vbind) + return -EALREADY; + } + + vnse_bind = talloc(vnse, struct vty_nse_bind); + if (!vnse_bind) + return -ENOMEM; + vnse_bind->vbind = vbind; + + llist_add_tail(&vnse_bind->list, &vnse->binds); + return 0; +} + +static int vty_nse_remove_vbind(struct vty_nse *vnse, struct vty_bind *vbind) +{ + struct vty_nse_bind *vnse_bind, *tmp; + if (vbind->ll != GPRS_NS2_LL_UDP) + return -EINVAL; + + llist_for_each_entry_safe(vnse_bind, tmp, &vnse->binds, list) { + if (vnse_bind->vbind == vbind) { + llist_del(&vnse_bind->list); + talloc_free(vnse_bind); + } + } + + return -ENOENT; +} + +/* check if the NSE still has SNS configuration */ +static bool vty_nse_check_sns(struct gprs_ns2_nse *nse) { + struct vty_nse *vnse = vty_nse_by_nsei(nse->nsei); + + int count = gprs_ns2_sns_count(nse); + if (count > 0) { + /* there are other sns endpoints */ + return true; + } + + if (!vnse) + return false; + + if (llist_empty(&vnse->binds)) + return false; + + return true; +} + static struct cmd_node ns_node = { L_NS_NODE, "%s(config-ns)# ", @@ -172,14 +276,26 @@ ) { struct gprs_ns2_nse *nse; + struct vty_nse *vnse; uint16_t nsei = atoi(argv[0]); + bool free_vnse = false; + + vnse = vty_nse_by_nsei(nsei); + if (!vnse) { + vnse = vty_nse_alloc(nsei); + if (!vnse) { + vty_out(vty, "Failed to create vty NSE!%s", VTY_NEWLINE); + return CMD_ERR_INCOMPLETE; + } + free_vnse = true; + } nse = gprs_ns2_nse_by_nsei(vty_nsi, nsei); if (!nse) { nse = gprs_ns2_create_nse(vty_nsi, nsei, GPRS_NS2_LL_UNDEF, GPRS_NS2_DIALECT_UNDEF); if (!nse) { vty_out(vty, "Failed to create NSE!%s", VTY_NEWLINE); - return CMD_ERR_INCOMPLETE; + goto err; } nse->persistent = true; } @@ -187,13 +303,19 @@ if (!nse->persistent) { /* TODO: should the dynamic NSE removed? */ vty_out(vty, "A dynamic NSE with the specified NSEI already exists%s", VTY_NEWLINE); - return CMD_ERR_INCOMPLETE; + goto err; } vty->node = L_NS_NSE_NODE; vty->index = nse; return CMD_SUCCESS; + +err: + if (free_vnse) + talloc_free(vnse); + + return CMD_ERR_INCOMPLETE; } DEFUN(cfg_no_ns_nsei, cfg_no_ns_nsei_cmd, @@ -204,6 +326,7 @@ ) { struct gprs_ns2_nse *nse; + struct vty_nse *vnse; uint16_t nsei = atoi(argv[0]); nse = gprs_ns2_nse_by_nsei(vty_nsi, nsei); @@ -219,6 +342,10 @@ vty_out(vty, "Deleting NS Entity %u%s", nse->nsei, VTY_NEWLINE); gprs_ns2_free_nse(nse); + + vnse = vty_nse_by_nsei(nsei); + vty_nse_free(vnse); + return CMD_SUCCESS; } @@ -394,11 +521,18 @@ static void _config_write_ns_nse(struct vty *vty, struct gprs_ns2_nse *nse) { struct gprs_ns2_vc *nsvc; + struct vty_nse *vnse = vty_nse_by_nsei(nse->nsei); + struct vty_nse_bind *vbind; + + OSMO_ASSERT(vnse); vty_out(vty, " nse %u%s", nse->nsei, VTY_NEWLINE); switch (nse->dialect) { case GPRS_NS2_DIALECT_SNS: ns2_sns_write_vty(vty, nse); + llist_for_each_entry(vbind, &vnse->binds, list) { + vty_out(vty, " ip-sns-bind %s%s", vbind->vbind->name, VTY_NEWLINE); + } break; default: llist_for_each_entry(nsvc, &nse->nsvc, list) { @@ -472,7 +606,7 @@ { struct vty_bind *vbind = vty->index; struct gprs_ns2_vc_bind *bind; - + int rc; const char *addr_str = argv[0]; unsigned int port = atoi(argv[1]); struct osmo_sockaddr_str sockaddr_str; @@ -494,8 +628,9 @@ return CMD_WARNING; } - if (gprs_ns2_ip_bind(vty_nsi, vbind->name, &sockaddr, vbind->dscp, &bind) != 0) { - vty_out(vty, "Failed to create the bind!%s", VTY_NEWLINE); + rc = gprs_ns2_ip_bind(vty_nsi, vbind->name, &sockaddr, vbind->dscp, &bind); + if (rc != 0) { + vty_out(vty, "Failed to create the bind (rc %d)!%s", rc, VTY_NEWLINE); return CMD_WARNING; } @@ -1320,7 +1455,6 @@ struct osmo_sockaddr_str remote_str; /* argv[0] */ struct osmo_sockaddr remote; uint16_t port = atoi(argv[1]); - int count; if (nse->ll != GPRS_NS2_LL_UDP) { vty_out(vty, "This NSE doesn't support UDP.%s", VTY_NEWLINE); @@ -1347,12 +1481,9 @@ return CMD_WARNING; } - count = gprs_ns2_sns_count(nse); - if (count > 0) { - /* there are other sns endpoints */ + if (vty_nse_check_sns(nse)) { + /* there is still sns configuration valid */ return CMD_SUCCESS; - } else if (count < 0) { - OSMO_ASSERT(0); } else { /* clean up nse to allow other nsvc commands */ osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); @@ -1364,6 +1495,175 @@ return CMD_SUCCESS; } +DEFUN(cfg_ns_nse_ip_sns_bind, cfg_ns_nse_ip_sns_bind_cmd, + "ip-sns-bind BINDID", + "IP SNS binds\n" + "A udp bind which this SNS will be used. The bind must be already exists. Can be given multiple times.\n") +{ + struct gprs_ns2_nse *nse = vty->index; + struct gprs_ns2_vc_bind *bind; + struct vty_bind *vbind; + struct vty_nse *vnse; + const char *name = argv[0]; + bool ll_modified = false; + bool dialect_modified = false; + int rc; + + if (nse->ll == GPRS_NS2_LL_UNDEF) { + nse->ll = GPRS_NS2_LL_UDP; + ll_modified = true; + } + + if (nse->dialect == GPRS_NS2_DIALECT_UNDEF) { + char sns[16]; + snprintf(sns, sizeof(sns), "NSE%05u-SNS", nse->nsei); + nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, sns); + if (!nse->bss_sns_fi) + goto err; + nse->dialect = GPRS_NS2_DIALECT_SNS; + dialect_modified = true; + } + + if (nse->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "Can not mix NS-VC with different link layer%s", VTY_NEWLINE); + goto err; + } + + if (nse->dialect != GPRS_NS2_DIALECT_SNS) { + vty_out(vty, "Can not mix NS-VC with different dialects%s", VTY_NEWLINE); + goto err; + } + + vbind = vty_bind_by_name(name); + if (!vbind) { + vty_out(vty, "Can not find the given bind '%s'%s", name, VTY_NEWLINE); + goto err; + } + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "ip-sns-bind can only be used with UDP bind%s", + VTY_NEWLINE); + goto err; + } + + /* the vnse has been created together when creating the nse node. The parent node should check this already! */ + vnse = vty_nse_by_nsei(nse->nsei); + OSMO_ASSERT(vnse); + + rc = vty_nse_add_vbind(vnse, vbind); + switch (rc) { + case 0: + break; + case -EALREADY: + vty_out(vty, "Failed to add ip-sns-bind %s already present%s", name, VTY_NEWLINE); + goto err; + case -ENOMEM: + vty_out(vty, "Failed to add ip-sns-bind %s out of memory%s", name, VTY_NEWLINE); + goto err; + default: + vty_out(vty, "Failed to add ip-sns-bind %s! %d%s", name, rc, VTY_NEWLINE); + goto err; + } + + /* the bind might not yet created because "listen" is missing. */ + bind = gprs_ns2_bind_by_name(vty_nsi, name); + if (!bind) + return CMD_SUCCESS; + + rc = gprs_ns2_sns_add_bind(nse, bind); + switch (rc) { + case 0: + break; + case -EALREADY: + vty_out(vty, "Failed to add ip-sns-bind %s already present%s", name, VTY_NEWLINE); + goto err; + case -ENOMEM: + vty_out(vty, "Failed to add ip-sns-bind %s out of memory%s", name, VTY_NEWLINE); + goto err; + default: + vty_out(vty, "Failed to add ip-sns-bind %s! %d%s", name, rc, VTY_NEWLINE); + goto err; + } + + return CMD_SUCCESS; +err: + if (ll_modified) + nse->ll = GPRS_NS2_LL_UNDEF; + if (dialect_modified) + nse->dialect = GPRS_NS2_DIALECT_UNDEF; + + return CMD_WARNING; +} + +DEFUN(cfg_no_ns_nse_ip_sns_bind, cfg_no_ns_nse_ip_sns_bind_cmd, + "no ip-sns-bind BINDID", + NO_STR + "IP SNS binds\n" + "A udp bind which this SNS will be used.\n") +{ + struct gprs_ns2_nse *nse = vty->index; + struct gprs_ns2_vc_bind *bind; + struct vty_bind *vbind; + struct vty_nse *vnse; + const char *name = argv[0]; + int rc; + + if (nse->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "This NSE doesn't support UDP.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (nse->dialect != GPRS_NS2_DIALECT_SNS) { + vty_out(vty, "This NSE doesn't support UDP with dialect ip-sns.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + vbind = vty_bind_by_name(name); + if (!vbind) { + vty_out(vty, "Can not find the given bind '%s'%s", name, VTY_NEWLINE); + return CMD_WARNING; + } + + if (vbind->ll != GPRS_NS2_LL_UDP) { + vty_out(vty, "no ip-sns-bind can only be used with UDP bind%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + /* the vnse has been created together when creating the nse node. The parent node should check this already! */ + vnse = vty_nse_by_nsei(nse->nsei); + OSMO_ASSERT(vnse); + + rc = vty_nse_remove_vbind(vnse, vbind); + switch(rc) { + case 0: + break; + case -ENOENT: + vty_out(vty, "Bind %s is not part of this NSE%s", name, VTY_NEWLINE); + return CMD_WARNING; + case -EINVAL: + vty_out(vty, "no ip-sns-bind can only be used with UDP bind%s", + VTY_NEWLINE); + return CMD_WARNING; + default: + return CMD_WARNING; + } + + /* the bind might not exists yet */ + bind = gprs_ns2_bind_by_name(vty_nsi, name); + if (bind) + gprs_ns2_sns_del_bind(nse, bind); + + if (!vty_nse_check_sns(nse)) { + /* clean up nse to allow other nsvc commands */ + osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); + nse->bss_sns_fi = NULL; + nse->ll = GPRS_NS2_LL_UNDEF; + nse->dialect = GPRS_NS2_DIALECT_UNDEF; + } + + return CMD_SUCCESS; +} /* non-config commands */ static void dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats) @@ -1676,6 +1976,7 @@ { vty_nsi = nsi; INIT_LLIST_HEAD(&binds); + INIT_LLIST_HEAD(&nses); vty_fr_network = osmo_fr_network_alloc(nsi); if (!vty_fr_network) @@ -1737,6 +2038,8 @@ install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_ipa_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_remote_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_remote_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_ip_sns_bind_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_ip_sns_bind_cmd); return 0; } diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index 699ed1b..588fabf 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -185,7 +185,9 @@ gprs_ns2_recv_prim; gprs_ns2_reset_persistent_nsvcs; gprs_ns2_start_alive_all_nsvcs; +gprs_ns2_sns_add_bind; gprs_ns2_sns_add_endpoint; +gprs_ns2_sns_del_bind; gprs_ns2_sns_del_endpoint; gprs_ns2_vty_init; gprs_ns2_vty_init_reduced; diff --git a/tests/gb/osmo-ns-dummy.cfg b/tests/gb/osmo-ns-dummy.cfg index 1e6dc76..7269618 100644 --- a/tests/gb/osmo-ns-dummy.cfg +++ b/tests/gb/osmo-ns-dummy.cfg @@ -21,4 +21,5 @@ nse 1235 nsvc udp local 127.0.0.3 23000 nse 1234 + ip-sns-bind local ip-sns-remote 127.0.0.2 2158 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ab8092bf286e7d90e92f5702a5404425e959c84 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 13 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:51 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vty: add optional argument signalling and data weights to `n... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22900 ) Change subject: gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` ...................................................................... gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` A static configured UDP NSVC can have signalling and data weights Related: SYS#5354 Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f --- M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 2 files changed, 74 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 01409bb..4bd7cde 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1038,14 +1038,8 @@ return CMD_SUCCESS; } -DEFUN(cfg_ns_nse_nsvc_udp, cfg_ns_nse_nsvc_udp_cmd, - "nsvc udp BIND " VTY_IPV46_CMD " <1-65535>", - "NS Virtual Connection\n" - "NS over UDP\n" - "A unique bind identifier created by ns bind\n" - "Remote IPv4 Address\n" "Remote IPv6 Address\n" - "Remote UDP Port\n" - ) +static int ns_nse_nsvc_udp_cmds(struct vty *vty, const char *bind_name, const char *remote_char, uint16_t port, + uint16_t sig_weight, uint16_t data_weight) { struct gprs_ns2_vc_bind *bind; struct gprs_ns2_vc *nsvc; @@ -1053,10 +1047,8 @@ bool dialect_modified = false; bool ll_modified = false; - const char *bind_name = argv[0]; struct osmo_sockaddr_str remote_str; struct osmo_sockaddr remote; - uint16_t port = atoi(argv[2]); if (nse->ll == GPRS_NS2_LL_UNDEF) { nse->ll = GPRS_NS2_LL_UDP; @@ -1078,7 +1070,7 @@ goto err; } - if (osmo_sockaddr_str_from_str(&remote_str, argv[1], port)) { + if (osmo_sockaddr_str_from_str(&remote_str, remote_char, port)) { vty_out(vty, "Can not parse IPv4/IPv6 or port.%s", VTY_NEWLINE); goto err; } @@ -1106,6 +1098,8 @@ vty_out(vty, "Can not create NS-VC.%s", VTY_NEWLINE); goto err; } + nsvc->sig_weight = sig_weight; + nsvc->data_weight = data_weight; nsvc->persistent = true; return CMD_SUCCESS; @@ -1118,6 +1112,45 @@ return CMD_WARNING; } +DEFUN(cfg_ns_nse_nsvc_udp, cfg_ns_nse_nsvc_udp_cmd, + "nsvc udp BIND " VTY_IPV46_CMD " <1-65535>", + "NS Virtual Connection\n" + "NS over UDP\n" + "A unique bind identifier created by ns bind\n" + "Remote IPv4 Address\n" "Remote IPv6 Address\n" + "Remote UDP Port\n") +{ + const char *bind_name = argv[0]; + const char *remote = argv[1]; + uint16_t port = atoi(argv[2]); + uint16_t sig_weight = 1; + uint16_t data_weight = 1; + + return ns_nse_nsvc_udp_cmds(vty, bind_name, remote, port, sig_weight, data_weight); +} + +DEFUN(cfg_ns_nse_nsvc_udp_weights, cfg_ns_nse_nsvc_udp_weights_cmd, + "nsvc udp BIND " VTY_IPV46_CMD " <1-65535> signalling-weight <0-254> data-weight <0-254>", + "NS Virtual Connection\n" + "NS over UDP\n" + "A unique bind identifier created by ns bind\n" + "Remote IPv4 Address\n" "Remote IPv6 Address\n" + "Remote UDP Port\n" + "Signalling weight of the NSVC (default = 1)\n" + "Signalling weight of the NSVC (default = 1)\n" + "Data weight of the NSVC (default = 1)\n" + "Data weight of the NSVC (default = 1)\n" + ) +{ + const char *bind_name = argv[0]; + const char *remote = argv[1]; + uint16_t port = atoi(argv[2]); + uint16_t sig_weight = atoi(argv[3]); + uint16_t data_weight = atoi(argv[4]); + + return ns_nse_nsvc_udp_cmds(vty, bind_name, remote, port, sig_weight, data_weight); +} + DEFUN(cfg_no_ns_nse_nsvc_udp, cfg_no_ns_nse_nsvc_udp_cmd, "no nsvc udp BIND " VTY_IPV46_CMD " <1-65535>", NO_STR @@ -2033,6 +2066,7 @@ install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvci_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_fr_dlci_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_nsvc_udp_cmd); + install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_nsvc_udp_weights_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_udp_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_ns_nse_nsvc_ipa_cmd); install_lib_element(L_NS_NSE_NODE, &cfg_no_ns_nse_nsvc_ipa_cmd); diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index a748f13..a969881 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -32,3 +32,32 @@ UDP bind: 127.0.0.14:42999 DSCP: 0 IP-SNS signalling weight: 1 data weight: 1 0 NS-VC: +OsmoNSdummy# configure terminal +OsmoNSdummy(config)# ns +OsmoNSdummy(config-ns)# nse 1234 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.15 9496 +OsmoNSdummy(config-ns-nse)# end +OsmoNSdummy# show ns +NSEI 01234: UDP, DEAD + NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +UDP bind: 127.0.0.14:42999 DSCP: 0 + IP-SNS signalling weight: 1 data weight: 1 + 1 NS-VC: + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +OsmoNSdummy# configure terminal +OsmoNSdummy(config)# ns +OsmoNSdummy(config-ns)# nse 1234 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 0 data-weight 9 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.17 9496 signalling-weight 0 data-weight 0 +OsmoNSdummy(config-ns-nse)# end +OsmoNSdummy# show ns +NSEI 01234: UDP, DEAD + NSVCI none: RECOVERING PERSIST data_weight=0 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 + NSVCI none: RECOVERING PERSIST data_weight=9 sig_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 + NSVCI none: RECOVERING PERSIST data_weight=1 sig_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +UDP bind: 127.0.0.14:42999 DSCP: 0 + IP-SNS signalling weight: 1 data weight: 1 + 3 NS-VC: + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 + NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id363937c64e786c55e3136401ebdb44052415e0f Gerrit-Change-Number: 22900 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:51 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:51 +0000 Subject: Change in libosmocore[master]: gprs_ns2: implement a simple load sharing for UDP In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22901 ) Change subject: gprs_ns2: implement a simple load sharing for UDP ...................................................................... gprs_ns2: implement a simple load sharing for UDP Implement the load sharing based on modulo of the LSP. As long the gprs_ns2 doesn't support the resource distribution function (48.016 ? 4.4a) this simple approach is good enought. Fixes: OS#4836 Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 --- M src/gb/gprs_ns2.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns2_test.ok 3 files changed, 142 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index bc4db53..e290734 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -384,6 +384,45 @@ return NULL; } +/* 4.4.2 Load Sharing function for the IP Sub-Network + * + * Implement a simple approach for UDP load sharing of data weight based on the modulo of the lsp. + * + * E.g. 3 NSVC: 1st weight 5, 2nd weight 3, 3rd weight 1, lsp = 3. + * sum all weights = 9 + * target_weight = lsp % sum = 3 + * + * 1st NSVC will be the target for 0-4 + * 2nd NSVC will be the target for 5-7 + * 3rd NSVC will be the target for 8 + * + * The 1st NSVC will be used. + * E.g. lsp = 7. The 2nd NSVC will used. + */ +static struct gprs_ns2_vc *ns2_load_sharing_weight_modulo( + struct gprs_ns2_nse *nse, + uint16_t bvci, + uint32_t load_selector) +{ + struct gprs_ns2_vc *tmp; + uint32_t mod; + uint32_t i = 0; + + if (nse->nsvc_count == 0) + return NULL; + + mod = (bvci + load_selector) % nse->sum_data_weight; + llist_for_each_entry(tmp, &nse->nsvc, list) { + if (!ns2_vc_is_unblocked(tmp)) + continue; + if (i == mod || mod < i + tmp->data_weight) + return tmp; + i += tmp->data_weight; + } + + return NULL; +} + /* pick the first available data NSVC - no load sharing */ struct gprs_ns2_vc *ns2_load_sharing_first(struct gprs_ns2_nse *nse) { @@ -421,7 +460,7 @@ nsvc = ns2_load_sharing_signal(nse); } else { /* data with load sharing parameter */ - nsvc = ns2_load_sharing_first(nse); + nsvc = ns2_load_sharing_weight_modulo(nse, bvci, link_selector); } break; } diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index 6d71a8c..d8ed06f 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -60,6 +60,18 @@ return 0; } +static int gp_send_to_ns(struct gprs_ns2_inst *nsi, struct msgb *msg, uint16_t nsei, uint16_t bvci, uint32_t lsp) +{ + struct osmo_gprs_ns2_prim nsp = {}; + nsp.nsei = nsei; + nsp.bvci = bvci; + nsp.u.unitdata.link_selector = lsp; + osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, + PRIM_OP_REQUEST, msg); + return gprs_ns2_recv_prim(nsi, &nsp.oph); +} + + static struct msgb *get_pdu(struct gprs_ns2_vc_bind *bind, enum ns_pdu_type pdu_type) { struct gprs_ns_hdr *nsh; @@ -88,6 +100,12 @@ return false; } +static unsigned int count_pdus(struct gprs_ns2_vc_bind *bind) +{ + struct osmo_wqueue *queue = bind->priv; + return llist_count(&queue->msg_queue); +} + static void clear_pdus(struct gprs_ns2_vc_bind *bind) { struct osmo_wqueue *queue = bind->priv; @@ -370,6 +388,81 @@ printf("--- Finish unitdata test\n"); } +void test_unitdata_weights(void *ctx) +{ + struct gprs_ns2_inst *nsi; + struct gprs_ns2_vc_bind *bind[3]; + struct gprs_ns2_vc_bind *loopbind; + struct gprs_ns2_nse *nse; + struct gprs_ns2_vc *nsvc[3]; + struct gprs_ns2_vc *loop[3]; + + struct msgb *msg, *other; + char idbuf[32]; + int i; + + printf("--- Testing unitdata weight test\n"); + osmo_wqueue_clear(unitdata); + printf("---- Create NSE + Binds\n"); + nsi = gprs_ns2_instantiate(ctx, ns_prim_cb, NULL); + bind[0] = dummy_bind(nsi, "bblock1"); + bind[1] = dummy_bind(nsi, "bblock2"); + bind[2] = dummy_bind(nsi, "bblock3"); + loopbind = loopback_bind(nsi, "loopback"); + nse = gprs_ns2_create_nse(nsi, 1004, GPRS_NS2_LL_UDP, GPRS_NS2_DIALECT_STATIC_ALIVE); + OSMO_ASSERT(nse); + + /* data weights are + * nsvc[0] = 1 + * nsvc[1] = 2 + * nsvc[2] = 3 + */ + for (i = 0; i < 3; i++) { + printf("---- Create NSVC[%d]\n", i); + snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei, i); + nsvc[i] = ns2_vc_alloc(bind[i], nse, false, GPRS_NS2_VC_MODE_ALIVE, idbuf); + loop[i] = loopback_nsvc(loopbind, nsvc[i]); + OSMO_ASSERT(nsvc[i]); + nsvc[i]->data_weight = i + 1; + ns2_vc_fsm_start(nsvc[i]); + OSMO_ASSERT(!ns2_vc_is_unblocked(nsvc[i])); + ns2_tx_alive_ack(loop[i]); + OSMO_ASSERT(ns2_vc_is_unblocked(nsvc[i])); + } + + /* all nsvcs are alive */ + printf("---- Send UNITDATA to all NSVCs\n"); + for (i = 0; i < 3; i++) { + msg = generate_unitdata("test_unitdata_weight"); + ns2_recv_vc(nsvc[i], msg); + other = msgb_dequeue(&unitdata->msg_queue); + OSMO_ASSERT(msg == other); + other = msgb_dequeue(&unitdata->msg_queue); + OSMO_ASSERT(NULL == other); + msgb_free(msg); + } + + /* nsvc[1] should be still good */ + printf("---- Send BSSGP data to the NSE to test unitdata over NSVC[1]\n"); + for (i = 0; i < 3; i++) + clear_pdus(bind[i]); + + for (i = 0; i < 12; i++) { + msg = generate_unitdata("test_unitdata_weight2"); + gp_send_to_ns(nsi, msg, 1004, 1, i + 1); + } + + for (i = 0; i < 3; i++) + fprintf(stderr, "count_pdus(bind[%d]) = %d\n", i, count_pdus(bind[i])); + + for (i = 0; i < 3; i++) { + OSMO_ASSERT(count_pdus(bind[i]) == nsvc[i]->data_weight * 2); + } + + gprs_ns2_free(nsi); + printf("--- Finish unitdata weight test\n"); +} + void test_mtu(void *ctx) { struct gprs_ns2_inst *nsi; @@ -440,6 +533,7 @@ test_nse_transfer_cap(ctx); test_block_unblock_nsvc(ctx); test_unitdata(ctx); + test_unitdata_weights(ctx); test_mtu(ctx); printf("===== NS2 protocol test END\n\n"); diff --git a/tests/gb/gprs_ns2_test.ok b/tests/gb/gprs_ns2_test.ok index f40579f..40a1528 100644 --- a/tests/gb/gprs_ns2_test.ok +++ b/tests/gb/gprs_ns2_test.ok @@ -20,6 +20,14 @@ ---- Try to receive over blocked NSVC[0] ---- Receive over NSVC[1] --- Finish unitdata test +--- Testing unitdata weight test +---- Create NSE + Binds +---- Create NSVC[0] +---- Create NSVC[1] +---- Create NSVC[2] +---- Send UNITDATA to all NSVCs +---- Send BSSGP data to the NSE to test unitdata over NSVC[1] +--- Finish unitdata weight test --- Testing mtu test ---- Create NSE + Binds ---- Create NSVC[0] -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8c2fe5d647694886ac600470fca6ea5d5d210a85 Gerrit-Change-Number: 22901 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:52 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:52 +0000 Subject: Change in libosmocore[master]: gprs_ns2: fix typo in function name ns2_load_sharing_modulo In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22933 ) Change subject: gprs_ns2: fix typo in function name ns2_load_sharing_modulo ...................................................................... gprs_ns2: fix typo in function name ns2_load_sharing_modulo It's a modulo operation, not modulo*r*. Change-Id: I0345f2bcac9c57cf7efe8ff27fda4d049e04d5cc --- M src/gb/gprs_ns2.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index e290734..3699d62 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -360,7 +360,7 @@ } /* 4.4.1 Load Sharing function for the Frame Relay Sub-Network */ -static struct gprs_ns2_vc *ns2_load_sharing_modulor( +static struct gprs_ns2_vc *ns2_load_sharing_modulo( struct gprs_ns2_nse *nse, uint16_t bvci, uint32_t load_selector) @@ -451,7 +451,7 @@ switch (nse->ll) { case GPRS_NS2_LL_FR: - nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector); + nsvc = ns2_load_sharing_modulo(nse, bvci, link_selector); break; case GPRS_NS2_LL_UDP: default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0345f2bcac9c57cf7efe8ff27fda4d049e04d5cc Gerrit-Change-Number: 22933 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:52 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:52 +0000 Subject: Change in libosmocore[master]: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22904 ) Change subject: gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership ...................................................................... gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership Have a clear ownership of the msgb to prevent any leaks. Related: OS#5022 Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c --- M src/gb/gprs_ns2.c 1 file changed, 25 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 3699d62..3e023ca 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -482,33 +482,43 @@ struct gprs_ns2_vc *nsvc = NULL; uint16_t bvci, nsei; uint8_t sducontrol = 0; + int rc = 0; - if (oph->sap != SAP_NS) - return -EINVAL; + if (oph->sap != SAP_NS) { + rc = -EINVAL; + goto out; + } nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph); - if (oph->operation != PRIM_OP_REQUEST || oph->primitive != GPRS_NS2_PRIM_UNIT_DATA) - return -EINVAL; + if (oph->operation != PRIM_OP_REQUEST || oph->primitive != GPRS_NS2_PRIM_UNIT_DATA) { + rc = -EINVAL; + goto out; + } - if (!oph->msg) - return -EINVAL; + if (!oph->msg) { + rc = -EINVAL; + goto out; + } bvci = nsp->bvci; nsei = nsp->nsei; nse = gprs_ns2_nse_by_nsei(nsi, nsei); - if (!nse) - return -EINVAL; + if (!nse) { + rc = -EINVAL; + goto out; + } - if (!nse->alive) - return 0; + if (!nse->alive) { + goto out; + } nsvc = ns2_load_sharing(nse, bvci, nsp->u.unitdata.link_selector); /* TODO: send a status primitive back */ if (!nsvc) - return 0; + goto out; if (nsp->u.unitdata.change == GPRS_NS2_ENDPOINT_REQUEST_CHANGE) sducontrol = 1; @@ -516,6 +526,10 @@ sducontrol = 2; return ns2_tx_unit_data(nsvc, bvci, sducontrol, oph->msg); + +out: + msgb_free(oph->msg); + return rc; } /*! Send a STATUS.ind primitive to the specified NS instance user. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67e70561e7aae4d4556a02f03a8af6c2daf5ff9c Gerrit-Change-Number: 22904 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:53 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:53 +0000 Subject: Change in libosmocore[master]: gprs_ns2_sns: rename fsm events to include RX or REQ prefix In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22903 ) Change subject: gprs_ns2_sns: rename fsm events to include RX or REQ prefix ...................................................................... gprs_ns2_sns: rename fsm events to include RX or REQ prefix An event which originates by a received PDU is prefixed by RX. An event which originates by code gets a REQ prefix. Fixes: OS#5014 Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b --- M src/gb/gprs_ns2_sns.c 1 file changed, 67 insertions(+), 67 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index dfa9afe..a82da95 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -70,35 +70,35 @@ }; enum gprs_sns_event { - GPRS_SNS_EV_SELECT_ENDPOINT, /*!< Select a SNS endpoint from the list */ - GPRS_SNS_EV_SIZE, - GPRS_SNS_EV_SIZE_ACK, - GPRS_SNS_EV_CONFIG, - GPRS_SNS_EV_CONFIG_END, /*!< SNS-CONFIG with end flag received */ - GPRS_SNS_EV_CONFIG_ACK, - GPRS_SNS_EV_ADD, - GPRS_SNS_EV_DELETE, - GPRS_SNS_EV_CHANGE_WEIGHT, - GPRS_SNS_EV_NO_NSVC, - GPRS_SNS_EV_NSVC_ALIVE, /*!< a NS-VC became alive */ + GPRS_SNS_EV_REQ_SELECT_ENDPOINT, /*!< Select a SNS endpoint from the list */ + GPRS_SNS_EV_RX_SIZE, + GPRS_SNS_EV_RX_SIZE_ACK, + GPRS_SNS_EV_RX_CONFIG, + GPRS_SNS_EV_RX_CONFIG_END, /*!< SNS-CONFIG with end flag received */ + GPRS_SNS_EV_RX_CONFIG_ACK, + GPRS_SNS_EV_RX_ADD, + GPRS_SNS_EV_RX_DELETE, + GPRS_SNS_EV_RX_CHANGE_WEIGHT, + GPRS_SNS_EV_REQ_NO_NSVC, + GPRS_SNS_EV_REQ_NSVC_ALIVE, /*!< a NS-VC became alive */ GPRS_SNS_EV_REQ_ADD_BIND, GPRS_SNS_EV_REQ_DELETE_BIND, }; static const struct value_string gprs_sns_event_names[] = { - { GPRS_SNS_EV_SELECT_ENDPOINT, "SELECT_ENDPOINT" }, - { GPRS_SNS_EV_SIZE, "SIZE" }, - { GPRS_SNS_EV_SIZE_ACK, "SIZE_ACK" }, - { GPRS_SNS_EV_CONFIG, "CONFIG" }, - { GPRS_SNS_EV_CONFIG_END, "CONFIG_END" }, - { GPRS_SNS_EV_CONFIG_ACK, "CONFIG_ACK" }, - { GPRS_SNS_EV_ADD, "ADD" }, - { GPRS_SNS_EV_DELETE, "DELETE" }, - { GPRS_SNS_EV_CHANGE_WEIGHT, "CHANGE_WEIGHT" }, - { GPRS_SNS_EV_NO_NSVC, "NO_NSVC" }, - { GPRS_SNS_EV_NSVC_ALIVE, "NSVC_ALIVE"}, - { GPRS_SNS_EV_REQ_ADD_BIND, "ADD_BIND"}, - { GPRS_SNS_EV_REQ_DELETE_BIND, "DELETE_BIND"}, + { GPRS_SNS_EV_REQ_SELECT_ENDPOINT, "REQ_SELECT_ENDPOINT" }, + { GPRS_SNS_EV_RX_SIZE, "RX_SIZE" }, + { GPRS_SNS_EV_RX_SIZE_ACK, "RX_SIZE_ACK" }, + { GPRS_SNS_EV_RX_CONFIG, "RX_CONFIG" }, + { GPRS_SNS_EV_RX_CONFIG_END, "RX_CONFIG_END" }, + { GPRS_SNS_EV_RX_CONFIG_ACK, "RX_CONFIG_ACK" }, + { GPRS_SNS_EV_RX_ADD, "RX_ADD" }, + { GPRS_SNS_EV_RX_DELETE, "RX_DELETE" }, + { GPRS_SNS_EV_RX_CHANGE_WEIGHT, "RX_CHANGE_WEIGHT" }, + { GPRS_SNS_EV_REQ_NO_NSVC, "REQ_NO_NSVC" }, + { GPRS_SNS_EV_REQ_NSVC_ALIVE, "REQ_NSVC_ALIVE"}, + { GPRS_SNS_EV_REQ_ADD_BIND, "REQ_ADD_BIND"}, + { GPRS_SNS_EV_REQ_DELETE_BIND, "REQ_DELETE_BIND"}, { 0, NULL } }; @@ -276,7 +276,7 @@ } } - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_NO_NSVC, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL); } static void ns2_clear_ipv46_entries(struct ns2_sns_state *gss) @@ -706,7 +706,7 @@ struct tlv_parsed *tp = NULL; switch (event) { - case GPRS_SNS_EV_SIZE_ACK: + case GPRS_SNS_EV_RX_SIZE_ACK: tp = data; if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) { LOGPFSML(fi, LOGL_ERROR, "SNS-SIZE-ACK with cause %s\n", @@ -866,7 +866,7 @@ struct gprs_ns2_nse *nse = nse_inst_from_fi(fi); switch (event) { - case GPRS_SNS_EV_CONFIG_ACK: + case GPRS_SNS_EV_RX_CONFIG_ACK: tp = (struct tlv_parsed *) data; if (TLVP_VAL_MINLEN(tp, NS_IE_CAUSE, 1)) { LOGPFSML(fi, LOGL_ERROR, "SNS-CONFIG-ACK with cause %s\n", @@ -946,7 +946,7 @@ LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv4 list now %u entries\n", gss->num_ip4_remote); - if (event == GPRS_SNS_EV_CONFIG_END) { + if (event == GPRS_SNS_EV_RX_CONFIG_END) { /* check if sum of data / sig weights == 0 */ if (ip4_weight_sum_data(gss->ip4_remote, gss->num_ip4_remote) == 0 || ip4_weight_sum_sig(gss->ip4_remote, gss->num_ip4_remote) == 0) { @@ -997,7 +997,7 @@ LOGPFSML(fi, LOGL_INFO, "Rx SNS-CONFIG: Remote IPv6 list now %u entries\n", gss->num_ip6_remote); - if (event == GPRS_SNS_EV_CONFIG_END) { + if (event == GPRS_SNS_EV_RX_CONFIG_END) { /* check if sum of data / sig weights == 0 */ if (ip6_weight_sum_data(gss->ip6_remote, gss->num_ip6_remote) == 0 || ip6_weight_sum_sig(gss->ip6_remote, gss->num_ip6_remote) == 0) { @@ -1031,8 +1031,8 @@ struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv; switch (event) { - case GPRS_SNS_EV_CONFIG_END: - case GPRS_SNS_EV_CONFIG: + case GPRS_SNS_EV_RX_CONFIG_END: + case GPRS_SNS_EV_RX_CONFIG: #if 0 /* part of incoming SNS-SIZE (doesn't happen on BSS side */ if (TLVP_PRESENT(tp, NS_IE_RESET_FLAG)) { @@ -1059,7 +1059,7 @@ } } -/* called when receiving GPRS_SNS_EV_ADD in state configure */ +/* called when receiving GPRS_SNS_EV_RX_ADD in state configure */ static void ns2_sns_st_configured_add(struct osmo_fsm_inst *fi, struct ns2_sns_state *gss, struct tlv_parsed *tp) @@ -1302,16 +1302,16 @@ struct tlv_parsed *tp = data; switch (event) { - case GPRS_SNS_EV_ADD: + case GPRS_SNS_EV_RX_ADD: ns2_sns_st_configured_add(fi, gss, tp); break; - case GPRS_SNS_EV_DELETE: + case GPRS_SNS_EV_RX_DELETE: ns2_sns_st_configured_delete(fi, gss, tp); break; - case GPRS_SNS_EV_CHANGE_WEIGHT: + case GPRS_SNS_EV_RX_CHANGE_WEIGHT: ns2_sns_st_configured_change(fi, gss, tp); break; - case GPRS_SNS_EV_NSVC_ALIVE: + case GPRS_SNS_EV_REQ_NSVC_ALIVE: osmo_timer_del(&fi->timer); break; } @@ -1331,7 +1331,7 @@ .action = ns2_sns_st_unconfigured, }, [GPRS_SNS_ST_SIZE] = { - .in_event_mask = S(GPRS_SNS_EV_SIZE_ACK), + .in_event_mask = S(GPRS_SNS_EV_RX_SIZE_ACK), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_SIZE) | S(GPRS_SNS_ST_CONFIG_BSS), @@ -1340,7 +1340,7 @@ .onenter = ns2_sns_st_size_onenter, }, [GPRS_SNS_ST_CONFIG_BSS] = { - .in_event_mask = S(GPRS_SNS_EV_CONFIG_ACK), + .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG_ACK), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_CONFIG_BSS) | S(GPRS_SNS_ST_CONFIG_SGSN) | @@ -1350,8 +1350,8 @@ .onenter = ns2_sns_st_config_bss_onenter, }, [GPRS_SNS_ST_CONFIG_SGSN] = { - .in_event_mask = S(GPRS_SNS_EV_CONFIG) | - S(GPRS_SNS_EV_CONFIG_END), + .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG) | + S(GPRS_SNS_EV_RX_CONFIG_END), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_CONFIG_SGSN) | S(GPRS_SNS_ST_CONFIGURED) | @@ -1361,10 +1361,10 @@ .onenter = ns2_sns_st_config_sgsn_onenter, }, [GPRS_SNS_ST_CONFIGURED] = { - .in_event_mask = S(GPRS_SNS_EV_ADD) | - S(GPRS_SNS_EV_DELETE) | - S(GPRS_SNS_EV_CHANGE_WEIGHT) | - S(GPRS_SNS_EV_NSVC_ALIVE), + .in_event_mask = S(GPRS_SNS_EV_RX_ADD) | + S(GPRS_SNS_EV_RX_DELETE) | + S(GPRS_SNS_EV_RX_CHANGE_WEIGHT) | + S(GPRS_SNS_EV_REQ_NSVC_ALIVE), .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) | S(GPRS_SNS_ST_SIZE), .name = "CONFIGURED", @@ -1384,7 +1384,7 @@ case 1: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_SIZE_RETRIES]) { LOGPFSML(fi, LOGL_ERROR, "NSE %d: Size retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nsi->timeout[NS_TOUT_TSNS_PROV], 1); } @@ -1392,7 +1392,7 @@ case 2: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { LOGPFSML(fi, LOGL_ERROR, "NSE %d: BSS Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_BSS, nsi->timeout[NS_TOUT_TSNS_PROV], 2); } @@ -1400,14 +1400,14 @@ case 3: if (gss->N >= nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES]) { LOGPFSML(fi, LOGL_ERROR, "NSE %d: SGSN Config retries failed. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); } else { osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_CONFIG_SGSN, nsi->timeout[NS_TOUT_TSNS_PROV], 3); } break; case 4: LOGPFSML(fi, LOGL_ERROR, "NSE %d: Config succeeded but no NS-VC came online. Selecting next IP-SNS endpoint.\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); break; } return 0; @@ -1420,17 +1420,17 @@ struct ns2_sns_bind *sbind; struct gprs_ns2_vc *nsvc, *nsvc2; - /* reset when receiving GPRS_SNS_EV_NO_NSVC */ + /* reset when receiving GPRS_SNS_EV_REQ_NO_NSVC */ switch (event) { - case GPRS_SNS_EV_NO_NSVC: + case GPRS_SNS_EV_REQ_NO_NSVC: /* ignore reselection running */ if (gss->reselection_running) break; LOGPFSML(fi, LOGL_ERROR, "NSE %d: no remaining NSVC, resetting SNS FSM\n", nse->nsei); - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); break; - case GPRS_SNS_EV_SELECT_ENDPOINT: + case GPRS_SNS_EV_REQ_SELECT_ENDPOINT: /* tear down previous state * gprs_ns2_free_nsvcs() will trigger NO_NSVC, prevent this from triggering a reselection */ gss->reselection_running = true; @@ -1460,7 +1460,7 @@ sbind = data; switch (fi->state) { case GPRS_SNS_ST_UNCONFIGURED: - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); break; case GPRS_SNS_ST_SIZE: /* TODO: add the ip4 element to the list */ @@ -1507,8 +1507,8 @@ .name = "GPRS-NS2-SNS-BSS", .states = ns2_sns_bss_states, .num_states = ARRAY_SIZE(ns2_sns_bss_states), - .allstate_event_mask = S(GPRS_SNS_EV_NO_NSVC) | - S(GPRS_SNS_EV_SELECT_ENDPOINT) | + .allstate_event_mask = S(GPRS_SNS_EV_REQ_NO_NSVC) | + S(GPRS_SNS_EV_REQ_SELECT_ENDPOINT) | S(GPRS_SNS_EV_REQ_ADD_BIND) | S(GPRS_SNS_EV_REQ_DELETE_BIND), .allstate_action = ns2_sns_st_all_action, @@ -1575,28 +1575,28 @@ switch (nsh->pdu_type) { case SNS_PDUT_SIZE: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_SIZE, tp); break; case SNS_PDUT_SIZE_ACK: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_SIZE_ACK, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_SIZE_ACK, tp); break; case SNS_PDUT_CONFIG: if (nsh->data[0] & 0x01) - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_END, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG_END, tp); else - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG, tp); break; case SNS_PDUT_CONFIG_ACK: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CONFIG_ACK, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CONFIG_ACK, tp); break; case SNS_PDUT_ADD: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_ADD, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_ADD, tp); break; case SNS_PDUT_DELETE: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_DELETE, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_DELETE, tp); break; case SNS_PDUT_CHANGE_WEIGHT: - osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_CHANGE_WEIGHT, tp); + osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_RX_CHANGE_WEIGHT, tp); break; case SNS_PDUT_ACK: LOGPFSML(fi, LOGL_NOTICE, "NSEI=%u Rx unsupported SNS PDU type %s\n", nsei, @@ -1740,7 +1740,7 @@ llist_add_tail(&endpoint->list, &gss->sns_endpoints); if (do_selection) - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_SELECT_ENDPOINT, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL); return 0; } @@ -1776,7 +1776,7 @@ return 0; } - /* gprs_ns2_free_nsvcs() will trigger GPRS_SNS_EV_NO_NSVC on the last NS-VC + /* gprs_ns2_free_nsvcs() will trigger GPRS_SNS_EV_REQ_NO_NSVC on the last NS-VC * and restart SNS SIZE procedure which selects a new initial */ LOGNSE(nse, LOGL_INFO, "Current in-use SNS endpoint is being removed." "Closing all NS-VC and restart SNS-SIZE procedure" @@ -1850,7 +1850,7 @@ if (alive) { gss->alive = true; - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NSVC_ALIVE, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_NSVC_ALIVE, NULL); } else { /* is there at least another alive nsvc? */ llist_for_each_entry(tmp, &nse->nsvc, list) { @@ -1860,7 +1860,7 @@ /* all NS-VC have failed */ gss->alive = false; - osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_NO_NSVC, NULL); + osmo_fsm_inst_dispatch(nse->bss_sns_fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL); } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8a6378cdca19b086e89058b1cc055f45c0bba7b Gerrit-Change-Number: 22903 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:53 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:53 +0000 Subject: Change in libosmocore[master]: gprs_ns2_fr: pass MTU changes to the NSE In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22909 ) Change subject: gprs_ns2_fr: pass MTU changes to the NSE ...................................................................... gprs_ns2_fr: pass MTU changes to the NSE When the MTU of the frame relay device changes, update the bind and notify all NSEs. Related: OS#4889 Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c --- M src/gb/gprs_ns2_fr.c 1 file changed, 29 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index 445f00a..6ba2268 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -596,6 +596,27 @@ bpriv->if_running = if_running; } +static void mtu_change(struct gprs_ns2_vc_bind *bind, uint32_t mtu) +{ + struct priv_bind *bpriv = bind->priv; + struct gprs_ns2_nse *nse; + + if (mtu == bind->mtu) + return; + + LOGBIND(bind, LOGL_INFO, "MTU changed from %d to %d.\n", + bind->mtu, mtu); + + /* 2 byte DLCI header */ + bind->mtu = mtu - 2; + if (!bpriv->if_running) + return; + + llist_for_each_entry(nse, &bind->nsi->nse, list) { + ns2_nse_update_mtu(nse); + } +} + /* handle a single netlink message received via libmnl */ static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data) { @@ -623,8 +644,14 @@ if_running = !!(ifm->ifi_flags & IFF_RUNNING); bind = bind4netdev(nsi, ifname); - if (bind) - link_state_change(bind, if_running); + if (!bind) + return MNL_CB_OK; + + if (tb[IFLA_MTU]) { + mtu_change(bind, mnl_attr_get_u32(tb[IFLA_MTU])); + } + + link_state_change(bind, if_running); return MNL_CB_OK; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I946f7655c9526ffd98dabdce219c6a419b71e00c Gerrit-Change-Number: 22909 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:55 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:55 +0000 Subject: Change in libosmocore[master]: gprs_ns2: truncate the NS_STATUS to the MTU In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22910 ) Change subject: gprs_ns2: truncate the NS_STATUS to the MTU ...................................................................... gprs_ns2: truncate the NS_STATUS to the MTU A NS Status can contain the original NS message which might result in a NS PDU which exceeds the MTU of the NS-VC. Truncate the original message to the maximum possible. Based on truncate BSSGP status message. Related: OS#4889 Change-Id: I35d8f8bf0eae890f4db56423da0b23b638d24311 --- M src/gb/gprs_ns2_message.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index bfb8781..7f52c4b 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -432,6 +432,7 @@ struct msgb *msg = ns2_msgb_alloc(); struct gprs_ns_hdr *nsh; uint16_t nsvci = osmo_htons(nsvc->nsvci); + unsigned int orig_len, max_orig_len; log_set_context(LOG_CTX_GB_NSE, nsvc->nse); log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -461,8 +462,12 @@ case NS_CAUSE_PROTO_ERR_UNSPEC: case NS_CAUSE_INVAL_ESSENT_IE: case NS_CAUSE_MISSING_ESSENT_IE: - msgb_tvlv_put(msg, NS_IE_PDU, msgb_l2len(orig_msg), - orig_msg->l2h); + /* ensure the PDU doesn't exceed the MTU */ + orig_len = msgb_l2len(orig_msg); + max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(orig_len); + if (max_orig_len > nsvc->bind->mtu) + orig_len -= max_orig_len - nsvc->bind->mtu; + msgb_tvlv_put(msg, NS_IE_PDU, orig_len, orig_msg->l2h); break; default: break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I35d8f8bf0eae890f4db56423da0b23b638d24311 Gerrit-Change-Number: 22910 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:56 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:56 +0000 Subject: Change in libosmocore[master]: gprs_ns2_message: tx_status: move all cause dependent code into the s... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22911 ) Change subject: gprs_ns2_message: tx_status: move all cause dependent code into the switch/case ...................................................................... gprs_ns2_message: tx_status: move all cause dependent code into the switch/case Change-Id: I8f1e0962c6f5f0c7287990bb7608d0cc9b86dfdb --- M src/gb/gprs_ns2_message.c 1 file changed, 11 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 7f52c4b..ddf7285 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -450,18 +450,18 @@ msgb_tvlv_put(msg, NS_IE_CAUSE, 1, &cause); - /* Section 9.2.7.1: Static conditions for NS-VCI */ - if (cause == NS_CAUSE_NSVC_BLOCKED || - cause == NS_CAUSE_NSVC_UNKNOWN) - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&nsvci); - - /* Section 9.2.7.2: Static conditions for NS PDU */ switch (cause) { + case NS_CAUSE_NSVC_BLOCKED: + case NS_CAUSE_NSVC_UNKNOWN: + /* Section 9.2.7.1: Static conditions for NS-VCI */ + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&nsvci); + break; case NS_CAUSE_SEM_INCORR_PDU: case NS_CAUSE_PDU_INCOMP_PSTATE: case NS_CAUSE_PROTO_ERR_UNSPEC: case NS_CAUSE_INVAL_ESSENT_IE: case NS_CAUSE_MISSING_ESSENT_IE: + /* Section 9.2.7.2: Static conditions for NS PDU */ /* ensure the PDU doesn't exceed the MTU */ orig_len = msgb_l2len(orig_msg); max_orig_len = msgb_length(msg) + TVLV_GROSS_LEN(orig_len); @@ -469,14 +469,15 @@ orig_len -= max_orig_len - nsvc->bind->mtu; msgb_tvlv_put(msg, NS_IE_PDU, orig_len, orig_msg->l2h); break; + case NS_CAUSE_BVCI_UNKNOWN: + /* Section 9.2.7.3: Static conditions for BVCI */ + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&bvci); + break; + default: break; } - /* Section 9.2.7.3: Static conditions for BVCI */ - if (cause == NS_CAUSE_BVCI_UNKNOWN) - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&bvci); - return ns_vc_tx(nsvc, msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f1e0962c6f5f0c7287990bb7608d0cc9b86dfdb Gerrit-Change-Number: 22911 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22930 ) Change subject: gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS ...................................................................... gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS Change-Id: I7c9245be248cb8697a370f80021612c14efa5cbb --- M src/gb/gprs_ns2.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 3e023ca..c48575b 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -217,6 +217,7 @@ { GPRS_NS2_AFF_CAUSE_RECOVERY, "NSE recovery" }, { GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED, "NSE SNS configured" }, { GPRS_NS2_AFF_CAUSE_SNS_FAILURE, "NSE SNS failure" }, + { GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS, "NSE SNS no endpoints"}, { GPRS_NS2_AFF_CAUSE_MTU_CHANGE, "NSE MTU changed" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c9245be248cb8697a370f80021612c14efa5cbb Gerrit-Change-Number: 22930 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:41:57 +0000 Subject: Change in libosmocore[master]: gprs_ns2: ensure no duplicate UDP NSVC can be created In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22944 ) Change subject: gprs_ns2: ensure no duplicate UDP NSVC can be created ...................................................................... gprs_ns2: ensure no duplicate UDP NSVC can be created Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 --- M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 36f6a97..3081680 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -402,6 +402,10 @@ return NULL; } + /* duplicate */ + if (gprs_ns2_nsvc_by_sockaddr_bind(bind, remote)) + return NULL; + sockaddr_str = (char *)osmo_sockaddr_to_str(remote); osmo_identifier_sanitize_buf(sockaddr_str, NULL, '_'); snprintf(idbuf, sizeof(idbuf), "%s-NSE%05u-remote-%s", gprs_ns2_lltype_str(nse->ll), diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 4bd7cde..6214907 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1093,6 +1093,15 @@ goto err; } + nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, &remote); + if (nsvc) { + if (nsvc->nse == nse) + vty_out(vty, "Specified NSVC is already present in this NSE.%s", VTY_NEWLINE); + else + vty_out(vty, "Specified NSVC is already present in another NSE%05u.%s", nsvc->nse->nsei, VTY_NEWLINE); + goto err; + } + nsvc = gprs_ns2_ip_connect(bind, &remote, nse, 0); if (!nsvc) { vty_out(vty, "Can not create NS-VC.%s", VTY_NEWLINE); diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index a969881..f0253fc 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -61,3 +61,23 @@ NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 NSVCI 00000: udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 +OsmoNSdummy# configure terminal +OsmoNSdummy(config)# ns +OsmoNSdummy(config-ns)# nse 1234 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 2 data-weight 2 +Specified NSVC is already present in this NSE. +OsmoNSdummy(config-ns-nse)# exit +OsmoNSdummy(config-ns)# nse 1235 +OsmoNSdummy(config-ns-nse)# nsvc udp abc 127.0.0.16 9496 signalling-weight 2 data-weight 2 +Specified NSVC is already present in another NSE01234. +OsmoNSdummy(config-ns-nse)# exit +OsmoNSdummy(config-ns)# nse 2342 +OsmoNSdummy(config-ns-nse)# ip-sns-bind abc +OsmoNSdummy(config-ns-nse)# ip-sns-bind abc +Failed to add ip-sns-bind abc already present +OsmoNSdummy(config-ns-nse)# ip-sns-bind abc2 +Can not find the given bind 'abc2' +OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222 +OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222 +Specified SNS endpoint already part of the NSE. +OsmoNSdummy(config-ns-nse)# exit -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58a95817e2730bbbaa851a43a5b072d1de2db037 Gerrit-Change-Number: 22944 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 10:42:03 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 10:42:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... gbproxy: update sns configuration to use ip-sns-bind With libosmocore commit the SNS configuration requires a ip-sns-bind vty configuration to define the binds which should be use. Related: SYS#5354 Depends-on: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Change-Id: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 --- M gbproxy/osmo-gbproxy.cfg M gbproxy/osmo-gbproxy.fr.cfg 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index 15f9f04..efd0499 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -28,8 +28,10 @@ listen 127.0.0.1 23000 accept-ipaccess nse 101 + ip-sns-bind local ip-sns-remote 127.0.0.10 7777 nse 102 + ip-sns-bind local ip-sns-remote 127.0.0.11 8888 timer tns-block 3 timer tns-block-retries 3 diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg index 9595475..b7eb538 100644 --- a/gbproxy/osmo-gbproxy.fr.cfg +++ b/gbproxy/osmo-gbproxy.fr.cfg @@ -34,8 +34,10 @@ timer tns-alive 3 timer tns-alive-retries 10 nse 101 + ip-sns-bind local ip-sns-remote 127.0.0.10 7777 nse 102 + ip-sns-bind local ip-sns-remote 127.0.0.11 8888 nse 2001 nsvc fr hdlcnet1 dlci 16 nsvci 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22939 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: If86fe463199bc5089db80a0dcc01f9e94e23e9b9 Gerrit-Change-Number: 22939 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:16:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:16:05 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22964/2/src/osmo-bsc/bts.c File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22964/2/src/osmo-bsc/bts.c at 495 PS2, Line 495: if (bts->type && type != bts->type) since type is an enum, let's better compare agains the _UNKNOWN value, instead of checking non-zero. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 11:16:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:21:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:21:46 +0000 Subject: Change in libosmocore[master]: logging: Allow prefixing thread ID to each log line In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22960 ) Change subject: logging: Allow prefixing thread ID to each log line ...................................................................... logging: Allow prefixing thread ID to each log line Related: OS#5032 Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.vty 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index c7f89de..4361cad 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -281,6 +281,8 @@ unsigned int use_color:1; /*! should log messages be prefixed with a timestamp? */ unsigned int print_timestamp:1; + /*! should log messages be prefixed with the logger Thread ID? */ + unsigned int print_tid:1; /*! DEPRECATED: use print_filename2 instead. */ unsigned int print_filename:1; /*! should log messages be prefixed with a category name? */ @@ -374,6 +376,7 @@ void log_set_use_color(struct log_target *target, int); void log_set_print_extended_timestamp(struct log_target *target, int); void log_set_print_timestamp(struct log_target *target, int); +void log_set_print_tid(struct log_target *target, int); void log_set_print_filename(struct log_target *target, int); void log_set_print_filename2(struct log_target *target, enum log_filename_type lft); void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos); diff --git a/src/logging.c b/src/logging.c index a40008e..c2a0453 100644 --- a/src/logging.c +++ b/src/logging.c @@ -64,6 +64,7 @@ #include #include #include +#include #include /* for LOGGING_STR. */ @@ -83,6 +84,8 @@ void *tall_log_ctx = NULL; LLIST_HEAD(osmo_log_target_list); +static __thread long int logging_tid; + #if (!EMBEDDED) /*! This mutex must be held while using osmo_log_target_list or any of its log_targets in a multithread program. Prevents race conditions between threads @@ -473,6 +476,14 @@ buf[offset + ret - 1] = ' '; OSMO_SNPRINTF_RET(ret, rem, offset, len); } + if (target->print_tid) { + if (logging_tid == 0) + logging_tid = (long int)osmo_gettid(); + ret = snprintf(buf + offset, rem, "%ld ", logging_tid); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + } if (target->print_category) { ret = snprintf(buf + offset, rem, "%s%s%s%s ", target->use_color ? level_color(level) : "", @@ -778,6 +789,15 @@ target->print_ext_timestamp = print_timestamp; } +/*! Enable or disable printing of timestamps while logging + * \param[in] target Log target to be affected + * \param[in] print_tid Enable (1) or disable (0) Thread ID logging + */ +void log_set_print_tid(struct log_target *target, int print_tid) +{ + target->print_tid = print_tid; +} + /*! Use log_set_print_filename2() instead. * Call log_set_print_filename2() with LOG_FILENAME_PATH or LOG_FILENAME_NONE, *as well as* call * log_set_print_category_hex() with the argument passed to this function. This is to mirror legacy @@ -917,6 +937,7 @@ /* global settings */ target->use_color = 1; target->print_timestamp = 0; + target->print_tid = 0; target->print_filename2 = LOG_FILENAME_PATH; target->print_category_hex = true; diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 6a7a8f4..48b039b 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -225,6 +225,22 @@ RET_WITH_UNLOCK(CMD_SUCCESS); } +DEFUN(logging_prnt_tid, + logging_prnt_tid_cmd, + "logging print thread-id (0|1)", + LOGGING_STR "Log output settings\n" + "Configure log message logging Thread ID\n" + "Don't prefix each log message\n" + "Prefix each log message with current Thread ID\n") +{ + struct log_target *tgt; + + ACQUIRE_VTY_LOG_TGT_WITH_LOCK(vty, tgt); + + log_set_print_tid(tgt, atoi(argv[0])); + RET_WITH_UNLOCK(CMD_SUCCESS); +} + DEFUN(logging_prnt_cat, logging_prnt_cat_cmd, "logging print category (0|1)", @@ -1003,6 +1019,8 @@ tgt->print_category_hex ? 1 : 0, VTY_NEWLINE); vty_out(vty, " logging print category %d%s", tgt->print_category ? 1 : 0, VTY_NEWLINE); + vty_out(vty, " logging print thread-id %d%s", + tgt->print_tid ? 1 : 0, VTY_NEWLINE); if (tgt->print_ext_timestamp) vty_out(vty, " logging print extended-timestamp 1%s", VTY_NEWLINE); else @@ -1134,6 +1152,7 @@ install_lib_element_ve(&logging_use_clr_cmd); install_lib_element_ve(&logging_prnt_timestamp_cmd); install_lib_element_ve(&logging_prnt_ext_timestamp_cmd); + install_lib_element_ve(&logging_prnt_tid_cmd); install_lib_element_ve(&logging_prnt_cat_cmd); install_lib_element_ve(&logging_prnt_cat_hex_cmd); install_lib_element_ve(&logging_prnt_level_cmd); @@ -1168,6 +1187,7 @@ install_lib_element(CFG_LOG_NODE, &logging_use_clr_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_timestamp_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_ext_timestamp_cmd); + install_lib_element(CFG_LOG_NODE, &logging_prnt_tid_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_cat_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_cat_hex_cmd); install_lib_element(CFG_LOG_NODE, &logging_prnt_level_cmd); diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty index dd2db63..82db2cc 100644 --- a/tests/logging/logging_vty_test.vty +++ b/tests/logging/logging_vty_test.vty @@ -48,6 +48,7 @@ logging color (0|1) logging timestamp (0|1) logging print extended-timestamp (0|1) + logging print thread-id (0|1) logging print category (0|1) logging print category-hex (0|1) logging print level (0|1) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I38fc93ab0182b4edbd639c7ed0f31ce51964ee18 Gerrit-Change-Number: 22960 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:36:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:36:58 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22961 to look at the new patch set (#2). Change subject: tests: Set print_category values explicitly ...................................................................... tests: Set print_category values explicitly This will alow easily changing default values for print_category vs print_category_hex later. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Related: OS#5034 Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 --- M tests/fsm/fsm_test.c M tests/gb/bssgp_fc_test.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns_test.c M tests/gsup/gsup_test.c M tests/logging/logging_test.c M tests/loggingrb/loggingrb_test.c M tests/oap/oap_client_test.c M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/write_queue/wqueue_test.c 11 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/22961/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:36:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:36:58 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22962 to look at the new patch set (#2). Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Drop use of log_set_print_filename() API inside libosmocore Let's use log_set_print_filename2() API instead, which has less ackward behavior implications like changing the print status of category-hex. Related: OS#5034 Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da --- M tests/fsm/fsm_dealloc_test.c M tests/fsm/fsm_test.c M tests/gb/bssgp_fc_test.c M tests/gb/gprs_bssgp_test.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns_test.c M tests/gsup/gsup_test.c M tests/logging/logging_test.c M tests/loggingrb/loggingrb_test.c M tests/oap/oap_client_test.c M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/tdef/tdef_test.c M tests/write_queue/wqueue_test.c M utils/osmo-ns-dummy.c 15 files changed, 16 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/22962/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:36:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:36:58 +0000 Subject: Change in libosmocore[master]: logging: Deprecate API log_set_print_filename In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22963 to look at the new patch set (#2). Change subject: logging: Deprecate API log_set_print_filename ...................................................................... logging: Deprecate API log_set_print_filename Let's flag the API as deprecated so that people start using log_set_print_filename2() API instead, which has less ackward behavior implications like changing the print status of category-hex. Related: OS#5034 Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a --- M include/osmocom/core/logging.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/22963/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a Gerrit-Change-Number: 22963 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:52:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:52:12 +0000 Subject: Change in libosmo-abis[master]: tests: trau_sync: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22965 ) Change subject: tests: trau_sync: Explicitly drop category from log ...................................................................... tests: trau_sync: Explicitly drop category from log Let's disable hex category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Related: OS#5034 Change-Id: I332d1215fc7784a6647b90e2eb8b1efcd644002e --- M tests/trau_sync/trau_sync_test.c M tests/trau_sync/trau_sync_test.err 2 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/65/22965/1 diff --git a/tests/trau_sync/trau_sync_test.c b/tests/trau_sync/trau_sync_test.c index d804b3e..88b5c6d 100644 --- a/tests/trau_sync/trau_sync_test.c +++ b/tests/trau_sync/trau_sync_test.c @@ -82,5 +82,7 @@ log_set_use_color(osmo_stderr_target, 0); osmo_fsm_log_addr(false); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_body(); } diff --git a/tests/trau_sync/trau_sync_test.err b/tests/trau_sync/trau_sync_test.err index 7e4a24a..7871054 100644 --- a/tests/trau_sync/trau_sync_test.err +++ b/tests/trau_sync/trau_sync_test.err @@ -1,14 +1,14 @@ -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Allocated -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST -<0000> trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: Allocated +trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST +trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I332d1215fc7784a6647b90e2eb8b1efcd644002e Gerrit-Change-Number: 22965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:58:27 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 11:58:27 +0000 Subject: Change in libosmocore[master]: gprs_ns2: free_nse: free the SNS fsm early References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22966 ) Change subject: gprs_ns2: free_nse: free the SNS fsm early ...................................................................... gprs_ns2: free_nse: free the SNS fsm early If the SNS fsm isn't freed early, the SNS code will re-create a NSVC when calling free_nsvc(). Fixes libasan heap-use-after-free. Change-Id: If350df1d8d6dcea5715dd23b8bd1d684098cdb1f --- M src/gb/gprs_ns2.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/22966/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index c48575b..a79dd05 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -831,12 +831,15 @@ return; nse->alive = false; + if (nse->bss_sns_fi) { + osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); + nse->bss_sns_fi = NULL; + } + gprs_ns2_free_nsvcs(nse); ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_FAILURE); llist_del(&nse->list); - if (nse->bss_sns_fi) - osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); talloc_free(nse); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If350df1d8d6dcea5715dd23b8bd1d684098cdb1f Gerrit-Change-Number: 22966 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:58:50 +0000 Subject: Change in libosmo-netif[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22967 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Ia4bcf8dc441ad26cffc3aec5b374fbdca4a03841 Related: OS#5034 --- M tests/stream/stream_test.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/67/22967/1 diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index b4846bc..0a0f9ef 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -380,6 +380,7 @@ log_set_log_level(osmo_stderr_target, LOGL_INFO); log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); printf("Preparing stream server...\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia4bcf8dc441ad26cffc3aec5b374fbdca4a03841 Gerrit-Change-Number: 22967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 11:58:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 11:58:51 +0000 Subject: Change in libosmo-netif[master]: gitignore: Ignore autfoo *~ churn References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22968 ) Change subject: gitignore: Ignore autfoo *~ churn ...................................................................... gitignore: Ignore autfoo *~ churn Change-Id: I5f9bb19e6785de42912cf3c7360cf758b8748622 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/68/22968/1 diff --git a/.gitignore b/.gitignore index 4296476..5dfa913 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ install-sh stamp-h1 libtool +*~ .tarball-version .version -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5f9bb19e6785de42912cf3c7360cf758b8748622 Gerrit-Change-Number: 22968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:00:47 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 12:00:47 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the b... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22914 ) Change subject: gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration ...................................................................... gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration The gprs_ns2 now requires to specify every bind which should be used by the NSE for IP-SNS Related: SYS#5354 Depends: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac --- M src/gprs_bssgp_pcu.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index ce36c6b..84e9ec5 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -1023,6 +1023,14 @@ LOGP(DBSSGP, LOGL_ERROR, "Failed to bind to %s\n", osmo_sockaddr_to_str(&local[i])); continue; } + + if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) { + rc = gprs_ns2_sns_add_bind(bts->nse, bind[i]); + if (rc < 0) { + LOGP(DBSSGP, LOGL_ERROR, "Failed to add bind %s to the NSE for IP-SNS\n", osmo_sockaddr_to_str(&local[i])); + continue; + } + } } binds |= 1 << i; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35c987224ce098f7ee9f189ce0fce9e68ad3feac Gerrit-Change-Number: 22914 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:04:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:04:49 +0000 Subject: Change in libosmocore[master]: gprs_ns2: free_nse: free the SNS fsm early In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22966 ) Change subject: gprs_ns2: free_nse: free the SNS fsm early ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If350df1d8d6dcea5715dd23b8bd1d684098cdb1f Gerrit-Change-Number: 22966 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 12:04:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:06:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:06:31 +0000 Subject: Change in libosmo-sccp[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22969 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I899e63ab2702bf25514f6585fb45f5bbf60a9ac9 Related: OS#5034 --- M tests/xua/xua_test.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/69/22969/1 diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 6096807..a0cf51a 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -620,6 +620,8 @@ log_add_target(stderr_target); log_set_use_color(stderr_target, 0); log_set_print_filename(stderr_target, 0); + log_set_print_category(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); test_isup_parse(); test_sccp_addr_parser(); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I899e63ab2702bf25514f6585fb45f5bbf60a9ac9 Gerrit-Change-Number: 22969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:06:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:06:31 +0000 Subject: Change in libosmo-sccp[master]: gitignore: Ignore autofoo *~ churn References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22970 ) Change subject: gitignore: Ignore autofoo *~ churn ...................................................................... gitignore: Ignore autofoo *~ churn Change-Id: Ia9f01761b595d9b082d78b05d71ff549b8e33d91 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/70/22970/1 diff --git a/.gitignore b/.gitignore index 252f6f5..54c432d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ bsc_mgcp *.*~ *.sw? +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia9f01761b595d9b082d78b05d71ff549b8e33d91 Gerrit-Change-Number: 22970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:09:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:09:07 +0000 Subject: Change in libosmo-netif[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22971 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Id44722fa42fc94af7d55b8b984657a8535e66a9f --- M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_tool.c M tests/osmux/osmux_test2.c M tests/stream/stream_test.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/71/22971/1 diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index ba1bb01..e1f51d6 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -797,7 +797,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &jibuf_test_log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DLJIBUF, 1, LOGL_DEBUG); diff --git a/tests/jibuf/jibuf_tool.c b/tests/jibuf/jibuf_tool.c index df11131..969ef8b 100644 --- a/tests/jibuf/jibuf_tool.c +++ b/tests/jibuf/jibuf_tool.c @@ -610,7 +610,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &jibuf_test_log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); if(opt_debug_human && !opt_debug_table) diff --git a/tests/osmux/osmux_test2.c b/tests/osmux/osmux_test2.c index ffe1101..092f4bf 100644 --- a/tests/osmux/osmux_test2.c +++ b/tests/osmux/osmux_test2.c @@ -361,7 +361,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DLMUX, 1, LOGL_DEBUG); diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index 0a0f9ef..36a222e 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -381,7 +381,7 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); printf("Preparing stream server...\n"); srv = osmo_stream_srv_link_create(tall_test); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id44722fa42fc94af7d55b8b984657a8535e66a9f Gerrit-Change-Number: 22971 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:10:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:10:37 +0000 Subject: Change in libosmo-sccp[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22972 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Id09f903fc5008d074763441a26d71c4fbaf394d8 --- M tests/ss7/ss7_test.c M tests/xua/xua_test.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/72/22972/1 diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index ae96a4b..cf48b89 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -290,7 +290,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); for (i = 0; i < ARRAY_SIZE(log_cats); i++) log_set_category_filter(osmo_stderr_target, log_cats[i], 1, LOGL_DEBUG); diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index a0cf51a..abf2fae 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -619,7 +619,7 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_use_color(stderr_target, 0); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_print_category(stderr_target, 0); log_set_print_category_hex(stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id09f903fc5008d074763441a26d71c4fbaf394d8 Gerrit-Change-Number: 22972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:19:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:19:05 +0000 Subject: Change in osmo-iuh[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22973 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Ia633cae0a26f294e276b431a82256abb1b57ebba Related: OS#5034 --- M src/tests/test_common.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/73/22973/1 diff --git a/src/tests/test_common.c b/src/tests/test_common.c index 7c6f62a..0729368 100644 --- a/src/tests/test_common.c +++ b/src/tests/test_common.c @@ -86,6 +86,8 @@ log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia633cae0a26f294e276b431a82256abb1b57ebba Gerrit-Change-Number: 22973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:19:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:19:05 +0000 Subject: Change in osmo-iuh[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22974 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Ic53a0a9afb8038759bb3ab1d4c5970f23632e84e --- M src/tests/test_common.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/74/22974/1 diff --git a/src/tests/test_common.c b/src/tests/test_common.c index 0729368..9663157 100644 --- a/src/tests/test_common.c +++ b/src/tests/test_common.c @@ -84,7 +84,7 @@ ranap_set_log_area(DRANAP); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ic53a0a9afb8038759bb3ab1d4c5970f23632e84e Gerrit-Change-Number: 22974 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:20:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:20:21 +0000 Subject: Change in osmo-hlr[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22975 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 --- M tests/auc/gen_ts_55_205_test_sets/main_template.c M tests/gsup/gsup_test.c M tests/mslookup/mdns_test.c M tests/mslookup/mslookup_client_mdns_test.c M tests/mslookup/mslookup_client_test.c M tests/mslookup/mslookup_test.c 6 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/75/22975/1 diff --git a/tests/auc/gen_ts_55_205_test_sets/main_template.c b/tests/auc/gen_ts_55_205_test_sets/main_template.c index 3fafdf5..9da988c 100644 --- a/tests/auc/gen_ts_55_205_test_sets/main_template.c +++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c @@ -106,7 +106,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "test"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &hlr_log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 1a7bb76..88c6093 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -101,7 +101,7 @@ { ctx = talloc_named_const(NULL, 0, "gsup_test"); osmo_init_logging2(ctx, &info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c index 8a60e85..0c8be46 100644 --- a/tests/mslookup/mdns_test.c +++ b/tests/mslookup/mdns_test.c @@ -583,7 +583,7 @@ void *ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 1); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c index 5e558b4..dc9d1d5 100644 --- a/tests/mslookup/mslookup_client_mdns_test.c +++ b/tests/mslookup/mslookup_client_mdns_test.c @@ -233,7 +233,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/mslookup/mslookup_client_test.c b/tests/mslookup/mslookup_client_test.c index 40be011..9fcb983 100644 --- a/tests/mslookup/mslookup_client_test.c +++ b/tests/mslookup/mslookup_client_test.c @@ -174,7 +174,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/mslookup/mslookup_test.c b/tests/mslookup/mslookup_test.c index 1672bd0..a5efa00 100644 --- a/tests/mslookup/mslookup_test.c +++ b/tests/mslookup/mslookup_test.c @@ -73,7 +73,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 Gerrit-Change-Number: 22975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:22:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:22:32 +0000 Subject: Change in osmo-ggsn[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22976 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Icce09882ef3ed07328679594ff84902383d16c72 Related: OS#5034 --- M tests/lib/ippool_test.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/76/22976/1 diff --git a/tests/lib/ippool_test.c b/tests/lib/ippool_test.c index 6155ab8..57ab16e 100644 --- a/tests/lib/ippool_test.c +++ b/tests/lib/ippool_test.c @@ -132,6 +132,8 @@ osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); srand(time(NULL)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Icce09882ef3ed07328679594ff84902383d16c72 Gerrit-Change-Number: 22976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:23:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:23:04 +0000 Subject: Change in osmo-ggsn[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22977 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I35eb879d82e1030ea8be56ce9039277c021bb6fa --- M tests/gtp/gtpie_test.c M tests/gtp/queue_test.c M tests/lib/in46a_test.c M tests/lib/ippool_test.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/77/22977/1 diff --git a/tests/gtp/gtpie_test.c b/tests/gtp/gtpie_test.c index 95dd900..ed1f26e 100644 --- a/tests/gtp/gtpie_test.c +++ b/tests/gtp/gtpie_test.c @@ -113,7 +113,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); srand(time(NULL)); diff --git a/tests/gtp/queue_test.c b/tests/gtp/queue_test.c index 11b653d..8eef651 100644 --- a/tests/gtp/queue_test.c +++ b/tests/gtp/queue_test.c @@ -223,7 +223,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); test_queue_empty(); test_queue_one(); diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c index 407ac5d..d6c4f47 100644 --- a/tests/lib/in46a_test.c +++ b/tests/lib/in46a_test.c @@ -431,7 +431,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); srand(time(NULL)); diff --git a/tests/lib/ippool_test.c b/tests/lib/ippool_test.c index 57ab16e..2af4a38 100644 --- a/tests/lib/ippool_test.c +++ b/tests/lib/ippool_test.c @@ -131,7 +131,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I35eb879d82e1030ea8be56ce9039277c021bb6fa Gerrit-Change-Number: 22977 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:31:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:31:50 +0000 Subject: Change in osmo-hlr[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/22975 to look at the new patch set (#2). Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename log_set_print_category_hex(0) is added in some places since the old API used to set that internally to keep backward compatiblity. Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 --- M tests/auc/auc_test.c M tests/auc/gen_ts_55_205_test_sets/main_template.c M tests/db/db_test.c M tests/gsup/gsup_test.c M tests/mslookup/mdns_test.c M tests/mslookup/mslookup_client_mdns_test.c M tests/mslookup/mslookup_client_test.c M tests/mslookup/mslookup_test.c 8 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/75/22975/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 Gerrit-Change-Number: 22975 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:32:00 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 12:32:00 +0000 Subject: Change in libosmocore[master]: gprs_ns2: free_nse: free the SNS fsm early In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22966 ) Change subject: gprs_ns2: free_nse: free the SNS fsm early ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If350df1d8d6dcea5715dd23b8bd1d684098cdb1f Gerrit-Change-Number: 22966 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 12:32:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:33:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 12:33:04 +0000 Subject: Change in libosmocore[master]: gprs_ns2: free_nse: free the SNS fsm early In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22966 ) Change subject: gprs_ns2: free_nse: free the SNS fsm early ...................................................................... gprs_ns2: free_nse: free the SNS fsm early If the SNS fsm isn't freed early, the SNS code will re-create a NSVC when calling free_nsvc(). Fixes libasan heap-use-after-free. Change-Id: If350df1d8d6dcea5715dd23b8bd1d684098cdb1f --- M src/gb/gprs_ns2.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index c48575b..a79dd05 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -831,12 +831,15 @@ return; nse->alive = false; + if (nse->bss_sns_fi) { + osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); + nse->bss_sns_fi = NULL; + } + gprs_ns2_free_nsvcs(nse); ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_FAILURE); llist_del(&nse->list); - if (nse->bss_sns_fi) - osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL); talloc_free(nse); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If350df1d8d6dcea5715dd23b8bd1d684098cdb1f Gerrit-Change-Number: 22966 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:33:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:33:55 +0000 Subject: Change in osmo-mgw[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/22978 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I761d2bf99aa5a009ff489584d804634e58588125 --- M tests/mgcp_client/mgcp_client_test.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/78/22978/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index e2e8bf8..9f09a99 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -689,9 +689,10 @@ ctx = talloc_named_const(NULL, 1, "mgcp_client_test"); msgb_talloc_ctx_init(ctx, 0); osmo_init_logging2(ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_set_category_filter(osmo_stderr_target, DLMGCP, 1, LOGL_DEBUG); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/22978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I761d2bf99aa5a009ff489584d804634e58588125 Gerrit-Change-Number: 22978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:37:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:37:03 +0000 Subject: Change in osmo-msc[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22979 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Related: OS#5034 --- M tests/smpp/smpp_test.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/22979/1 diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index 1abb63b..b7df653 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -81,6 +81,8 @@ osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_coding_scheme(); return EXIT_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Gerrit-Change-Number: 22979 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:37:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:37:04 +0000 Subject: Change in osmo-msc[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/22980 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 --- M tests/db_sms/db_sms_test.c M tests/mncc/mncc_test.c M tests/msc_vlr/msc_vlr_tests.c M tests/smpp/smpp_test.c M tests/sms_queue/sms_queue_test.c 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/22980/1 diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c index 24c86e5..8d8c67e 100644 --- a/tests/db_sms/db_sms_test.c +++ b/tests/db_sms/db_sms_test.c @@ -518,7 +518,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_print_level(osmo_stderr_target, 1); diff --git a/tests/mncc/mncc_test.c b/tests/mncc/mncc_test.c index 580b479..f752cab 100644 --- a/tests/mncc/mncc_test.c +++ b/tests/mncc/mncc_test.c @@ -70,7 +70,7 @@ void *ctx = talloc_named_const(NULL, 0, "smpp_test"); osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 87d1abd..fd3e543 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1190,7 +1190,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index b7df653..d86da54 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -80,7 +80,7 @@ void *ctx = talloc_named_const(NULL, 0, "smpp_test"); osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index 4918be2..f681657 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -246,7 +246,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DLOAP,1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 Gerrit-Change-Number: 22980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 19 Feb 2021 12:37:57 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 12:37:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:39:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:39:20 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:39:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:40:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:40:34 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 ) Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 12:40:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:40:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:40:51 +0000 Subject: Change in libosmocore[master]: logging: Deprecate API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22963 ) Change subject: logging: Deprecate API log_set_print_filename ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a Gerrit-Change-Number: 22963 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:40:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:05 +0000 Subject: Change in libosmo-abis[master]: tests: trau_sync: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22965 ) Change subject: tests: trau_sync: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I332d1215fc7784a6647b90e2eb8b1efcd644002e Gerrit-Change-Number: 22965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:41:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:07 +0000 Subject: Change in libosmo-abis[master]: tests: trau_sync: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22965 ) Change subject: tests: trau_sync: Explicitly drop category from log ...................................................................... tests: trau_sync: Explicitly drop category from log Let's disable hex category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Related: OS#5034 Change-Id: I332d1215fc7784a6647b90e2eb8b1efcd644002e --- M tests/trau_sync/trau_sync_test.c M tests/trau_sync/trau_sync_test.err 2 files changed, 16 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/trau_sync/trau_sync_test.c b/tests/trau_sync/trau_sync_test.c index d804b3e..88b5c6d 100644 --- a/tests/trau_sync/trau_sync_test.c +++ b/tests/trau_sync/trau_sync_test.c @@ -82,5 +82,7 @@ log_set_use_color(osmo_stderr_target, 0); osmo_fsm_log_addr(false); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_body(); } diff --git a/tests/trau_sync/trau_sync_test.err b/tests/trau_sync/trau_sync_test.err index 7e4a24a..7871054 100644 --- a/tests/trau_sync/trau_sync_test.err +++ b/tests/trau_sync/trau_sync_test.err @@ -1,14 +1,14 @@ -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Allocated -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS -<0000> trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS -<0000> trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST -<0000> trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: Allocated +trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: Received Event RX_BITS +trau_sync(test){WAIT_FRAME_ALIGN}: state_chg to FRAME_ALIGNED +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: Received Event RX_BITS +trau_sync(test){FRAME_ALIGNED}: state_chg to FRAME_ALIGNMENT_LOST +trau_sync(test){FRAME_ALIGNMENT_LOST}: Received Event RX_BITS -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I332d1215fc7784a6647b90e2eb8b1efcd644002e Gerrit-Change-Number: 22965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 12:41:12 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22801/2/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/2/src/pcu_l1_if.cpp at 344 PS2, Line 344: LOGP(DPCU, LOGL_ERROR, "Error decoding SI13\n"); This looks like a different logical change, put this in an own commit? Rest LGTM! -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 19 Feb 2021 12:41:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:17 +0000 Subject: Change in libosmo-netif[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22967 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia4bcf8dc441ad26cffc3aec5b374fbdca4a03841 Gerrit-Change-Number: 22967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:41:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:24 +0000 Subject: Change in libosmo-netif[master]: gitignore: Ignore autfoo *~ churn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22968 ) Change subject: gitignore: Ignore autfoo *~ churn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5f9bb19e6785de42912cf3c7360cf758b8748622 Gerrit-Change-Number: 22968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:41:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:34 +0000 Subject: Change in libosmo-netif[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22971 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id44722fa42fc94af7d55b8b984657a8535e66a9f Gerrit-Change-Number: 22971 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:41:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:37 +0000 Subject: Change in libosmo-netif[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22967 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Ia4bcf8dc441ad26cffc3aec5b374fbdca4a03841 Related: OS#5034 --- M tests/stream/stream_test.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index b4846bc..0a0f9ef 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -380,6 +380,7 @@ log_set_log_level(osmo_stderr_target, LOGL_INFO); log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); printf("Preparing stream server...\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia4bcf8dc441ad26cffc3aec5b374fbdca4a03841 Gerrit-Change-Number: 22967 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:37 +0000 Subject: Change in libosmo-netif[master]: gitignore: Ignore autfoo *~ churn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22968 ) Change subject: gitignore: Ignore autfoo *~ churn ...................................................................... gitignore: Ignore autfoo *~ churn Change-Id: I5f9bb19e6785de42912cf3c7360cf758b8748622 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 4296476..5dfa913 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ install-sh stamp-h1 libtool +*~ .tarball-version .version -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5f9bb19e6785de42912cf3c7360cf758b8748622 Gerrit-Change-Number: 22968 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:38 +0000 Subject: Change in libosmo-netif[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/22971 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Id44722fa42fc94af7d55b8b984657a8535e66a9f --- M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_tool.c M tests/osmux/osmux_test2.c M tests/stream/stream_test.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index ba1bb01..e1f51d6 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -797,7 +797,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &jibuf_test_log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DLJIBUF, 1, LOGL_DEBUG); diff --git a/tests/jibuf/jibuf_tool.c b/tests/jibuf/jibuf_tool.c index df11131..969ef8b 100644 --- a/tests/jibuf/jibuf_tool.c +++ b/tests/jibuf/jibuf_tool.c @@ -610,7 +610,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &jibuf_test_log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); if(opt_debug_human && !opt_debug_table) diff --git a/tests/osmux/osmux_test2.c b/tests/osmux/osmux_test2.c index ffe1101..092f4bf 100644 --- a/tests/osmux/osmux_test2.c +++ b/tests/osmux/osmux_test2.c @@ -361,7 +361,7 @@ void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DLMUX, 1, LOGL_DEBUG); diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index 0a0f9ef..36a222e 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -381,7 +381,7 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); printf("Preparing stream server...\n"); srv = osmo_stream_srv_link_create(tall_test); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/22971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id44722fa42fc94af7d55b8b984657a8535e66a9f Gerrit-Change-Number: 22971 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:41:44 +0000 Subject: Change in osmo-bsc[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22981 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I4d48c0c0aa46065560a020369e3b0544385f173e Related: OS#5034 --- M tests/acc/acc_test.c M tests/subscr/bsc_subscr_test.c 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/22981/1 diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c index 73757c7..759ff13 100644 --- a/tests/acc/acc_test.c +++ b/tests/acc/acc_test.c @@ -495,7 +495,8 @@ tall_bsc_ctx = talloc_named_const(NULL, 0, "gsm0408_test"); osmo_init_logging2(tall_bsc_ctx, &log_info); log_set_log_level(osmo_stderr_target, LOGL_INFO); - log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); osmo_fsm_log_addr(false); diff --git a/tests/subscr/bsc_subscr_test.c b/tests/subscr/bsc_subscr_test.c index 619d5e6..77769a1 100644 --- a/tests/subscr/bsc_subscr_test.c +++ b/tests/subscr/bsc_subscr_test.c @@ -134,6 +134,7 @@ log_set_print_filename(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); bsc_subscribers = talloc_zero(ctx, struct llist_head); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d48c0c0aa46065560a020369e3b0544385f173e Gerrit-Change-Number: 22981 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:41:45 +0000 Subject: Change in osmo-bsc[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22982 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I4e0eb8842333c89d15fb6728a34716ea1eb4935d --- M tests/subscr/bsc_subscr_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/22982/1 diff --git a/tests/subscr/bsc_subscr_test.c b/tests/subscr/bsc_subscr_test.c index 77769a1..14e069d 100644 --- a/tests/subscr/bsc_subscr_test.c +++ b/tests/subscr/bsc_subscr_test.c @@ -131,7 +131,7 @@ void *ctx = talloc_named_const(NULL, 0, "bsc_subscr_test"); printf("Testing BSC subscriber core code.\n"); osmo_init_logging2(ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4e0eb8842333c89d15fb6728a34716ea1eb4935d Gerrit-Change-Number: 22982 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:41:57 +0000 Subject: Change in libosmo-sccp[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22969 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I899e63ab2702bf25514f6585fb45f5bbf60a9ac9 Gerrit-Change-Number: 22969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:41:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:42:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:42:03 +0000 Subject: Change in libosmo-sccp[master]: gitignore: Ignore autofoo *~ churn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22970 ) Change subject: gitignore: Ignore autofoo *~ churn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia9f01761b595d9b082d78b05d71ff549b8e33d91 Gerrit-Change-Number: 22970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:42:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:42:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:42:10 +0000 Subject: Change in libosmo-sccp[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22972 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id09f903fc5008d074763441a26d71c4fbaf394d8 Gerrit-Change-Number: 22972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:42:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:42:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:42:13 +0000 Subject: Change in libosmo-sccp[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22969 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I899e63ab2702bf25514f6585fb45f5bbf60a9ac9 Related: OS#5034 --- M tests/xua/xua_test.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 6096807..a0cf51a 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -620,6 +620,8 @@ log_add_target(stderr_target); log_set_use_color(stderr_target, 0); log_set_print_filename(stderr_target, 0); + log_set_print_category(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); test_isup_parse(); test_sccp_addr_parser(); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I899e63ab2702bf25514f6585fb45f5bbf60a9ac9 Gerrit-Change-Number: 22969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:42:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:42:13 +0000 Subject: Change in libosmo-sccp[master]: gitignore: Ignore autofoo *~ churn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22970 ) Change subject: gitignore: Ignore autofoo *~ churn ...................................................................... gitignore: Ignore autofoo *~ churn Change-Id: Ia9f01761b595d9b082d78b05d71ff549b8e33d91 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 252f6f5..54c432d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ bsc_mgcp *.*~ *.sw? +*~ #configure aclocal.m4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia9f01761b595d9b082d78b05d71ff549b8e33d91 Gerrit-Change-Number: 22970 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:42:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:42:14 +0000 Subject: Change in libosmo-sccp[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22972 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Id09f903fc5008d074763441a26d71c4fbaf394d8 --- M tests/ss7/ss7_test.c M tests/xua/xua_test.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index ae96a4b..cf48b89 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -290,7 +290,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); for (i = 0; i < ARRAY_SIZE(log_cats); i++) log_set_category_filter(osmo_stderr_target, log_cats[i], 1, LOGL_DEBUG); diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index a0cf51a..abf2fae 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -619,7 +619,7 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_use_color(stderr_target, 0); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_print_category(stderr_target, 0); log_set_print_category_hex(stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id09f903fc5008d074763441a26d71c4fbaf394d8 Gerrit-Change-Number: 22972 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:43:19 +0000 Subject: Change in osmo-ggsn[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22976 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Icce09882ef3ed07328679594ff84902383d16c72 Gerrit-Change-Number: 22976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:43:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:43:29 +0000 Subject: Change in osmo-ggsn[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22977 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I35eb879d82e1030ea8be56ce9039277c021bb6fa Gerrit-Change-Number: 22977 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:43:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:43:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:43:31 +0000 Subject: Change in osmo-ggsn[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22976 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Icce09882ef3ed07328679594ff84902383d16c72 Related: OS#5034 --- M tests/lib/ippool_test.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/lib/ippool_test.c b/tests/lib/ippool_test.c index 6155ab8..57ab16e 100644 --- a/tests/lib/ippool_test.c +++ b/tests/lib/ippool_test.c @@ -132,6 +132,8 @@ osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); srand(time(NULL)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Icce09882ef3ed07328679594ff84902383d16c72 Gerrit-Change-Number: 22976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:43:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:43:32 +0000 Subject: Change in osmo-ggsn[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22977 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I35eb879d82e1030ea8be56ce9039277c021bb6fa --- M tests/gtp/gtpie_test.c M tests/gtp/queue_test.c M tests/lib/in46a_test.c M tests/lib/ippool_test.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/gtp/gtpie_test.c b/tests/gtp/gtpie_test.c index 95dd900..ed1f26e 100644 --- a/tests/gtp/gtpie_test.c +++ b/tests/gtp/gtpie_test.c @@ -113,7 +113,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); srand(time(NULL)); diff --git a/tests/gtp/queue_test.c b/tests/gtp/queue_test.c index 11b653d..8eef651 100644 --- a/tests/gtp/queue_test.c +++ b/tests/gtp/queue_test.c @@ -223,7 +223,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); test_queue_empty(); test_queue_one(); diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c index 407ac5d..d6c4f47 100644 --- a/tests/lib/in46a_test.c +++ b/tests/lib/in46a_test.c @@ -431,7 +431,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); srand(time(NULL)); diff --git a/tests/lib/ippool_test.c b/tests/lib/ippool_test.c index 57ab16e..2af4a38 100644 --- a/tests/lib/ippool_test.c +++ b/tests/lib/ippool_test.c @@ -131,7 +131,7 @@ msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I35eb879d82e1030ea8be56ce9039277c021bb6fa Gerrit-Change-Number: 22977 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:49:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:49:28 +0000 Subject: Change in osmo-iuh[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22973 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia633cae0a26f294e276b431a82256abb1b57ebba Gerrit-Change-Number: 22973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:49:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:49:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:49:34 +0000 Subject: Change in osmo-iuh[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22974 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ic53a0a9afb8038759bb3ab1d4c5970f23632e84e Gerrit-Change-Number: 22974 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 12:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:49:37 +0000 Subject: Change in osmo-iuh[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22973 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Ia633cae0a26f294e276b431a82256abb1b57ebba Related: OS#5034 --- M src/tests/test_common.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/tests/test_common.c b/src/tests/test_common.c index 7c6f62a..0729368 100644 --- a/src/tests/test_common.c +++ b/src/tests/test_common.c @@ -86,6 +86,8 @@ log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia633cae0a26f294e276b431a82256abb1b57ebba Gerrit-Change-Number: 22973 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 12:49:37 +0000 Subject: Change in osmo-iuh[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22974 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Ic53a0a9afb8038759bb3ab1d4c5970f23632e84e --- M src/tests/test_common.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/tests/test_common.c b/src/tests/test_common.c index 0729368..9663157 100644 --- a/src/tests/test_common.c +++ b/src/tests/test_common.c @@ -84,7 +84,7 @@ ranap_set_log_area(DRANAP); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ic53a0a9afb8038759bb3ab1d4c5970f23632e84e Gerrit-Change-Number: 22974 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:51:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:51:59 +0000 Subject: Change in osmo-bts[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22983 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I8713f4e04e92b4d7e211c499fc6e78983edfb139 Related: OS#5034 --- M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c M tests/tx_power/tx_power_test.c 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/22983/1 diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 6f5f2bf..0c9bbbf 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -527,6 +527,8 @@ osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); #define exec_test(test) \ exec_power_test(test, ARRAY_SIZE(test), #test) diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index c58812b..d7f4ea8 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -325,6 +325,8 @@ osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_power_loop(); test_pf_algo_ewma(); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index dbabc87..c3a8b4e 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -249,6 +249,8 @@ osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); bts = gsm_bts_alloc(tall_bts_ctx, 0); if (!bts) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8713f4e04e92b4d7e211c499fc6e78983edfb139 Gerrit-Change-Number: 22983 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:52:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:52:00 +0000 Subject: Change in osmo-bts[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/22984 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Ifd1ee307252d19ae535d2234523036c319e4c0ec --- M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c M tests/tx_power/tx_power_test.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/22984/1 diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 0c9bbbf..53fdbba 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -525,7 +525,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index d7f4ea8..0d86310 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -323,7 +323,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index c3a8b4e..3724f56 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -247,7 +247,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd1ee307252d19ae535d2234523036c319e4c0ec Gerrit-Change-Number: 22984 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 12:56:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 12:56:28 +0000 Subject: Change in osmo-msc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 to look at the new patch set (#2). Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Related: OS#5034 --- M tests/msc_vlr/msc_vlr_tests.c M tests/smpp/smpp_test.c 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/22979/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Gerrit-Change-Number: 22979 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:01:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:01:56 +0000 Subject: Change in osmo-pcu[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22985 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I7f9c56313cfaa74ebe666f44763a83d8102f5484 Related: OS#5034 --- M tests/alloc/AllocTest.cpp M tests/app_info/AppInfoTest.cpp M tests/bitcomp/BitcompTest.cpp M tests/edge/EdgeTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 7 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/85/22985/1 diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index ecc3e80..eced0b8 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -814,6 +814,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO); if (getenv("LOGL_DEBUG")) log_set_log_level(osmo_stderr_target, LOGL_DEBUG); diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index f145fa5..707deb7 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -175,6 +175,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1"); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/bitcomp/BitcompTest.cpp b/tests/bitcomp/BitcompTest.cpp index 14246fe..c3aa5c6 100644 --- a/tests/bitcomp/BitcompTest.cpp +++ b/tests/bitcomp/BitcompTest.cpp @@ -194,6 +194,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMACUL,1"); test_EPDAN_decode_tree(); @@ -213,4 +215,3 @@ void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } - diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 6161e0e..8536cfc 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1396,6 +1396,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 677c695..583335c 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -614,6 +614,8 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_log_level(osmo_stderr_target, LOGL_INFO); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DPCU,3:DRLCMAC,3"); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 24fd109..8d0a5d0 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3265,6 +3265,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:" "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DLBSSGP,3:DPCU,5:" "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:"); diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 038d737..e9bcf4e 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -927,6 +927,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO); log_set_category_filter(osmo_stderr_target, DTBFUL, 1, LOGL_INFO); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f9c56313cfaa74ebe666f44763a83d8102f5484 Gerrit-Change-Number: 22985 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:01:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:01:57 +0000 Subject: Change in osmo-pcu[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22986 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Idcc4875592c81f17ac98c4f6098492b3d9dd33d2 --- M tests/alloc/AllocTest.cpp M tests/alloc/MslotTest.cpp M tests/app_info/AppInfoTest.cpp M tests/bitcomp/BitcompTest.cpp M tests/codel/codel_test.c M tests/edge/EdgeTest.cpp M tests/fn/FnTest.cpp M tests/llc/LlcTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 11 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/86/22986/1 diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index eced0b8..cd48b29 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -813,7 +813,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO); diff --git a/tests/alloc/MslotTest.cpp b/tests/alloc/MslotTest.cpp index 96b82a5..96fe61b 100644 --- a/tests/alloc/MslotTest.cpp +++ b/tests/alloc/MslotTest.cpp @@ -149,7 +149,7 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index 707deb7..e89680b 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -174,7 +174,7 @@ tall_pcu_ctx = talloc_named_const(NULL, 1, "AppInfoTest"); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1"); diff --git a/tests/bitcomp/BitcompTest.cpp b/tests/bitcomp/BitcompTest.cpp index c3aa5c6..69ef511 100644 --- a/tests/bitcomp/BitcompTest.cpp +++ b/tests/bitcomp/BitcompTest.cpp @@ -193,7 +193,7 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMACUL,1"); diff --git a/tests/codel/codel_test.c b/tests/codel/codel_test.c index 4244eae..e8de634 100644 --- a/tests/codel/codel_test.c +++ b/tests/codel/codel_test.c @@ -137,7 +137,7 @@ { osmo_init_logging2(NULL, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); printf("===== CoDel test START\n"); diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 8536cfc..134e856 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1395,7 +1395,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/fn/FnTest.cpp b/tests/fn/FnTest.cpp index 4281fc3..e5ac46d 100644 --- a/tests/fn/FnTest.cpp +++ b/tests/fn/FnTest.cpp @@ -152,7 +152,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index bfcac77..d98636a 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -229,7 +229,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:"); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 583335c..498c835 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -612,7 +612,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 8d0a5d0..d921cbe 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3264,7 +3264,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:" diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index e9bcf4e..643ce4c 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -926,7 +926,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idcc4875592c81f17ac98c4f6098492b3d9dd33d2 Gerrit-Change-Number: 22986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:09:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:09:07 +0000 Subject: Change in osmo-trx[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/22987 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Iaa77f8a7d3f752173507afd988bd76a8aa632082 Related: OS#5034 --- M tests/CommonLibs/LogTest.cpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/87/22987/1 diff --git a/tests/CommonLibs/LogTest.cpp b/tests/CommonLibs/LogTest.cpp index 0087070..973e5b2 100644 --- a/tests/CommonLibs/LogTest.cpp +++ b/tests/CommonLibs/LogTest.cpp @@ -61,6 +61,8 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); Log(MYCAT, LOGL_FATAL, __BASE_FILE__, __LINE__).get() << "testing the logger."; Log(MYCAT, LOGL_ERROR, __BASE_FILE__, __LINE__).get() << "testing the logger."; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaa77f8a7d3f752173507afd988bd76a8aa632082 Gerrit-Change-Number: 22987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:09:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:09:08 +0000 Subject: Change in osmo-trx[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/22988 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I3cc0a92da39ab2594b3a7cefb314e2f2ecb628e2 --- M tests/CommonLibs/LogTest.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/88/22988/1 diff --git a/tests/CommonLibs/LogTest.cpp b/tests/CommonLibs/LogTest.cpp index 973e5b2..f203706 100644 --- a/tests/CommonLibs/LogTest.cpp +++ b/tests/CommonLibs/LogTest.cpp @@ -59,7 +59,7 @@ osmo_init_logging2(tall_ctx, &linfo); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 1); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3cc0a92da39ab2594b3a7cefb314e2f2ecb628e2 Gerrit-Change-Number: 22988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:11:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:11:57 +0000 Subject: Change in osmo-msc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 to look at the new patch set (#3). Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Related: OS#5034 --- M tests/db_sms/db_sms_test.c M tests/msc_vlr/msc_vlr_tests.c M tests/smpp/smpp_test.c 3 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/79/22979/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Gerrit-Change-Number: 22979 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:11:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:11:57 +0000 Subject: Change in osmo-msc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/22980 to look at the new patch set (#3). Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 --- M tests/db_sms/db_sms_test.c M tests/mncc/mncc_test.c M tests/msc_vlr/msc_vlr_tests.c M tests/smpp/smpp_test.c M tests/sms_queue/sms_queue_test.c 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/22980/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 Gerrit-Change-Number: 22980 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:17:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:17:03 +0000 Subject: Change in osmocom-bb[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/22989 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I9d24365d2be528477f1c190c698a81bfc7f2d2df --- M src/host/virt_phy/src/logging.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/22989/1 diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 75f0c9a..11a21a3 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -116,9 +116,10 @@ log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); //log_set_log_level(stderr_target, 1); - log_set_print_filename(stderr_target, 1); + log_set_print_filename2(stderr_target, LOG_FILENAME_PATH); log_set_use_color(stderr_target, 0); log_set_print_timestamp(stderr_target, 1); + log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 1); if (cat_mask) log_parse_category_mask(stderr_target, cat_mask); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/22989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9d24365d2be528477f1c190c698a81bfc7f2d2df Gerrit-Change-Number: 22989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:24:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:24:13 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/22990 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Related: OS#5034 --- M openbsc/tests/db/db_test.c M openbsc/tests/subscr/bsc_subscr_test.c 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/90/22990/1 diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index 3d44930..d8440eb 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -207,6 +207,8 @@ osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); dummy_net.subscr_group = &dummy_sgrp; dummy_sgrp.net = &dummy_net; @@ -216,7 +218,7 @@ if (db_init("hlr.sqlite3")) { printf("DB: Failed to init database. Please check the option settings.\n"); return 1; - } + } printf("DB: Database initialized.\n"); /* Muting stdout here because libdbi diff --git a/openbsc/tests/subscr/bsc_subscr_test.c b/openbsc/tests/subscr/bsc_subscr_test.c index 60d687d..20ce07d 100644 --- a/openbsc/tests/subscr/bsc_subscr_test.c +++ b/openbsc/tests/subscr/bsc_subscr_test.c @@ -118,6 +118,7 @@ log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DREF, 1, LOGL_DEBUG); bsc_subscribers = talloc_zero(NULL, struct llist_head); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:24:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:24:13 +0000 Subject: Change in openbsc[master]: gitignore: Ignore configure~ file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/22991 ) Change subject: gitignore: Ignore configure~ file ...................................................................... gitignore: Ignore configure~ file Change-Id: Ie2ec89307ca941e52cb898ce045e423c44f32658 --- M openbsc/.gitignore M openbsc/tests/smpp/smpp_test.c M openbsc/tests/subscr/subscr_test.c 3 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/91/22991/1 diff --git a/openbsc/.gitignore b/openbsc/.gitignore index a1695c6..e99632d 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -38,6 +38,7 @@ libtool ltmain.sh m4/*.m4 +configure~ # git-version-gen magic .tarball-version diff --git a/openbsc/tests/smpp/smpp_test.c b/openbsc/tests/smpp/smpp_test.c index 62fa9d2..e1e9a8b 100644 --- a/openbsc/tests/smpp/smpp_test.c +++ b/openbsc/tests/smpp/smpp_test.c @@ -67,6 +67,8 @@ osmo_init_logging(&log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_coding_scheme(); return EXIT_SUCCESS; diff --git a/openbsc/tests/subscr/subscr_test.c b/openbsc/tests/subscr/subscr_test.c index 2a5d0e1..78fa7bb 100644 --- a/openbsc/tests/subscr/subscr_test.c +++ b/openbsc/tests/subscr/subscr_test.c @@ -106,6 +106,8 @@ printf("Testing subscriber core code.\n"); osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); dummy_net.subscr_group = &dummy_sgrp; dummy_sgrp.net = &dummy_net; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie2ec89307ca941e52cb898ce045e423c44f32658 Gerrit-Change-Number: 22991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:24:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:24:13 +0000 Subject: Change in openbsc[master]: tests: Replace deprecated API log_set_print_filename References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/22992 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I2bd75313daab58704625245af2dd39d88ee42872 --- M openbsc/tests/db/db_test.c M openbsc/tests/smpp/smpp_test.c M openbsc/tests/subscr/bsc_subscr_test.c M openbsc/tests/subscr/subscr_test.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/92/22992/1 diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index d8440eb..9c4c029 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -205,7 +205,7 @@ { printf("Testing subscriber database code.\n"); osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/openbsc/tests/smpp/smpp_test.c b/openbsc/tests/smpp/smpp_test.c index e1e9a8b..99c2683 100644 --- a/openbsc/tests/smpp/smpp_test.c +++ b/openbsc/tests/smpp/smpp_test.c @@ -66,7 +66,7 @@ { osmo_init_logging(&log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/openbsc/tests/subscr/bsc_subscr_test.c b/openbsc/tests/subscr/bsc_subscr_test.c index 20ce07d..cbe635e 100644 --- a/openbsc/tests/subscr/bsc_subscr_test.c +++ b/openbsc/tests/subscr/bsc_subscr_test.c @@ -114,7 +114,7 @@ { printf("Testing BSC subscriber core code.\n"); osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); diff --git a/openbsc/tests/subscr/subscr_test.c b/openbsc/tests/subscr/subscr_test.c index 78fa7bb..947c2c3 100644 --- a/openbsc/tests/subscr/subscr_test.c +++ b/openbsc/tests/subscr/subscr_test.c @@ -105,7 +105,7 @@ { printf("Testing subscriber core code.\n"); osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2bd75313daab58704625245af2dd39d88ee42872 Gerrit-Change-Number: 22992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:28:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 13:28:57 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 ) Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/gb/gprs_ns_test.c File tests/gb/gprs_ns_test.c: https://gerrit.osmocom.org/c/libosmocore/+/22962/1/tests/gb/gprs_ns_test.c at 911 PS1, Line 911: osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); > why moving this line? Because that way we have all the logging initializers together. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 13:28:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 19 13:31:17 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 19 Feb 2021 13:31:17 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <602fbdb4bb8c3_6c892abbc860c5f8270562c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 129s] [COMPILING apps/dfu/main.c] [ 129s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 130s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 130s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 130s] Memory region Used Size Region Size %age Used [ 130s] rom: 16580 B 16 KB 101.20% [ 130s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 130s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 130s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 130s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 130s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 130s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 130s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 130s] collect2: error: ld returned 1 exit status [ 130s] % [ 130s] make[2]: *** [Makefile:234: flash] Error 1 [ 130s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 130s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 130s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 130s] dh_auto_build: error: make -j1 returned exit code 2 [ 130s] make: *** [debian/rules:16: build] Error 25 [ 130s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 130s] ### VM INTERACTION START ### [ 133s] [ 121.578906] sysrq: Power Off [ 133s] [ 121.581416] reboot: Power down [ 133s] ### VM INTERACTION END ### [ 133s] [ 133s] old-atreju3 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 19 13:31:10 UTC 2021. [ 133s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 19 13:36:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 19 Feb 2021 13:36:36 +0000 Subject: Change in osmocom-bb[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/22989 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/22989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9d24365d2be528477f1c190c698a81bfc7f2d2df Gerrit-Change-Number: 22989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 19 Feb 2021 13:36:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 19 13:51:08 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 19 Feb 2021 13:51:08 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <602fc260b464e_6c892abbc860c5f82709022@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 112s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 112s] [COMPILING libboard/qmod/source/card_pres.c] [ 112s] [COMPILING libboard/qmod/source/wwan_led.c] [ 112s] [COMPILING libboard/qmod/source/i2c.c] [ 112s] [COMPILING libboard/qmod/source/board_qmod.c] [ 112s] [COMPILING apps/dfu/main.c] [ 113s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 113s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 113s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 113s] Memory region Used Size Region Size %age Used [ 113s] rom: 16588 B 16 KB 101.25% [ 113s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 113s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 113s] collect2: error: ld returned 1 exit status [ 113s] % [ 113s] make[2]: *** [Makefile:234: flash] Error 1 [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 113s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] dh_auto_build: error: make -j1 returned exit code 2 [ 113s] make: *** [debian/rules:16: build] Error 25 [ 113s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 113s] ### VM INTERACTION START ### [ 116s] [ 106.723388] sysrq: Power Off [ 116s] [ 106.726287] reboot: Power down [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] sheep86 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 19 13:51:07 UTC 2021. [ 116s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 19 15:05:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 15:05:33 +0000 Subject: Change in osmocom-bb[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/22989 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I9d24365d2be528477f1c190c698a81bfc7f2d2df --- M src/host/virt_phy/src/logging.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 75f0c9a..11a21a3 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -116,9 +116,10 @@ log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); //log_set_log_level(stderr_target, 1); - log_set_print_filename(stderr_target, 1); + log_set_print_filename2(stderr_target, LOG_FILENAME_PATH); log_set_use_color(stderr_target, 0); log_set_print_timestamp(stderr_target, 1); + log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 1); if (cat_mask) log_parse_category_mask(stderr_target, cat_mask); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/22989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9d24365d2be528477f1c190c698a81bfc7f2d2df Gerrit-Change-Number: 22989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 15:49:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 15:49:44 +0000 Subject: Change in osmo-pcu[master]: Use NULL as default value for pointer type References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22993 ) Change subject: Use NULL as default value for pointer type ...................................................................... Use NULL as default value for pointer type Using zero there is confusing since it's a pointer to an integer. Change-Id: Ief2368954c71005c529e3eea3fee5df2630e44c1 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/22993/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 4c68a87..6b34418 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -147,7 +147,7 @@ */ static int find_least_busy_pdch(const struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir, uint8_t mask, int (*fn)(const struct gprs_rlcmac_pdch *, enum gprs_rlcmac_tbf_direction dir), - int *free_tfi = 0, int *free_usf = 0) + int *free_tfi = NULL, int *free_usf = NULL) { unsigned ts; int min_used = INT_MAX; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief2368954c71005c529e3eea3fee5df2630e44c1 Gerrit-Change-Number: 22993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 15:56:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 15:56:39 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22994 ) Change subject: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration ...................................................................... find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration Change-Id: I397495c158bce1c2715991371368b0d84cf69261 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/22994/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 6b34418..469ede3 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -556,7 +556,7 @@ /* Check for each UL (TX) slot */ /* Iterate through possible numbers of TX slots */ - for (num_tx = 1; num_tx <= mslot_class_get_tx(mslot_class); num_tx += 1) { + for (num_tx = 1; num_tx <= Tx; num_tx += 1) { uint16_t tx_valid_win = (1 << num_tx) - 1; uint8_t rx_mask[MASK_TR + 1]; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I397495c158bce1c2715991371368b0d84cf69261 Gerrit-Change-Number: 22994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 16:35:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 16:35:15 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_rx() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22995 ) Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_rx() ...................................................................... find_multi_slots: Avoid multiple calls to mslot_class_get_rx() Change-Id: I06c97d81636e251f81c26f3aa042c70717be083a --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/22995/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 469ede3..1645b87 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -516,7 +516,8 @@ */ int find_multi_slots(struct gprs_rlcmac_trx *trx, uint8_t mslot_class, uint8_t *ul_slots, uint8_t *dl_slots) { - uint8_t Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ + uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ + Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */ max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; int16_t rx_window, tx_window; @@ -534,7 +535,7 @@ return -EINVAL; } - max_slots = OSMO_MAX(mslot_class_get_rx(mslot_class), Tx); + max_slots = OSMO_MAX(Rx, Tx); if (*dl_slots == 0) *dl_slots = 0xff; @@ -590,7 +591,7 @@ if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0) continue; - num_rx = OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx); + num_rx = OSMO_MIN(Rx, Sum - num_tx); rx_valid_win = (1 << num_rx) - 1; /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I06c97d81636e251f81c26f3aa042c70717be083a Gerrit-Change-Number: 22995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 16:35:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 16:35:16 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Mark mslot_class properties const References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22996 ) Change subject: find_multi_slots: Mark mslot_class properties const ...................................................................... find_multi_slots: Mark mslot_class properties const This way it's clear for reader that those variables are never touched during the function. Change-Id: Ief038c75bc02d0e987135f29599014eab88447dd --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/22996/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 1645b87..cb054cd 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -516,10 +516,10 @@ */ int find_multi_slots(struct gprs_rlcmac_trx *trx, uint8_t mslot_class, uint8_t *ul_slots, uint8_t *dl_slots) { - uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ - Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ - Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */ - max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; + const uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ + Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ + Sum = mslot_class_get_sum(mslot_class); /* Max number of Tx + Rx slots */ + uint8_t max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; int16_t rx_window, tx_window; char slot_info[9] = {0}; int max_capacity = -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief038c75bc02d0e987135f29599014eab88447dd Gerrit-Change-Number: 22996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 16:35:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 16:35:16 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_type() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22997 ) Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_type() ...................................................................... find_multi_slots: Avoid multiple calls to mslot_class_get_type() Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/22997/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index cb054cd..5f0bcc5 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -518,7 +518,8 @@ { const uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ - Sum = mslot_class_get_sum(mslot_class); /* Max number of Tx + Rx slots */ + Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */ + Type = mslot_class_get_type(mslot_class); uint8_t max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; int16_t rx_window, tx_window; char slot_info[9] = {0}; @@ -574,7 +575,7 @@ /* for multislot type 1: don't split the window to wrap around. * E.g. 'UU-----U' is invalid for a 4 TN window. Except 8 TN window. * See 45.002 B.1 */ - if (mslot_class_get_type(mslot_class) == 1 && num_tx < 8 && + if (Type == 1 && num_tx < 8 && tx_valid_win & (1 << 0) && tx_valid_win & (1 << 7)) continue; @@ -602,7 +603,7 @@ /* for multislot type 1: don't split the window to wrap around. * E.g. 'DD-----D' is invalid for a 4 TN window. Except 8 TN window. * See 45.002 B.1 */ - if (mslot_class_get_type(mslot_class) == 1 && num_rx < 8 && + if (Type == 1 && num_rx < 8 && (rx_valid_win & (1 << 0)) && (rx_valid_win & (1 << 7))) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688 Gerrit-Change-Number: 22997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 16:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 16:58:50 +0000 Subject: Change in docker-playground[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22940 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 Gerrit-Change-Number: 22940 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 16:58:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 17:13:21 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 19 Feb 2021 17:13:21 +0000 Subject: Change in docker-playground[master]: gbproxy: update sns configuration to use ip-sns-bind In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22940 ) Change subject: gbproxy: update sns configuration to use ip-sns-bind ...................................................................... gbproxy: update sns configuration to use ip-sns-bind With libosmocore commit the SNS configuration requires a ip-sns-bind vty configuration to define the binds which should be use. Related: SYS#5354 Depends-on: I9ab8092bf286e7d90e92f5702a5404425e959c84 (libosmocore) Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg M ttcn3-gbproxy-test/osmo-gbproxy.cfg 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved lynxis lazus: Verified diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index f5bda9d..7123158 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -31,8 +31,10 @@ bind udp local listen 172.18.25.10 23000 nse 101 + ip-sns-bind local ip-sns-remote 172.18.25.103 7777 nse 102 + ip-sns-bind local ip-sns-remote 172.18.25.103 8888 bind fr hdlcnet1 fr hdlcnet1 frnet diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg index c817e2c..3a73a30 100644 --- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg @@ -32,8 +32,10 @@ listen 172.18.24.10 23000 accept-ipaccess nse 101 + ip-sns-bind local ip-sns-remote 172.18.24.103 7777 nse 102 + ip-sns-bind local ip-sns-remote 172.18.24.103 8888 timer tns-block 3 timer tns-block-retries 3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I11541540468584fc17a18fa294da5c9813c28d64 Gerrit-Change-Number: 22940 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 18:04:28 +0000 Subject: Change in osmo-remsim[master]: manual: fix formating of a bullet point list in bankd csv file part References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/22998 ) Change subject: manual: fix formating of a bullet point list in bankd csv file part ...................................................................... manual: fix formating of a bullet point list in bankd csv file part Change-Id: Ib56dbfae4ebf14321bfed855291341a50f862148 --- M doc/manuals/chapters/remsim-bankd.adoc 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/98/22998/1 diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc index 87dafa1..ab7a362 100644 --- a/doc/manuals/chapters/remsim-bankd.adoc +++ b/doc/manuals/chapters/remsim-bankd.adoc @@ -108,6 +108,7 @@ This CSV file specifies the mapping between the string names of the PCSC readers and the RSPRO bandk/slot numbers. The format is as follows: + * first column: bankd number * second column: slot number within bankd * third column: extended POSIX regular expression matching the slot -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/22998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib56dbfae4ebf14321bfed855291341a50f862148 Gerrit-Change-Number: 22998 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:10:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 18:10:34 +0000 Subject: Change in osmo-remsim[master]: manual: fix formating of a bullet point list in bankd csv file part In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/22998 ) Change subject: manual: fix formating of a bullet point list in bankd csv file part ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/22998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib56dbfae4ebf14321bfed855291341a50f862148 Gerrit-Change-Number: 22998 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 18:10:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:33:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:33:53 +0000 Subject: Change in osmo-ggsn[master]: .gitignore: ignore debian/libgtp* References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22999 ) Change subject: .gitignore: ignore debian/libgtp* ...................................................................... .gitignore: ignore debian/libgtp* Change-Id: I41fa611917defeab13f01a59dcc3f95961f10bda --- M .gitignore 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/99/22999/1 diff --git a/.gitignore b/.gitignore index cb27dff..80e4837 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ # debian debian/osmo-ggsn/ debian/*.debhelper -debian/libgtp1 +debian/libgtp*/ debian/osmo-ggsn-dbg debian/*.log debian/autoreconf.* -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I41fa611917defeab13f01a59dcc3f95961f10bda Gerrit-Change-Number: 22999 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:33:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:33:54 +0000 Subject: Change in osmo-ggsn[master]: deb/rpm: build with --enable-gtp-linux References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 ) Change subject: deb/rpm: build with --enable-gtp-linux ...................................................................... deb/rpm: build with --enable-gtp-linux Allow optional use of the GTP kernel module. Related: OS#3208 Change-Id: Ic001ec6c5ec9887706a5b27f2a48cd61942ab4ee --- M contrib/osmo-ggsn.spec.in M debian/control M debian/rules 3 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/00/23000/1 diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index 4e8b11e..83a1ca7 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -34,6 +34,7 @@ BuildRequires: pkgconfig(libosmocore) >= 1.1.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 BuildRequires: pkgconfig(libosmovty) >= 1.1.0 +BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 Obsoletes: openggsn %{?systemd_requires} @@ -69,6 +70,7 @@ echo "%{version}" >.tarball-version autoreconf -fi %configure \ + --enable-gtp-linux \ --disable-static \ --docdir="%{_docdir}/%{name}" \ --with-systemdsystemunitdir=%{_unitdir} \ diff --git a/debian/control b/debian/control index 0822773..1fd1937 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ libdpkg-perl, git, dh-autoreconf, libosmocore-dev (>= 1.4.0), - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev, + libgtpnl-dev (>= 1.2.0) Standards-Version: 3.9.6 Vcs-Browser: http://git.osmocom.org/osmo-ggsn/ Vcs-Git: git://git.osmocom.org/osmo-ggsn diff --git a/debian/rules b/debian/rules index c5c7708..c11700c 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,10 @@ dh_strip -plibgtp6 --dbg-package=libgtp-dbg override_dh_auto_configure: - dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals + dh_auto_configure -- \ + --enable-gtp-linux \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --enable-manuals # Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) override_dh_compress: -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic001ec6c5ec9887706a5b27f2a48cd61942ab4ee Gerrit-Change-Number: 23000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:34:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:34:27 +0000 Subject: Change in osmo-ggsn[master]: deb/rpm: build with --enable-gtp-linux In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 ) Change subject: deb/rpm: build with --enable-gtp-linux ...................................................................... Patch Set 1: Verified that it builds in own OBS namespace: https://build.opensuse.org/package/show/home:osmith42/osmo-ggsn -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic001ec6c5ec9887706a5b27f2a48cd61942ab4ee Gerrit-Change-Number: 23000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 19 Feb 2021 18:34:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:36:16 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 19 Feb 2021 18:36:16 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 to look at the new patch set (#3). Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Disallow changing the type of an existing BTS from the vty Changing the BTS type is not supported, so don't allow it. For example, Changing from type sysmobts to type rbs2000 may hit an OSMO_ASSERT in om2k_bts_fsm_alloc() The default BTS type if osmo-bsc is started with an empty configuration and the operator issues config terminal->network->bts 0 will be "unknown". This type and only this type can be changed from the vty config node. Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/22964/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:37:14 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 19 Feb 2021 18:37:14 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/22964/2/src/osmo-bsc/bts.c File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/22964/2/src/osmo-bsc/bts.c at 495 PS2, Line 495: if (bts->type && type != bts->type) > since type is an enum, let's better compare agains the _UNKNOWN value, instead of checking non-zero. Thanks. I think I've done what you mean :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 18:37:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:43:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:43:57 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... jenkins-common.sh: add common clean up trap Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning of the jenkins.sh files. Move the common clean up code from the end of every jenkins.sh file into clean_up_common(), which gets called by the trap. Add a custom clean_up() function to those jenkins.sh files that need additional clean up. The motivation for this change is the upcoming optional build of initrd and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a short smoke test will be performed to make sure we can boot the kernel and initrd, before continuing to run the entire testsuite against it. If building or the smoke test fails, we must do a proper clean up of the network and fix permissions. Related: OS#3208 Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 24 files changed, 92 insertions(+), 171 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/23001/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 1cfbbfc..b27f4bf 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -160,6 +160,30 @@ cat "$VOL_BASE_DIR"/*/junit-*.log || true } +clean_up_common() { + set +e + + # Clear trap + trap - EXIT INT TERM 0 + + # Run clean_up() from ttcn3-*/jenkins.sh, if defined + if type clean_up >/dev/null; then + clean_up + fi + + network_clean + network_remove + rm -rf "$VOL_BASE_DIR"/unix + collect_logs +} + +# Run clean up code when the script stops (either by failing command, by ^C, or +# after running through successfully). The caller can define a custom clean_up +# function. +set_clean_up_trap() { + trap clean_up_common EXIT INT TERM 0 +} + set -x # non-jenkins execution: assume local user name diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index fff96b7..cd59c99 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -9,6 +9,8 @@ "debian-stretch-titan" \ "nplab-m3ua-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ @@ -34,8 +36,3 @@ -v $VOL_BASE_DIR/m3ua-tester:/data \ --name ${BUILD_TAG}-m3ua-test \ $REPO_USER/nplab-m3ua-test > $VOL_BASE_DIR/junit-xml-m3ua.log - -docker container stop -t 1 ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index d62ac29..baf1c9b 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -9,6 +9,8 @@ "sigtran-tests" \ "nplab-sua-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ @@ -34,8 +36,3 @@ -v $VOL_BASE_DIR/sua-tester:/data \ --name ${BUILD_TAG}-sua-test \ $REPO_USER/nplab-sua-test > $VOL_BASE_DIR/junit-xml-sua.log - -docker container stop -t 1 ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 5d30f42..4018dc0 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -58,6 +58,8 @@ "debian-stretch-jenkins" \ "osmo-gsm-tester" +set_clean_up_trap + SUBNET=50 network_create $SUBNET @@ -101,12 +103,6 @@ $REPO_USER/osmo-gsm-tester rc=$? -echo Stopping containers -docker container kill ${BUILD_TAG}-ogt-slave - -network_remove -collect_logs - RED='\033[0;31m' GREEN='\033[0;32m' NC='\033[0m' # No Color diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ab8c06d..d1f1454 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -7,6 +7,8 @@ "osmo-bts-$IMAGE_SUFFIX" \ "ttcn3-bsc-test" +set_clean_up_trap + #Make sure NET_NAME doesn't clash with the AoIP BSC test NET_NAME=ttcn3-bsc_sccplite-test @@ -55,12 +57,3 @@ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-bsc-test - -echo Stopping containers -for i in `seq 0 2`; do - docker container kill ${BUILD_TAG}-bts$i -done -docker container kill ${BUILD_TAG}-bsc - -network_remove -collect_logs diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index cba378e..80f442b 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -8,6 +8,8 @@ "osmo-bts-$IMAGE_SUFFIX" \ "ttcn3-bsc-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ @@ -86,13 +88,3 @@ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-bsc-test - -echo Stopping containers -for i in `seq 0 2`; do - docker container kill ${BUILD_TAG}-bts$i -done -docker container kill ${BUILD_TAG}-bsc -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index 9b04955..e0cd654 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -6,6 +6,7 @@ "osmo-nitb-$IMAGE_SUFFIX" \ "ttcn3-bscnat-test" +set_clean_up_trap mkdir $VOL_BASE_DIR/bscnat-tester cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ @@ -36,9 +37,3 @@ --name ${BUILD_TAG}-ttcn3-bscnat-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-bscnat-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-bscnat - -network_remove -collect_logs diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 87e2896..39ac7d4 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -9,6 +9,17 @@ "osmocom-bb-host-master" \ "ttcn3-bts-test" +set_clean_up_trap + +clean_up() { + # append ':hopping' to the classnames, + # e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'" + # e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'" + # so the hopping test cases would not interfere with non-hopping ones in Jenkins + sed -i "s/classname='\([^']\+\)'/classname='\1:hopping'/g" \ + $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log +} + start_bsc() { echo Starting container with BSC docker run --rm \ @@ -180,20 +191,3 @@ start_bsc start_bts trx 1 start_testsuite hopping -# append ':hopping' to the classnames, -# e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'" -# e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'" -# so the hopping test cases would not interfere with non-hopping ones in Jenkins -sed -i "s/classname='\([^']\+\)'/classname='\1:hopping'/g" \ - $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log - -echo Stopping containers -docker container kill ${BUILD_TAG}-trxcon -docker container kill ${BUILD_TAG}-fake_trx -docker container kill ${BUILD_TAG}-bsc -docker container kill ${BUILD_TAG}-bts -docker container kill ${BUILD_TAG}-bsc - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index faf8170..e0a758c 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -5,6 +5,8 @@ docker_images_require \ "ttcn3-fr-test" +set_clean_up_trap + SUBNET=26 network_create $SUBNET @@ -64,10 +66,3 @@ # emulate running container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-fr-test - - -echo Stopping containers -docker container kill ${BUILD_TAG}-frnet - -network_remove -collect_logs diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 4ef2ace..a636df1 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -19,6 +19,8 @@ "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" +set_clean_up_trap + SUBNET=25 network_create $SUBNET @@ -77,9 +79,3 @@ # emulate runnign container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-gbproxy-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-gbproxy - -network_remove -collect_logs diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index b063c7f..4d30c83 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" +set_clean_up_trap + SUBNET=24 network_create $SUBNET @@ -44,9 +46,3 @@ --name ${BUILD_TAG}-ttcn3-gbproxy-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-gbproxy-test $@ - -echo Stopping containers -docker container kill ${BUILD_TAG}-gbproxy - -network_remove -collect_logs diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 0aabe8a..674eb8d 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-ggsn-$IMAGE_SUFFIX" \ "ttcn3-ggsn-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ @@ -38,9 +40,3 @@ --name ${BUILD_TAG}-ggsn-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-ggsn-test - -# stop GGSN after test has completed -docker container stop ${BUILD_TAG}-ggsn - -network_remove -collect_logs diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 93ba6c3..e5bf0ee 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-hlr-$IMAGE_SUFFIX" \ "ttcn3-hlr-test" +set_clean_up_trap + SUBNET=10 network_create $SUBNET @@ -40,9 +42,3 @@ --name ${BUILD_TAG}-ttcn3-hlr-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-hlr-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-hlr - -network_remove -collect_logs diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index c49096b..65e4e76 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-mgw-$IMAGE_SUFFIX" \ "ttcn3-mgw-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ @@ -42,9 +44,3 @@ --name ${BUILD_TAG}-ttcn3-mgw-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-mgw-test - -# stop mgw after test has completed -docker container stop ${BUILD_TAG}-mgw - -network_remove -collect_logs diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index c67fb5e..e3f7b4b 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-msc-$IMAGE_SUFFIX" \ "ttcn3-msc-test" +set_clean_up_trap + SUBNET=20 network_create $SUBNET @@ -70,11 +72,3 @@ --name ${BUILD_TAG}-ttcn3-msc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-msc-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-msc -docker container kill ${BUILD_TAG}-stp - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index c31ad6d..d0ef972 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -2,6 +2,22 @@ . ../jenkins-common.sh +set_clean_up_trap + +clean_up() { + # start some stupid helper container so we can access the volume + docker run --rm \ + -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \ + -v nitb-vol:/nitb \ + -v bts-vol:/bts \ + --name ${BUILD_TAG}-sysinfo-helper -d \ + busybox /bin/sh -c 'sleep 1000 & wait' + docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR + docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR + docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR + docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper +} + SUBNET=5 network_create $SUBNET @@ -35,22 +51,3 @@ -v ttcn3-nitb-sysinfo-vol:/data \ --name ${BUILD_TAG}-ttcn3-nitb-sysinfo \ $REPO_USER/ttcn3-nitb-sysinfo - -# stop bts + nitb after test has completed -docker container stop ${BUILD_TAG}-bts -docker container stop ${BUILD_TAG}-nitb - -# start some stupid helper container so we can access the volume -docker run --rm \ - -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \ - -v nitb-vol:/nitb \ - -v bts-vol:/bts \ - --name ${BUILD_TAG}-sysinfo-helper -d \ - busybox /bin/sh -c 'sleep 1000 & wait' -docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR -docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR -docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR -docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper - -network_remove -collect_logs diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index ee0b08a..fd2aeda 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -6,6 +6,8 @@ "osmo-pcu-$IMAGE_SUFFIX" \ "ttcn3-pcu-test" +set_clean_up_trap + SUBNET=14 network_create $SUBNET @@ -56,10 +58,3 @@ --name ${BUILD_TAG}-ttcn3-pcu-test-sns \ $DOCKER_ARGS \ $REPO_USER/ttcn3-pcu-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-pcu-sns - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index c2ef0d5..33c0aec 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-pcu-$IMAGE_SUFFIX" \ "ttcn3-pcu-test" +set_clean_up_trap + SUBNET=13 network_create $SUBNET @@ -59,10 +61,3 @@ --name ${BUILD_TAG}-ttcn3-pcu-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-pcu-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-pcu - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 58279b9..9a62581 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-remsim-$IMAGE_SUFFIX" \ "ttcn3-remsim-test" +set_clean_up_trap + start_server() { echo Starting container with osmo-remsim-server docker run --rm \ @@ -87,7 +89,3 @@ start_client cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ start_testsuite -docker container kill ${BUILD_TAG}-client - -network_remove -collect_logs diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index b47589c..c73e7c7 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-stp-master" \ "ttcn3-sccp-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/sccp-tester cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ @@ -36,8 +38,3 @@ --name ${BUILD_TAG}-ttcn3-sccp-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-sccp-test - -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 35eaf2e..b688ce1 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-sgsn-$IMAGE_SUFFIX" \ "ttcn3-sgsn-test" +set_clean_up_trap + SUBNET=8 network_create $SUBNET @@ -57,10 +59,3 @@ --name ${BUILD_TAG}-ttcn3-sgsn-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-sgsn-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-sgsn -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index af5e40b..fa7e7cb 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-sip-$IMAGE_SUFFIX" \ "ttcn3-sip-test" +set_clean_up_trap + SUBNET=11 network_create $SUBNET @@ -46,10 +48,3 @@ --name ${BUILD_TAG}-ttcn3-sip-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-sip-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-sip-connector - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index ba824c1..9e7f66c 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-smlc-$IMAGE_SUFFIX" \ "ttcn3-smlc-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/smlc-tester cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/ @@ -47,10 +49,3 @@ --name ${BUILD_TAG}-ttcn3-smlc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-smlc-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-smlc -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 9ea97cb..ff7f7ed 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-stp-$IMAGE_SUFFIX" \ "ttcn3-stp-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/stp-tester cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ @@ -40,8 +42,3 @@ --name ${BUILD_TAG}-ttcn3-stp-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-stp-test - -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:43:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:43:57 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 ) Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... */jenkins.sh: set -e after setting clean up trap Abort the script and trigger the clean up script, whenever any of the commands below to prepare the testsuite are failing. This saves time with figuring out why suddenly all or most tests are failing, and avoids running the entire testsuite on jenkins if it's obviously not going to work. Related: OS#3208 Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 --- M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 23 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/02/23002/1 diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index cd59c99..1e9a248 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -10,6 +10,7 @@ "nplab-m3ua-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index baf1c9b..eeb0f06 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -10,6 +10,7 @@ "nplab-sua-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 4018dc0..ae645e7 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -59,6 +59,7 @@ "osmo-gsm-tester" set_clean_up_trap +set -e SUBNET=50 network_create $SUBNET diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index d1f1454..0327d3a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -8,6 +8,7 @@ "ttcn3-bsc-test" set_clean_up_trap +set -e #Make sure NET_NAME doesn't clash with the AoIP BSC test NET_NAME=ttcn3-bsc_sccplite-test diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 80f442b..f004c2f 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -9,6 +9,7 @@ "ttcn3-bsc-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index e0cd654..1182df0 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-bscnat-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/bscnat-tester cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 39ac7d4..13b2247 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -10,6 +10,7 @@ "ttcn3-bts-test" set_clean_up_trap +set -e clean_up() { # append ':hopping' to the classnames, diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index e0a758c..4b376be 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -6,6 +6,7 @@ "ttcn3-fr-test" set_clean_up_trap +set -e SUBNET=26 network_create $SUBNET diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index a636df1..3e7cb4b 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -20,6 +20,7 @@ "ttcn3-gbproxy-test" set_clean_up_trap +set -e SUBNET=25 network_create $SUBNET diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 4d30c83..14e2f95 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-gbproxy-test" set_clean_up_trap +set -e SUBNET=24 network_create $SUBNET diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 674eb8d..95cbc2f 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-ggsn-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index e5bf0ee..5cf11d0 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-hlr-test" set_clean_up_trap +set -e SUBNET=10 network_create $SUBNET diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 65e4e76..334d9f6 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-mgw-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index e3f7b4b..4bf8ddd 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-msc-test" set_clean_up_trap +set -e SUBNET=20 network_create $SUBNET diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index d0ef972..e2cc494 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -3,6 +3,7 @@ . ../jenkins-common.sh set_clean_up_trap +set -e clean_up() { # start some stupid helper container so we can access the volume diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index fd2aeda..cd6e0c4 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -7,6 +7,7 @@ "ttcn3-pcu-test" set_clean_up_trap +set -e SUBNET=14 network_create $SUBNET diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 33c0aec..134c7b2 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-pcu-test" set_clean_up_trap +set -e SUBNET=13 network_create $SUBNET diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 9a62581..ae013d6 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-remsim-test" set_clean_up_trap +set -e start_server() { echo Starting container with osmo-remsim-server diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index c73e7c7..40ff1f1 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-sccp-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/sccp-tester cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index b688ce1..0b420b6 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-sgsn-test" set_clean_up_trap +set -e SUBNET=8 network_create $SUBNET diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index fa7e7cb..3f6383a 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-sip-test" set_clean_up_trap +set -e SUBNET=11 network_create $SUBNET diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index 9e7f66c..f16536f 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-smlc-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/smlc-tester cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index ff7f7ed..11b2807 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-stp-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/stp-tester cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:43:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:43:57 +0000 Subject: Change in docker-playground[master]: jenkins-common: put fix_perms() in clean_up_common References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23003 ) Change subject: jenkins-common: put fix_perms() in clean_up_common ...................................................................... jenkins-common: put fix_perms() in clean_up_common Don't call fix_perms from collect_logs anymore, it looks like it was only added there to avoid adding it at the end of each jenkins.sh. Now that we have clean_up_common, put it there. Related: OS#3208 Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/23003/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index b27f4bf..b9dfb64 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -156,7 +156,6 @@ } collect_logs() { - fix_perms cat "$VOL_BASE_DIR"/*/junit-*.log || true } @@ -174,6 +173,7 @@ network_clean network_remove rm -rf "$VOL_BASE_DIR"/unix + fix_perms collect_logs } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 Gerrit-Change-Number: 23003 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:43:58 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:43:58 +0000 Subject: Change in docker-playground[master]: osmo-ggsn-master: add configure --enable-gtp-linux References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23004 ) Change subject: osmo-ggsn-master: add configure --enable-gtp-linux ...................................................................... osmo-ggsn-master: add configure --enable-gtp-linux Related: OS#3208 Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 --- M osmo-ggsn-master/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/04/23004/1 diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index 3610f74..c52939d 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -29,6 +29,7 @@ apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ + libgtpnl-dev \ libosmocore-dev && \ apt-get clean \ ;; \ @@ -54,7 +55,7 @@ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GGSN_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure && \ + ./configure --enable-gtp-linux && \ make "-j$(nproc)" install && \ ldconfig -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 Gerrit-Change-Number: 23004 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:43:58 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:43:58 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... ttcn3-ggsn-test: add kernel test Make it possible to run ttcn3-ggsn-test against osmo-ggsn with the GTP kernel module. This feature is enabled by environment variables explained in ttcn3-ggsn-test/jenkins.sh, and can either use the pre-built kernel from Debian, or build a kernel from source. The kernel runs inside QEMU inside the usual osmo-ggsn-master docker image. Thanks to Pau for providing the kernel version and kernel-test scripts that this patch is based on! I ended up modifying them quite a bit to fit the docker use case, and to build the initrd (so we can use the stock debian kernel). Related: OS#3208 Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d --- M .gitignore M jenkins-common.sh M osmo-ggsn-latest/Dockerfile M osmo-ggsn-master/Dockerfile A scripts/kernel-test/initrd-build.sh A scripts/kernel-test/initrd-init.sh A scripts/kernel-test/kernel-build.sh A scripts/kernel-test/prepare.sh A scripts/kernel-test/qemu-ifdown.sh A scripts/kernel-test/qemu-ifup.sh A scripts/kernel-test/run-qemu.sh A ttcn3-ggsn-test/initrd-ggsn.sh M ttcn3-ggsn-test/jenkins.sh A ttcn3-ggsn-test/kernel-config A ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 15 files changed, 5,267 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/23005/1 diff --git a/.gitignore b/.gitignore index a16a1a0..0aba0f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .release + +/_cache diff --git a/jenkins-common.sh b/jenkins-common.sh index b9dfb64..b1a0d65 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -1,3 +1,6 @@ +CACHE_DIR="$(realpath ../_cache)" +KERNEL_TEST_DIR="$(realpath ../scripts/kernel-test)" + docker_image_exists() { test -n "$(docker images -q "$REPO_USER/$1")" } @@ -150,9 +153,10 @@ echo Fixing permissions docker run --rm \ -v $VOL_BASE_DIR:/data \ + -v $CACHE_DIR:/cache \ --name ${BUILD_TAG}-cleaner \ $REPO_USER/debian-stretch-build \ - chmod -R a+rX /data/ + chmod -R a+rX /data/ /cache/ } collect_logs() { @@ -184,6 +188,45 @@ trap clean_up_common EXIT INT TERM 0 } +# Generate the initrd, and optionally build a kernel, for tests that involve +# kernel modules. Boot the kernel once in QEMU inside docker to verify that it +# works. The kernel gets built if KERNEL_BUILD=1 is set. See +# scripts/kernel-test/prepare.sh for description of the other KERNEL_* vars. +# $1: path to kernel config +# $2: path to project specific initrd build script, which adds the osmo +# program, kernel modules etc. to the initrd (gets sourced by +# scripts/kernel-test/initrd-build.sh) +# $3: docker image name +# $4-n: (optional) additional arguments to "docker run", like a volume +# containing a config file +kernel_test_prepare() { + local kernel_config="$1" + local initrd_project_script="$2" + local docker_image="$3" + shift 3 + + mkdir -p "$CACHE_DIR/kernel-test" + + cp "$kernel_config" \ + "$CACHE_DIR/kernel-test/kernel-config" + cp "$initrd_project_script" \ + "$CACHE_DIR/kernel-test/initrd-project-script.sh" + + docker run \ + --cap-add=NET_ADMIN \ + --device /dev/kvm:/dev/kvm \ + --device /dev/net/tun:/dev/net/tun \ + -v "$CACHE_DIR:/cache" \ + -v "$KERNEL_TEST_DIR:/kernel-test:ro" \ + -e "KERNEL_BUILD=$KERNEL_BUILD" \ + -e "KERNEL_REMOTE_NAME=$KERNEL_REMOTE_NAME" \ + -e "KERNEL_URL=$KERNEL_URL" \ + -e "KERNEL_BRANCH=$KERNEL_BRANCH" \ + "$@" \ + "$docker_image" \ + "/kernel-test/prepare.sh" +} + set -x # non-jenkins execution: assume local user name diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile index d84dd4e..f8fb7c7 100644 --- a/osmo-ggsn-latest/Dockerfile +++ b/osmo-ggsn-latest/Dockerfile @@ -19,10 +19,20 @@ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release -RUN apt-get update && \ +RUN ln -s /bin/true /usr/local/bin/update-initramfs && \ + apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ - osmo-ggsn && \ + bc \ + bridge-utils \ + busybox-static \ + ca-certificates \ + ethtool \ + libelf-dev \ + linux-image-amd64 \ + osmo-ggsn \ + pax-utils \ + qemu-system-x86 \ + telnet && \ apt-get clean WORKDIR /tmp diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index c52939d..5d12952 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -26,11 +26,21 @@ ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml RUN case "$DISTRO" in \ debian*) \ + ln -s /bin/true /usr/local/bin/update-initramfs && \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ + bc \ + bridge-utils \ + busybox-static \ + ca-certificates \ + ethtool \ + libelf-dev \ libgtpnl-dev \ - libosmocore-dev && \ + libosmocore-dev \ + linux-image-amd64 \ + pax-utils \ + qemu-system-x86 \ + telnet && \ apt-get clean \ ;; \ centos*) \ diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh new file mode 100755 index 0000000..cce4de8 --- /dev/null +++ b/scripts/kernel-test/initrd-build.sh @@ -0,0 +1,114 @@ +#!/bin/sh -ex + +# Add one or more files to the initramfs, with parent directories +# $@: path to files +initrd_add_file() { + cp -a --parents "$@" /tmp/initrd +} + +# Add kernel module files with dependencies +# $@: kernel module names +initrd_add_mod() { + if [ "$KERNEL_BUILD" = 1 ]; then + # Custom kernel will be built, don't add any modules from the + # distribution's kernel to the initramfs. + return + fi + + local kernel="$(basename /lib/modules/*)" + local files="$(modprobe \ + -a \ + --dry-run \ + --show-depends \ + --set-version="$kernel" \ + "$@" \ + | sort -u \ + | cut -d ' ' -f 2)" + + initrd_add_file $files + + # Save the list of modules, so initrd-init.sh can load all of them + for i in $@; do + echo "$i" >> /tmp/initrd/modules + done +} + +# Add binaries with depending libraries +# $@: paths to binaries +initrd_add_bin() { + local bin + local bin_path + local file + + for bin in "$@"; do + local bin_path="$(which "$bin")" + if [ -z "$bin_path" ]; then + echo "ERROR: file not found: $bin" + exit 1 + fi + + lddtree_out="$(lddtree -l "$bin_path")" + if [ -z "$lddtree_out" ]; then + echo "ERROR: lddtree failed on '$bin_path'" + exit 1 + fi + + for file in $lddtree_out; do + initrd_add_file "$file" + + # Copy resolved symlink + if [ -L "$file" ]; then + initrd_add_file "$(realpath "$file")" + fi + done + done +} + +# Add command to run inside the initramfs +# $@: commands +initrd_add_cmd() { + local i + + if ! [ -e /tmp/initrd/cmd.sh ]; then + echo "#!/bin/sh -ex" > /tmp/initrd/cmd.sh + chmod +x /tmp/initrd/cmd.sh + fi + + for i in "$@"; do + echo "$i" >> /tmp/initrd/cmd.sh + done +} + +mkdir -p /tmp/initrd +cd /tmp/initrd + +mkdir -p \ + dev/net \ + proc \ + sbin \ + sys \ + tmp \ + usr/bin \ + usr/sbin + +initrd_add_bin \ + busybox + +initrd_add_mod \ + virtio_net \ + virtio_pci + +initrd_add_file \ + /lib/modules/*/modules.dep + +# Required for osmo-ggsn +mknod dev/net/tun c 10 200 + +cp /kernel-test/initrd-init.sh init + +# Add project specific files (e.g. osmo-ggsn and gtp kernel module) +. /cache/kernel-test/initrd-project-script.sh + +find . -print0 \ + | cpio --quiet -o -0 -H newc \ + | gzip -1 > /cache/kernel-test/initrd diff --git a/scripts/kernel-test/initrd-init.sh b/scripts/kernel-test/initrd-init.sh new file mode 100755 index 0000000..1c198b8 --- /dev/null +++ b/scripts/kernel-test/initrd-init.sh @@ -0,0 +1,38 @@ +#!/bin/busybox sh +echo "Running initrd-init.sh" +set -ex + +export HOME=/root +export LD_LIBRARY_PATH=/usr/local/lib +export PATH=/usr/local/bin:/usr/bin:/bin:/sbin:/usr/local/sbin:/usr/sbin +export TERM=screen + +/bin/busybox --install -s + +hostname qemu + +mount -t proc proc /proc +mount -t sysfs sys /sys + +# Load modules from initrd-build.sh:initrd_add_mod() +if [ -e /modules ]; then + cat /modules | xargs -t -n1 modprobe +fi + +ip link set lo up +ip link set eth0 up + +if grep -q SMOKE_TEST /proc/cmdline; then + # Called from scripts/kernel-test/prepare.sh:kernel_smoke_test() to + # verify that the kernel + initramfs boot up properly. Output this + # string instead of running the actual commands. + echo "SMOKE_TEST_SUCCESS" +else + # Run project specific commands, added with initrd_add_cmd (see + # inird-ggsn.sh for example). Use '|| true' to avoid "attempting to + # kill init" kernel panic on failure. + /cmd.sh || true +fi + +# Avoid kernel panic when init exits +poweroff -f diff --git a/scripts/kernel-test/kernel-build.sh b/scripts/kernel-test/kernel-build.sh new file mode 100755 index 0000000..e895321 --- /dev/null +++ b/scripts/kernel-test/kernel-build.sh @@ -0,0 +1,45 @@ +#!/bin/sh -ex + +KERNEL_REMOTE_NAME="${KERNEL_REMOTE_NAME:-net-next}" +KERNEL_URL="${KERNEL_URL:-https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git}" +KERNEL_BRANCH="${KERNEL_BRANCH:-master}" +KERNEL_DIR=/cache/linux +KERNEL_CONFIG=/cache/kernel-test/kernel-config + + +# Add the kernel repository as git remote, fetch it, checkout the given branch +prepare_git_repo() { + if ! [ -d "$KERNEL_DIR" ]; then + mkdir -p "$KERNEL_DIR" + git -C "$KERNEL_DIR" init + fi + + cd "$KERNEL_DIR" + + if ! git remote | grep -q "^$KERNEL_REMOTE_NAME$"; then + git remote add "$KERNEL_REMOTE_NAME" "$KERNEL_URL" + fi + + git fetch "$KERNEL_REMOTE_NAME" + git checkout "$KERNEL_REMOTE_NAME/$KERNEL_BRANCH" +} + +update_kernel_config() { + cd "$KERNEL_DIR" + + if [ -e .config_orig ] && ! diff -q "$KERNEL_CONFIG" .config_orig; then + echo "Kernel config is outdated, running 'make clean'" + make clean + fi + + cp "$KERNEL_CONFIG" .config_orig + cp .config_orig .config + + make olddefconfig +} + +prepare_git_repo +update_kernel_config + +make "-j$(nproc)" +cp arch/x86/boot/bzImage /cache/kernel-test/linux diff --git a/scripts/kernel-test/prepare.sh b/scripts/kernel-test/prepare.sh new file mode 100755 index 0000000..0fc9675 --- /dev/null +++ b/scripts/kernel-test/prepare.sh @@ -0,0 +1,23 @@ +#!/bin/sh -ex +KERNEL_BUILD="${KERNEL_BUILD:-0}" + +# Test if the kernel boots up, and initd code runs through without error +kernel_smoke_test() { + local log=/cache/kernel-test/smoke_test.log + /kernel-test/run-qemu.sh SMOKE_TEST > "$log" 2>&1 || true + if ! grep -q SMOKE_TEST_SUCCESS "$log"; then + cat "$log" + echo "ERROR: failed to boot the kernel and initrd in QEMU!" + exit 1 + fi +} + +/kernel-test/initrd-build.sh + +if [ "$KERNEL_BUILD" = 1 ]; then + /kernel-test/kernel-build.sh +else + cp /boot/vmlinuz-* /cache/kernel-test/linux +fi + +kernel_smoke_test diff --git a/scripts/kernel-test/qemu-ifdown.sh b/scripts/kernel-test/qemu-ifdown.sh new file mode 100755 index 0000000..367a51d --- /dev/null +++ b/scripts/kernel-test/qemu-ifdown.sh @@ -0,0 +1,8 @@ +#!/bin/sh -e +br=br-test + +echo "[host] qemu-ifdown: $br and $1" + +set +x +ip link set "$br" down +brctl delbr $br diff --git a/scripts/kernel-test/qemu-ifup.sh b/scripts/kernel-test/qemu-ifup.sh new file mode 100755 index 0000000..01af784 --- /dev/null +++ b/scripts/kernel-test/qemu-ifup.sh @@ -0,0 +1,22 @@ +#!/bin/sh -e +br=br-test +docker_if=eth0 + +echo "[host] qemu-ifup: $br, $1, $docker_if" +set +x + +ip link set "$1" up + +brctl addbr $br +ethtool -K $br gro off gso off tso off tx off rx off sg off >/dev/null 2>&1 + +brctl addif $br $1 +ethtool -K $1 gro off gso off tso off tx off rx off sg off >/dev/null 2>&1 + +brctl addif $br $docker_if + +ip link set "$br" up + +ip a + +ip route diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh new file mode 100755 index 0000000..842963b --- /dev/null +++ b/scripts/kernel-test/run-qemu.sh @@ -0,0 +1,30 @@ +#!/bin/sh -ex +# Arguments are appended to the kernel cmdline + +random_mac() { + printf "52:54:" + date "+%c %N" | sha1sum | sed 's/\(.\{2\}\)/\1:/g' | cut -d: -f 1-4 +} + +KERNEL_CMDLINE=" + root=/dev/ram0 + console=ttyS0 + panic=-1 + $@ +" + +qemu-system-x86_64 \ + -machine pc,accel=kvm \ + -smp 1 \ + -m 512M \ + -nodefconfig -no-user-config -nodefaults -display none \ + -gdb unix:/cache/kernel-test/gdb.pipe,server,nowait \ + -no-reboot \ + -kernel /cache/kernel-test/linux \ + -initrd /cache/kernel-test/initrd \ + -append "${KERNEL_CMDLINE}" \ + -serial stdio \ + -chardev socket,id=charserial1,path=/cache/gdb-serial.pipe,server,nowait \ + -device isa-serial,chardev=charserial1,id=serial1 \ + -netdev tap,id=nettest,script=/kernel-test/qemu-ifup.sh,downscript=/kernel-test/qemu-ifdown.sh \ + -device virtio-net-pci,netdev=nettest,mac="$(random_mac)" diff --git a/ttcn3-ggsn-test/initrd-ggsn.sh b/ttcn3-ggsn-test/initrd-ggsn.sh new file mode 100644 index 0000000..831dfff --- /dev/null +++ b/ttcn3-ggsn-test/initrd-ggsn.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Sourced by scripts/kernel-test/initrd-build.sh + +initrd_add_mod \ + gtp \ + tun + +initrd_add_bin \ + osmo-ggsn + +initrd_add_file \ + /data/osmo-ggsn.cfg + +initrd_add_cmd \ + "ip addr add 172.18.3.201/24 brd 172.18.3.255 dev eth0" \ + "ip route add default via 172.18.3.1 dev eth0" \ + "osmo-ggsn -c /data/osmo-ggsn.cfg" diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 95cbc2f..ad7f9be 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -1,6 +1,14 @@ #!/bin/sh +# Environment variables: +# * KERNEL_TEST: set to 1 to run osmo-ggsn with the kernel module in QEMU +# * KERNEL_BUILD: set to 1 to build the kernel instead of using a pre-built one +# * KERNEL_REMOTE_NAME: git remote name (to add multiple repos in the same local linux clone) +# * KERNEL_URL: git remote url +# * KERNEL_BRANCH: branch to checkout . ../jenkins-common.sh + +KERNEL_TEST="${KERNEL_TEST:-0}" IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ "osmo-ggsn-$IMAGE_SUFFIX" \ @@ -19,17 +27,40 @@ network_create $SUBNET # start container with ggsn in background +GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" +GGSN_DOCKER_ARGS="" +if [ "$KERNEL_TEST" = "1" ]; then + cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg + + kernel_test_prepare \ + "kernel-config" \ + "initrd-ggsn.sh" \ + "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ + -v $VOL_BASE_DIR/ggsn:/data + + GGSN_CMD="/kernel-test/run-qemu.sh" + GGSN_DOCKER_ARGS=" + $(docker_network_params $SUBNET 200) + --device /dev/kvm:/dev/kvm + -v "$KERNEL_TEST_DIR:/kernel-test:ro" + -v "$CACHE_DIR:/cache" + " +else + GGSN_DOCKER_ARGS=" + $(docker_network_params $SUBNET 201) + " +fi docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --rm \ - $(docker_network_params $SUBNET 201) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ${BUILD_TAG}-ggsn -d \ $DOCKER_ARGS \ + $GGSN_DOCKER_ARGS \ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ - /bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1" + /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-ggsn-test/kernel-config b/ttcn3-ggsn-test/kernel-config new file mode 100644 index 0000000..24db17f --- /dev/null +++ b/ttcn3-ggsn-test/kernel-config @@ -0,0 +1,4807 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 5.11.0-rc6 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=80300 +CONFIG_LD_VERSION=231010000 +CONFIG_CLANG_VERSION=0 +CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +# CONFIG_KERNEL_ZSTD is not set +CONFIG_DEFAULT_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_WATCH_QUEUE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_IRQ_MSI_IOMMU=y +CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y +CONFIG_GENERIC_IRQ_RESERVATION_MODE=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +# end of IRQ subsystem + +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_INIT=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +# end of Timers subsystem + +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +# CONFIG_PSI is not set +# end of CPU/Task time and stats accounting + +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +# CONFIG_IKCONFIG is not set +# CONFIG_IKHEADERS is not set +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y + +# +# Scheduler features +# +# CONFIG_UCLAMP_TASK is not set +# end of Scheduler features + +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CC_HAS_INT128=y +CONFIG_ARCH_SUPPORTS_INT128=y +# CONFIG_NUMA_BALANCING is not set +CONFIG_CGROUPS=y +# CONFIG_MEMCG is not set +# CONFIG_BLK_CGROUP is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_CFS_BANDWIDTH is not set +# CONFIG_RT_GROUP_SCHED is not set +# CONFIG_CGROUP_PIDS is not set +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_HUGETLB is not set +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +# CONFIG_CGROUP_DEVICE is not set +CONFIG_CGROUP_CPUACCT=y +# CONFIG_CGROUP_PERF is not set +# CONFIG_CGROUP_DEBUG is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_TIME_NS=y +CONFIG_IPC_NS=y +# CONFIG_USER_NS is not set +CONFIG_PID_NS=y +CONFIG_NET_NS=y +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +CONFIG_RD_ZSTD=y +# CONFIG_BOOT_CONFIG is not set +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +CONFIG_MULTIUSER=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +CONFIG_FHANDLE=y +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_PRINTK_NMI=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_IO_URING=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +# CONFIG_BPF_SYSCALL is not set +CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y +# CONFIG_USERFAULTFD is not set +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_RSEQ=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +# end of Kernel Performance Events And Counters + +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_FREELIST_RANDOM is not set +# CONFIG_SLAB_FREELIST_HARDENED is not set +# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# end of General setup + +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_MMU=y +CONFIG_ARCH_MMAP_RND_BITS_MIN=28 +CONFIG_ARCH_MMAP_RND_BITS_MAX=32 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=5 +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +# CONFIG_X86_X2APIC is not set +CONFIG_X86_MPPARSE=y +# CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y +# CONFIG_X86_CPU_RESCTRL is not set +CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_VSMP is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_MID is not set +# CONFIG_X86_INTEL_LPSS is not set +# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_IOSF_MBI=y +# CONFIG_IOSF_MBI_DEBUG is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_X86_HV_CALLBACK_VECTOR=y +# CONFIG_XEN is not set +CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y +# CONFIG_PVH is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_JAILHOUSE_GUEST is not set +# CONFIG_ACRN_GUEST is not set +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_IA32_FEAT_CTL=y +CONFIG_X86_VMX_FEATURE_NAMES=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_ZHAOXIN=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +# CONFIG_GART_IOMMU is not set +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS_RANGE_BEGIN=2 +CONFIG_NR_CPUS_RANGE_END=512 +CONFIG_NR_CPUS_DEFAULT=64 +CONFIG_NR_CPUS=64 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_MC_PRIO=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +# CONFIG_X86_MCELOG_LEGACY is not set +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y + +# +# Performance monitoring +# +CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_PERF_EVENTS_INTEL_RAPL=y +CONFIG_PERF_EVENTS_INTEL_CSTATE=y +# CONFIG_PERF_EVENTS_AMD_POWER is not set +# end of Performance monitoring + +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y +CONFIG_X86_VSYSCALL_EMULATION=y +CONFIG_X86_IOPL_IOPERM=y +# CONFIG_I8K is not set +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y +CONFIG_X86_5LEVEL=y +CONFIG_X86_DIRECT_GBPAGES=y +# CONFIG_X86_CPA_STATISTICS is not set +# CONFIG_AMD_MEM_ENCRYPT is not set +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +# CONFIG_X86_PMEM_LEGACY is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +# CONFIG_MTRR_SANITIZER is not set +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_X86_UMIP=y +CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +# CONFIG_X86_SGX is not set +CONFIG_EFI=y +# CONFIG_EFI_STUB is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_KEXEC_FILE is not set +CONFIG_CRASH_DUMP=y +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_PHYSICAL_ALIGN=0x200000 +CONFIG_DYNAMIC_MEMORY_LAYOUT=y +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +CONFIG_LEGACY_VSYSCALL_EMULATE=y +# CONFIG_LEGACY_VSYSCALL_XONLY is not set +# CONFIG_LEGACY_VSYSCALL_NONE is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_HAVE_LIVEPATCH=y +# end of Processor type and features + +CONFIG_ARCH_HAS_ADD_PAGES=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_PM_CLK=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +# CONFIG_ENERGY_MODEL is not set +CONFIG_ARCH_SUPPORTS_ACPI=y +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y +# CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_SPCR_TABLE=y +CONFIG_ACPI_LPIT=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y +# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=y +CONFIG_ACPI_FAN=y +# CONFIG_ACPI_TAD is not set +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_CPU_FREQ_PSS=y +CONFIG_ACPI_PROCESSOR_CSTATE=y +CONFIG_ACPI_PROCESSOR_IDLE=y +CONFIG_ACPI_CPPC_LIB=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_HOTPLUG_CPU=y +# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set +CONFIG_ACPI_THERMAL=y +CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y +CONFIG_ACPI_TABLE_UPGRADE=y +# CONFIG_ACPI_DEBUG is not set +# CONFIG_ACPI_PCI_SLOT is not set +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_IOAPIC=y +# CONFIG_ACPI_SBS is not set +# CONFIG_ACPI_HED is not set +# CONFIG_ACPI_CUSTOM_METHOD is not set +# CONFIG_ACPI_BGRT is not set +# CONFIG_ACPI_NFIT is not set +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_HMAT is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +# CONFIG_ACPI_APEI is not set +# CONFIG_ACPI_DPTF is not set +# CONFIG_ACPI_EXTLOG is not set +# CONFIG_ACPI_CONFIGFS is not set +# CONFIG_PMIC_OPREGION is not set +CONFIG_X86_PM_TIMER=y +# CONFIG_SFI is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +# CONFIG_CPU_FREQ_STAT is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_X86_INTEL_PSTATE=y +# CONFIG_X86_PCC_CPUFREQ is not set +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y +# CONFIG_X86_POWERNOW_K8 is not set +# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_P4_CLOCKMOD is not set + +# +# shared options +# +# end of CPU Frequency scaling + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_GOV_LADDER is not set +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_CPU_IDLE_GOV_TEO is not set +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_HALTPOLL_CPUIDLE=y +# end of CPU Idle + +# CONFIG_INTEL_IDLE is not set +# end of Power management and ACPI options + +# +# Bus options (PCI etc.) +# +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_MMCONF_FAM10H=y +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +# CONFIG_X86_SYSFB is not set +# end of Bus options (PCI etc.) + +# +# Binary Emulations +# +CONFIG_IA32_EMULATION=y +# CONFIG_X86_X32 is not set +CONFIG_COMPAT_32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +# end of Binary Emulations + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DMIID=y +# CONFIG_DMI_SYSFS is not set +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +# CONFIG_FW_CFG_SYSFS is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_ESRT=y +CONFIG_EFI_RUNTIME_MAP=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_WRAPPERS=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_TEST is not set +# CONFIG_EFI_RCI2_TABLE is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_EFI_EARLYCON=y +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + +CONFIG_HAVE_KVM=y +CONFIG_VIRTUALIZATION=y +# CONFIG_KVM is not set +CONFIG_AS_AVX512=y +CONFIG_AS_SHA1_NI=y +CONFIG_AS_SHA256_NI=y +CONFIG_AS_TPAUSE=y + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y +CONFIG_GENERIC_ENTRY=y +# CONFIG_OPROFILE is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +# CONFIG_STATIC_CALL_SELFTEST is not set +CONFIG_OPTPROBES=y +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y +CONFIG_HAVE_NMI=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y +CONFIG_HAVE_MOVE_PMD=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_HAVE_ARCH_SOFT_DIRTY=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_EXIT_THREAD=y +CONFIG_ARCH_MMAP_RND_BITS=28 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 +CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y +CONFIG_HAVE_STACK_VALIDATION=y +CONFIG_HAVE_RELIABLE_STACKTRACE=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y +# CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_HAVE_STATIC_CALL=y +CONFIG_HAVE_STATIC_CALL_INLINE=y +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# end of General architecture-dependent options + +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_ZONED is not set +# CONFIG_BLK_CMDLINE_PARSER is not set +# CONFIG_BLK_WBT is not set +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set +# CONFIG_BLK_INLINE_ENCRYPTION is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +# CONFIG_LDM_PARTITION is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set +# end of Partition Types + +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=y +# CONFIG_IOSCHED_BFQ is not set +# end of IO Schedulers + +CONFIG_ASN1=y +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y +CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y +CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y +# end of Executable file formats + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_FAST_GUP=y +# CONFIG_MEMORY_HOTPLUG is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_PAGE_REPORTING=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +# CONFIG_MEMORY_FAILURE is not set +# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_ARCH_WANTS_THP_SWAP=y +# CONFIG_CLEANCACHE is not set +# CONFIG_FRONTSWAP is not set +# CONFIG_CMA is not set +# CONFIG_ZPOOL is not set +# CONFIG_ZBUD is not set +# CONFIG_ZSMALLOC is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_ARCH_HAS_PTE_DEVMAP=y +CONFIG_VMAP_PFN=y +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y +CONFIG_ARCH_HAS_PKEYS=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +# end of Memory Management options + +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_SKB_EXTENSIONS=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set +CONFIG_UNIX=y +CONFIG_UNIX_SCM=y +# CONFIG_UNIX_DIAG is not set +# CONFIG_TLS is not set +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_USER_COMPAT is not set +# CONFIG_XFRM_INTERFACE is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_AH=y +CONFIG_XFRM_ESP=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE_DEMUX is not set +CONFIG_NET_IP_TUNNEL=y +CONFIG_IP_MROUTE_COMMON=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +# CONFIG_NET_IPVTI is not set +CONFIG_NET_UDP_TUNNEL=y +# CONFIG_NET_FOU is not set +# CONFIG_NET_FOU_IP_TUNNELS is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +CONFIG_INET_TUNNEL=y +# CONFIG_INET_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set +CONFIG_TCP_CONG_CUBIC=y +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_NV is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_TCP_CONG_DCTCP is not set +# CONFIG_TCP_CONG_CDG is not set +# CONFIG_TCP_CONG_BBR is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=y +CONFIG_INET6_ESP=y +# CONFIG_INET6_ESP_OFFLOAD is not set +# CONFIG_INET6_ESPINTCP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_ILA is not set +# CONFIG_IPV6_VTI is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6_SEG6_LWTUNNEL is not set +# CONFIG_IPV6_SEG6_HMAC is not set +# CONFIG_IPV6_RPL_LWTUNNEL is not set +CONFIG_NETLABEL=y +# CONFIG_MPTCP is not set +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=y +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +CONFIG_NETFILTER_NETLINK_LOG=y +# CONFIG_NETFILTER_NETLINK_OSF is not set +CONFIG_NF_CONNTRACK=y +CONFIG_NF_LOG_COMMON=y +# CONFIG_NF_LOG_NETDEV is not set +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set +CONFIG_NF_CONNTRACK_PROCFS=y +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CONNTRACK_LABELS is not set +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=y +# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_IRC=y +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SIP=y +# CONFIG_NF_CONNTRACK_TFTP is not set +CONFIG_NF_CT_NETLINK=y +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NF_NAT=y +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_IRC=y +CONFIG_NF_NAT_SIP=y +CONFIG_NF_NAT_MASQUERADE=y +# CONFIG_NF_TABLES is not set +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=y +CONFIG_NETFILTER_XT_CONNMARK=y +# CONFIG_NETFILTER_XT_SET is not set + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +CONFIG_NETFILTER_XT_TARGET_LOG=y +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +CONFIG_NETFILTER_XT_NAT=y +# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set +CONFIG_NETFILTER_XT_TARGET_NFLOG=y +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +CONFIG_NETFILTER_XT_TARGET_SECMARK=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +# CONFIG_NETFILTER_XT_MATCH_BPF is not set +# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ECN is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +CONFIG_NETFILTER_XT_MATCH_STATE=y +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# end of Core Netfilter Configuration + +CONFIG_IP_SET=y +CONFIG_IP_SET_MAX=256 +# CONFIG_IP_SET_BITMAP_IP is not set +# CONFIG_IP_SET_BITMAP_IPMAC is not set +# CONFIG_IP_SET_BITMAP_PORT is not set +# CONFIG_IP_SET_HASH_IP is not set +# CONFIG_IP_SET_HASH_IPMARK is not set +# CONFIG_IP_SET_HASH_IPPORT is not set +# CONFIG_IP_SET_HASH_IPPORTIP is not set +# CONFIG_IP_SET_HASH_IPPORTNET is not set +# CONFIG_IP_SET_HASH_IPMAC is not set +# CONFIG_IP_SET_HASH_MAC is not set +# CONFIG_IP_SET_HASH_NETPORTNET is not set +# CONFIG_IP_SET_HASH_NET is not set +# CONFIG_IP_SET_HASH_NETNET is not set +# CONFIG_IP_SET_HASH_NETPORT is not set +# CONFIG_IP_SET_HASH_NETIFACE is not set +# CONFIG_IP_SET_LIST_SET is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=y +# CONFIG_NF_SOCKET_IPV4 is not set +# CONFIG_NF_TPROXY_IPV4 is not set +# CONFIG_NF_DUP_IPV4 is not set +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=y +CONFIG_NF_REJECT_IPV4=y +CONFIG_IP_NF_IPTABLES=y +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +# CONFIG_IP_NF_TARGET_NETMAP is not set +# CONFIG_IP_NF_TARGET_REDIRECT is not set +CONFIG_IP_NF_MANGLE=y +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_SECURITY is not set +# CONFIG_IP_NF_ARPTABLES is not set +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +# CONFIG_NF_SOCKET_IPV6 is not set +# CONFIG_NF_TPROXY_IPV6 is not set +# CONFIG_NF_DUP_IPV6 is not set +CONFIG_NF_REJECT_IPV6=y +CONFIG_NF_LOG_IPV6=y +CONFIG_IP6_NF_IPTABLES=y +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_IPV6HEADER=y +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_SRH is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +CONFIG_IP6_NF_MANGLE=y +# CONFIG_IP6_NF_RAW is not set +# CONFIG_IP6_NF_SECURITY is not set +CONFIG_IP6_NF_NAT=y +CONFIG_IP6_NF_TARGET_MASQUERADE=y +# CONFIG_IP6_NF_TARGET_NPT is not set +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=y +# CONFIG_NF_CONNTRACK_BRIDGE is not set +# CONFIG_BPFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +# CONFIG_BRIDGE is not set +CONFIG_HAVE_NET_DSA=y +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +# CONFIG_6LOWPAN is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_CBS is not set +# CONFIG_NET_SCH_ETF is not set +# CONFIG_NET_SCH_TAPRIO is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +# CONFIG_NET_SCH_NETEM is not set +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_SKBPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +# CONFIG_NET_SCH_CODEL is not set +# CONFIG_NET_SCH_FQ_CODEL is not set +# CONFIG_NET_SCH_CAKE is not set +# CONFIG_NET_SCH_FQ is not set +# CONFIG_NET_SCH_HHF is not set +# CONFIG_NET_SCH_PIE is not set +# CONFIG_NET_SCH_INGRESS is not set +# CONFIG_NET_SCH_PLUG is not set +# CONFIG_NET_SCH_ETS is not set +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +CONFIG_NET_CLS=y +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_CLS_BPF is not set +# CONFIG_NET_CLS_FLOWER is not set +# CONFIG_NET_CLS_MATCHALL is not set +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +# CONFIG_NET_EMATCH_CMP is not set +# CONFIG_NET_EMATCH_NBYTE is not set +# CONFIG_NET_EMATCH_U32 is not set +# CONFIG_NET_EMATCH_META is not set +# CONFIG_NET_EMATCH_TEXT is not set +# CONFIG_NET_EMATCH_IPSET is not set +# CONFIG_NET_EMATCH_IPT is not set +CONFIG_NET_CLS_ACT=y +# CONFIG_NET_ACT_POLICE is not set +# CONFIG_NET_ACT_GACT is not set +# CONFIG_NET_ACT_MIRRED is not set +# CONFIG_NET_ACT_SAMPLE is not set +# CONFIG_NET_ACT_IPT is not set +# CONFIG_NET_ACT_NAT is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +# CONFIG_NET_ACT_SKBEDIT is not set +# CONFIG_NET_ACT_CSUM is not set +# CONFIG_NET_ACT_MPLS is not set +# CONFIG_NET_ACT_VLAN is not set +# CONFIG_NET_ACT_BPF is not set +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set +# CONFIG_NET_ACT_SKBMOD is not set +# CONFIG_NET_ACT_IFE is not set +# CONFIG_NET_ACT_TUNNEL_KEY is not set +# CONFIG_NET_ACT_GATE is not set +# CONFIG_NET_TC_SKB_EXT is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +CONFIG_DNS_RESOLVER=y +# CONFIG_BATMAN_ADV is not set +# CONFIG_OPENVSWITCH is not set +# CONFIG_VSOCKETS is not set +# CONFIG_NETLINK_DIAG is not set +# CONFIG_MPLS is not set +# CONFIG_NET_NSH is not set +# CONFIG_HSR is not set +# CONFIG_NET_SWITCHDEV is not set +# CONFIG_NET_L3_MASTER_DEV is not set +# CONFIG_QRTR is not set +# CONFIG_NET_NCSI is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +# CONFIG_CGROUP_NET_PRIO is not set +# CONFIG_CGROUP_NET_CLASSID is not set +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +# CONFIG_BPF_JIT is not set +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set +# end of Network testing +# end of Networking options + +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +# CONFIG_AX25 is not set +# CONFIG_CAN is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +# CONFIG_CFG80211_WEXT is not set +CONFIG_MAC80211=y +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_RFKILL=y +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set +# CONFIG_NFC is not set +# CONFIG_PSAMPLE is not set +# CONFIG_NET_IFE is not set +# CONFIG_LWTUNNEL is not set +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_FAILOVER=y +CONFIG_ETHTOOL_NETLINK=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_HAVE_EISA=y +# CONFIG_EISA is not set +CONFIG_HAVE_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +# CONFIG_HOTPLUG_PCI_PCIE is not set +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PCIEASPM=y +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_PTM is not set +# CONFIG_PCIE_BW is not set +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +CONFIG_PCI_ATS=y +CONFIG_PCI_LOCKLESS_CONFIG=y +# CONFIG_PCI_IOV is not set +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_ACPI is not set +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set + +# +# PCI controller drivers +# +# CONFIG_VMD is not set + +# +# DesignWare PCI Core Support +# +# CONFIG_PCIE_DW_PLAT_HOST is not set +# CONFIG_PCI_MESON is not set +# end of DesignWare PCI Core Support + +# +# Mobiveil PCIe Core Support +# +# end of Mobiveil PCIe Core Support + +# +# Cadence PCIe controllers support +# +# end of Cadence PCIe controllers support +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set +# end of PCI switch controller drivers + +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=y +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +# CONFIG_PD6729 is not set +# CONFIG_I82092 is not set +CONFIG_PCCARD_NONSTATIC=y +# CONFIG_RAPIDIO is not set + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set +# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_CACHE=y +# end of Firmware loader + +CONFIG_ALLOW_DEV_COREDUMP=y +# CONFIG_DEBUG_DRIVER is not set +CONFIG_DEBUG_DEVRES=y +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_REGMAP=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +# end of Generic Driver Options + +# +# Bus devices +# +# CONFIG_MHI_BUS is not set +# end of Bus devices + +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +# CONFIG_GNSS is not set +# CONFIG_MTD is not set +# CONFIG_OF is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +# CONFIG_PARPORT is not set +CONFIG_PNP=y +CONFIG_PNP_DEBUG_MESSAGES=y + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set +# CONFIG_BLK_DEV_FD is not set +CONFIG_CDROM=y +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_DRBD is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SKD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_VIRTIO_BLK=y +# CONFIG_BLK_DEV_RBD is not set +# CONFIG_BLK_DEV_RSXX is not set + +# +# NVME Support +# +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_NVME_FC is not set +# end of NVME Support + +# +# Misc devices +# +# CONFIG_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set +# CONFIG_IBM_ASM is not set +# CONFIG_PHANTOM is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_SRAM is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +# CONFIG_XILINX_SDFEC is not set +# CONFIG_PVPANIC is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +# CONFIG_EEPROM_EE1004 is not set +# end of EEPROM support + +# CONFIG_CB710_CORE is not set + +# +# Texas Instruments shared transport line discipline +# +# end of Texas Instruments shared transport line discipline + +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_ALTERA_STAPL is not set +# CONFIG_INTEL_MEI is not set +# CONFIG_INTEL_MEI_ME is not set +# CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MEI_HDCP is not set +# CONFIG_VMWARE_VMCI is not set +# CONFIG_GENWQE is not set +# CONFIG_ECHO is not set +# CONFIG_MISC_ALCOR_PCI is not set +# CONFIG_MISC_RTSX_PCI is not set +# CONFIG_HABANA_AI is not set +# CONFIG_UACCE is not set +# end of Misc devices + +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +CONFIG_BLK_DEV_SR=y +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set +CONFIG_SCSI_CONSTANTS=y +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=y +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# end of SCSI Transports + +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# end of SCSI device support + +CONFIG_ATA=y +CONFIG_SATA_HOST=y +CONFIG_PATA_TIMINGS=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_FORCE=y +CONFIG_ATA_ACPI=y +# CONFIG_SATA_ZPODD is not set +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=y +CONFIG_SATA_MOBILE_LPM_POLICY=0 +# CONFIG_SATA_AHCI_PLATFORM is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_SATA_ACARD_AHCI is not set +# CONFIG_SATA_SIL24 is not set +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_SX4 is not set +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=y +# CONFIG_SATA_DWC is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_SVW is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set + +# +# PATA SFF controllers with BMDMA +# +# CONFIG_PATA_ALI is not set +CONFIG_PATA_AMD=y +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_ATP867X is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87415 is not set +CONFIG_PATA_OLDPIIX=y +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +CONFIG_PATA_SCH=y +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_PCMCIA is not set +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +# CONFIG_PATA_ACPI is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID10 is not set +# CONFIG_MD_RAID456 is not set +# CONFIG_MD_MULTIPATH is not set +# CONFIG_MD_FAULTY is not set +# CONFIG_BCACHE is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +# CONFIG_DM_UNSTRIPED is not set +# CONFIG_DM_CRYPT is not set +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_THIN_PROVISIONING is not set +# CONFIG_DM_CACHE is not set +# CONFIG_DM_WRITECACHE is not set +# CONFIG_DM_EBS is not set +# CONFIG_DM_ERA is not set +# CONFIG_DM_CLONE is not set +CONFIG_DM_MIRROR=y +# CONFIG_DM_LOG_USERSPACE is not set +# CONFIG_DM_RAID is not set +CONFIG_DM_ZERO=y +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_DUST is not set +# CONFIG_DM_INIT is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set +# CONFIG_DM_SWITCH is not set +# CONFIG_DM_LOG_WRITES is not set +# CONFIG_DM_INTEGRITY is not set +# CONFIG_TARGET_CORE is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_FIREWIRE_NOSY is not set +# end of IEEE 1394 (FireWire) support + +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_NET_CORE=y +# CONFIG_BONDING is not set +# CONFIG_DUMMY is not set +# CONFIG_WIREGUARD is not set +# CONFIG_EQUALIZER is not set +# CONFIG_NET_FC is not set +# CONFIG_IFB is not set +# CONFIG_NET_TEAM is not set +# CONFIG_MACVLAN is not set +# CONFIG_IPVLAN is not set +# CONFIG_VXLAN is not set +# CONFIG_GENEVE is not set +# CONFIG_BAREUDP is not set +CONFIG_GTP=y +# CONFIG_MACSEC is not set +CONFIG_NETCONSOLE=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_TUN is not set +# CONFIG_TUN_VNET_CROSS_LE is not set +# CONFIG_VETH is not set +CONFIG_VIRTIO_NET=y +# CONFIG_NLMON is not set +# CONFIG_ARCNET is not set + +# +# Distributed Switch Architecture drivers +# +# end of Distributed Switch Architecture drivers + +CONFIG_ETHERNET=y +CONFIG_NET_VENDOR_3COM=y +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_VORTEX is not set +# CONFIG_TYPHOON is not set +CONFIG_NET_VENDOR_ADAPTEC=y +# CONFIG_ADAPTEC_STARFIRE is not set +CONFIG_NET_VENDOR_AGERE=y +# CONFIG_ET131X is not set +CONFIG_NET_VENDOR_ALACRITECH=y +# CONFIG_SLICOSS is not set +CONFIG_NET_VENDOR_ALTEON=y +# CONFIG_ACENIC is not set +# CONFIG_ALTERA_TSE is not set +CONFIG_NET_VENDOR_AMAZON=y +# CONFIG_ENA_ETHERNET is not set +CONFIG_NET_VENDOR_AMD=y +# CONFIG_AMD8111_ETH is not set +# CONFIG_PCNET32 is not set +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_AMD_XGBE is not set +CONFIG_NET_VENDOR_AQUANTIA=y +# CONFIG_AQTION is not set +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +# CONFIG_ATL2 is not set +# CONFIG_ATL1 is not set +# CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set +# CONFIG_ALX is not set +# CONFIG_NET_VENDOR_AURORA is not set +CONFIG_NET_VENDOR_BROADCOM=y +# CONFIG_B44 is not set +# CONFIG_BCMGENET is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +CONFIG_TIGON3=y +CONFIG_TIGON3_HWMON=y +# CONFIG_BNX2X is not set +# CONFIG_SYSTEMPORT is not set +# CONFIG_BNXT is not set +CONFIG_NET_VENDOR_BROCADE=y +# CONFIG_BNA is not set +CONFIG_NET_VENDOR_CADENCE=y +# CONFIG_MACB is not set +CONFIG_NET_VENDOR_CAVIUM=y +# CONFIG_THUNDER_NIC_PF is not set +# CONFIG_THUNDER_NIC_VF is not set +# CONFIG_THUNDER_NIC_BGX is not set +# CONFIG_THUNDER_NIC_RGX is not set +# CONFIG_CAVIUM_PTP is not set +# CONFIG_LIQUIDIO is not set +# CONFIG_LIQUIDIO_VF is not set +CONFIG_NET_VENDOR_CHELSIO=y +# CONFIG_CHELSIO_T1 is not set +# CONFIG_CHELSIO_T3 is not set +# CONFIG_CHELSIO_T4 is not set +# CONFIG_CHELSIO_T4VF is not set +CONFIG_NET_VENDOR_CISCO=y +# CONFIG_ENIC is not set +CONFIG_NET_VENDOR_CORTINA=y +# CONFIG_CX_ECAT is not set +# CONFIG_DNET is not set +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +# CONFIG_DE2104X is not set +# CONFIG_TULIP is not set +# CONFIG_DE4X5 is not set +# CONFIG_WINBOND_840 is not set +# CONFIG_DM9102 is not set +# CONFIG_ULI526X is not set +# CONFIG_PCMCIA_XIRCOM is not set +CONFIG_NET_VENDOR_DLINK=y +# CONFIG_DL2K is not set +# CONFIG_SUNDANCE is not set +CONFIG_NET_VENDOR_EMULEX=y +# CONFIG_BE2NET is not set +CONFIG_NET_VENDOR_EZCHIP=y +CONFIG_NET_VENDOR_FUJITSU=y +# CONFIG_PCMCIA_FMVJ18X is not set +CONFIG_NET_VENDOR_GOOGLE=y +# CONFIG_GVE is not set +CONFIG_NET_VENDOR_HUAWEI=y +# CONFIG_HINIC is not set +CONFIG_NET_VENDOR_I825XX=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=y +CONFIG_E1000=y +CONFIG_E1000E=y +CONFIG_E1000E_HWTS=y +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_IXGB is not set +# CONFIG_IXGBE is not set +# CONFIG_IXGBEVF is not set +# CONFIG_I40E is not set +# CONFIG_I40EVF is not set +# CONFIG_ICE is not set +# CONFIG_FM10K is not set +# CONFIG_IGC is not set +# CONFIG_JME is not set +CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MVMDIO is not set +# CONFIG_SKGE is not set +CONFIG_SKY2=y +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +# CONFIG_MLX4_EN is not set +# CONFIG_MLX5_CORE is not set +# CONFIG_MLXSW_CORE is not set +# CONFIG_MLXFW is not set +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_KSZ884X_PCI is not set +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_LAN743X is not set +CONFIG_NET_VENDOR_MICROSEMI=y +CONFIG_NET_VENDOR_MYRI=y +# CONFIG_MYRI10GE is not set +# CONFIG_FEALNX is not set +CONFIG_NET_VENDOR_NATSEMI=y +# CONFIG_NATSEMI is not set +# CONFIG_NS83820 is not set +CONFIG_NET_VENDOR_NETERION=y +# CONFIG_S2IO is not set +# CONFIG_VXGE is not set +CONFIG_NET_VENDOR_NETRONOME=y +# CONFIG_NFP is not set +CONFIG_NET_VENDOR_NI=y +# CONFIG_NI_XGE_MANAGEMENT_ENET is not set +CONFIG_NET_VENDOR_8390=y +# CONFIG_PCMCIA_AXNET is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_PCMCIA_PCNET is not set +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=y +CONFIG_NET_VENDOR_OKI=y +# CONFIG_ETHOC is not set +CONFIG_NET_VENDOR_PACKET_ENGINES=y +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +CONFIG_NET_VENDOR_PENSANDO=y +# CONFIG_IONIC is not set +CONFIG_NET_VENDOR_QLOGIC=y +# CONFIG_QLA3XXX is not set +# CONFIG_QLCNIC is not set +# CONFIG_NETXEN_NIC is not set +# CONFIG_QED is not set +CONFIG_NET_VENDOR_QUALCOMM=y +# CONFIG_QCOM_EMAC is not set +# CONFIG_RMNET is not set +CONFIG_NET_VENDOR_RDC=y +# CONFIG_R6040 is not set +CONFIG_NET_VENDOR_REALTEK=y +# CONFIG_8139CP is not set +CONFIG_8139TOO=y +CONFIG_8139TOO_PIO=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +# CONFIG_R8169 is not set +CONFIG_NET_VENDOR_RENESAS=y +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_NET_VENDOR_SAMSUNG=y +# CONFIG_SXGBE_ETH is not set +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SOLARFLARE=y +# CONFIG_SFC is not set +# CONFIG_SFC_FALCON is not set +CONFIG_NET_VENDOR_SILAN=y +# CONFIG_SC92031 is not set +CONFIG_NET_VENDOR_SIS=y +# CONFIG_SIS900 is not set +# CONFIG_SIS190 is not set +CONFIG_NET_VENDOR_SMSC=y +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SMSC911X is not set +# CONFIG_SMSC9420 is not set +CONFIG_NET_VENDOR_SOCIONEXT=y +CONFIG_NET_VENDOR_STMICRO=y +# CONFIG_STMMAC_ETH is not set +CONFIG_NET_VENDOR_SUN=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NIU is not set +CONFIG_NET_VENDOR_SYNOPSYS=y +# CONFIG_DWC_XLGMAC is not set +CONFIG_NET_VENDOR_TEHUTI=y +# CONFIG_TEHUTI is not set +CONFIG_NET_VENDOR_TI=y +# CONFIG_TI_CPSW_PHY_SEL is not set +# CONFIG_TLAN is not set +CONFIG_NET_VENDOR_VIA=y +# CONFIG_VIA_RHINE is not set +# CONFIG_VIA_VELOCITY is not set +CONFIG_NET_VENDOR_WIZNET=y +# CONFIG_WIZNET_W5100 is not set +# CONFIG_WIZNET_W5300 is not set +CONFIG_NET_VENDOR_XILINX=y +# CONFIG_XILINX_AXI_EMAC is not set +# CONFIG_XILINX_LL_TEMAC is not set +CONFIG_NET_VENDOR_XIRCOM=y +# CONFIG_PCMCIA_XIRC2PS is not set +CONFIG_FDDI=y +# CONFIG_DEFXX is not set +# CONFIG_SKFP is not set +# CONFIG_HIPPI is not set +# CONFIG_NET_SB1000 is not set +CONFIG_PHYLIB=y +# CONFIG_LED_TRIGGER_PHY is not set +# CONFIG_FIXED_PHY is not set + +# +# MII PHY device drivers +# +# CONFIG_AMD_PHY is not set +# CONFIG_ADIN_PHY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_AX88796B_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM54140_PHY is not set +# CONFIG_BCM7XXX_PHY is not set +# CONFIG_BCM84881_PHY is not set +# CONFIG_BCM87XX_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_CORTINA_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_INTEL_XWAY_PHY is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_MICROCHIP_PHY is not set +# CONFIG_MICROCHIP_T1_PHY is not set +# CONFIG_MICROSEMI_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_NXP_TJA11XX_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_RENESAS_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_TERANETICS_PHY is not set +# CONFIG_DP83822_PHY is not set +# CONFIG_DP83TC811_PHY is not set +# CONFIG_DP83848_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_DP83869_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_XILINX_GMII2RGMII is not set +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVRES=y +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_BCM_UNIMAC is not set +# CONFIG_MDIO_MSCC_MIIM is not set +# CONFIG_MDIO_THUNDER is not set + +# +# MDIO Multiplexers +# + +# +# PCS device drivers +# +# CONFIG_PCS_XPCS is not set +# end of PCS device drivers + +# CONFIG_PPP is not set +# CONFIG_SLIP is not set + +# +# Host-side USB support is needed for USB Network Adapter support +# +CONFIG_WLAN=y +CONFIG_WLAN_VENDOR_ADMTEK=y +# CONFIG_ADM8211 is not set +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +# CONFIG_ATH5K is not set +# CONFIG_ATH5K_PCI is not set +# CONFIG_ATH9K is not set +# CONFIG_ATH6KL is not set +# CONFIG_WIL6210 is not set +# CONFIG_ATH10K is not set +# CONFIG_WCN36XX is not set +CONFIG_WLAN_VENDOR_ATMEL=y +# CONFIG_ATMEL is not set +CONFIG_WLAN_VENDOR_BROADCOM=y +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_BRCMSMAC is not set +# CONFIG_BRCMFMAC is not set +CONFIG_WLAN_VENDOR_CISCO=y +# CONFIG_AIRO is not set +# CONFIG_AIRO_CS is not set +CONFIG_WLAN_VENDOR_INTEL=y +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_IWL4965 is not set +# CONFIG_IWL3945 is not set +# CONFIG_IWLWIFI is not set +CONFIG_WLAN_VENDOR_INTERSIL=y +# CONFIG_HOSTAP is not set +# CONFIG_HERMES is not set +# CONFIG_P54_COMMON is not set +# CONFIG_PRISM54 is not set +CONFIG_WLAN_VENDOR_MARVELL=y +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_MWIFIEX is not set +# CONFIG_MWL8K is not set +CONFIG_WLAN_VENDOR_MEDIATEK=y +# CONFIG_MT76x0E is not set +# CONFIG_MT76x2E is not set +# CONFIG_MT7603E is not set +# CONFIG_MT7615E is not set +# CONFIG_MT7915E is not set +CONFIG_WLAN_VENDOR_MICROCHIP=y +CONFIG_WLAN_VENDOR_RALINK=y +# CONFIG_RT2X00 is not set +CONFIG_WLAN_VENDOR_REALTEK=y +# CONFIG_RTL8180 is not set +CONFIG_RTL_CARDS=y +# CONFIG_RTL8192CE is not set +# CONFIG_RTL8192SE is not set +# CONFIG_RTL8192DE is not set +# CONFIG_RTL8723AE is not set +# CONFIG_RTL8723BE is not set +# CONFIG_RTL8188EE is not set +# CONFIG_RTL8192EE is not set +# CONFIG_RTL8821AE is not set +# CONFIG_RTW88 is not set +CONFIG_WLAN_VENDOR_RSI=y +# CONFIG_RSI_91X is not set +CONFIG_WLAN_VENDOR_ST=y +# CONFIG_CW1200 is not set +CONFIG_WLAN_VENDOR_TI=y +# CONFIG_WL1251 is not set +# CONFIG_WL12XX is not set +# CONFIG_WL18XX is not set +# CONFIG_WLCORE is not set +CONFIG_WLAN_VENDOR_ZYDAS=y +CONFIG_WLAN_VENDOR_QUANTENNA=y +# CONFIG_QTNFMAC_PCIE is not set +# CONFIG_PCMCIA_RAYCS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_VIRT_WIFI is not set +# CONFIG_WAN is not set +# CONFIG_VMXNET3 is not set +# CONFIG_FUJITSU_ES is not set +# CONFIG_NETDEVSIM is not set +CONFIG_NET_FAILOVER=y +# CONFIG_ISDN is not set +# CONFIG_NVM is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_SPARSEKMAP=y +# CONFIG_INPUT_MATRIXKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1050 is not set +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_DLINK_DIR685 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_SAMSUNG is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +# CONFIG_MOUSE_PS2_VMMOUSE is not set +CONFIG_MOUSE_PS2_SMBUS=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set +# CONFIG_MOUSE_ELAN_I2C is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +# CONFIG_MOUSE_SYNAPTICS_USB is not set +CONFIG_INPUT_JOYSTICK=y +# CONFIG_JOYSTICK_ANALOG is not set +# CONFIG_JOYSTICK_A3D is not set +# CONFIG_JOYSTICK_ADI is not set +# CONFIG_JOYSTICK_COBRA is not set +# CONFIG_JOYSTICK_GF2K is not set +# CONFIG_JOYSTICK_GRIP is not set +# CONFIG_JOYSTICK_GRIP_MP is not set +# CONFIG_JOYSTICK_GUILLEMOT is not set +# CONFIG_JOYSTICK_INTERACT is not set +# CONFIG_JOYSTICK_SIDEWINDER is not set +# CONFIG_JOYSTICK_TMDC is not set +# CONFIG_JOYSTICK_IFORCE is not set +# CONFIG_JOYSTICK_WARRIOR is not set +# CONFIG_JOYSTICK_MAGELLAN is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_STINGER is not set +# CONFIG_JOYSTICK_TWIDJOY is not set +# CONFIG_JOYSTICK_ZHENHUA is not set +# CONFIG_JOYSTICK_AS5011 is not set +# CONFIG_JOYSTICK_JOYDUMP is not set +# CONFIG_JOYSTICK_XPAD is not set +# CONFIG_JOYSTICK_PXRC is not set +# CONFIG_JOYSTICK_FSIA6B is not set +CONFIG_INPUT_TABLET=y +# CONFIG_TABLET_USB_ACECAD is not set +# CONFIG_TABLET_USB_AIPTEK is not set +# CONFIG_TABLET_USB_HANWANG is not set +# CONFIG_TABLET_USB_KBTAB is not set +# CONFIG_TABLET_USB_PEGASUS is not set +# CONFIG_TABLET_SERIAL_WACOM4 is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_BU21029 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set +# CONFIG_TOUCHSCREEN_CY8CTMA140 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set +# CONFIG_TOUCHSCREEN_EXC3000 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_S6SY761 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_EKTF2127 is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2004 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_SILEAD is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_STMFTS is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZET6223 is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +# CONFIG_TOUCHSCREEN_IQS5XX is not set +# CONFIG_TOUCHSCREEN_ZINITIX is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +# CONFIG_INPUT_PCSPKR is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_APANEL is not set +# CONFIG_INPUT_ATLAS_BTNS is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_DA7280_HAPTICS is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_CMA3000 is not set +# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set +# CONFIG_RMI4_CORE is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set +# CONFIG_USERIO is not set +# CONFIG_GAMEPORT is not set +# end of Hardware I/O ports +# end of Input device support + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_LDISC_AUTOLOAD=y + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +CONFIG_SERIAL_8250_PNP=y +# CONFIG_SERIAL_8250_16550A_VARIANTS is not set +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_EXAR=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DWLIB=y +# CONFIG_SERIAL_8250_DW is not set +# CONFIG_SERIAL_8250_RT288X is not set +CONFIG_SERIAL_8250_LPSS=y +CONFIG_SERIAL_8250_MID=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_LANTIQ is not set +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_ARC is not set +# CONFIG_SERIAL_RP2 is not set +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set +# CONFIG_SERIAL_SPRD is not set +# end of Serial drivers + +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_SYNCLINK_GT is not set +# CONFIG_ISI is not set +# CONFIG_N_HDLC is not set +# CONFIG_N_GSM is not set +# CONFIG_NOZOMI is not set +# CONFIG_NULL_TTY is not set +# CONFIG_TRACE_SINK is not set +# CONFIG_SERIAL_DEV_BUS is not set +# CONFIG_VIRTIO_CONSOLE is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM_INTEL is not set +# CONFIG_HW_RANDOM_AMD is not set +# CONFIG_HW_RANDOM_BA431 is not set +CONFIG_HW_RANDOM_VIA=y +# CONFIG_HW_RANDOM_VIRTIO is not set +# CONFIG_HW_RANDOM_XIPHERA is not set +# CONFIG_APPLICOM is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_SCR24X is not set +# CONFIG_IPWIRELESS is not set +# end of PCMCIA character devices + +# CONFIG_MWAVE is not set +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set +CONFIG_NVRAM=y +# CONFIG_RAW_DRIVER is not set +CONFIG_DEVPORT=y +CONFIG_HPET=y +# CONFIG_HPET_MMAP is not set +# CONFIG_HANGCHECK_TIMER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set +# CONFIG_XILLYBUS is not set +# end of Character devices + +# CONFIG_RANDOM_TRUST_CPU is not set +# CONFIG_RANDOM_TRUST_BOOTLOADER is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_ACPI_I2C_OPREGION=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=y +CONFIG_I2C_ALGOBIT=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_AMD_MP2 is not set +CONFIG_I2C_I801=y +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_ISMT is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_NVIDIA_GPU is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# ACPI drivers +# +# CONFIG_I2C_SCMI is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_TAOS_EVM is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_MLXCPLD is not set +# end of I2C Hardware Bus support + +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +# CONFIG_I3C is not set +# CONFIG_SPI is not set +# CONFIG_SPMI is not set +# CONFIG_HSI is not set +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_KVM=y +# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set +# CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_VMW is not set +# CONFIG_PTP_1588_CLOCK_OCP is not set +# end of PTP clock support + +# CONFIG_PINCTRL is not set +# CONFIG_GPIOLIB is not set +# CONFIG_W1 is not set +# CONFIG_POWER_RESET is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_HWMON=y +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_CHARGER_ADP5061 is not set +# CONFIG_BATTERY_CW2015 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_CHARGER_SBS is not set +# CONFIG_BATTERY_BQ27XXX is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_CHARGER_BD99954 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ABITUGURU3 is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM1177 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7410 is not set +# CONFIG_SENSORS_ADT7411 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AS370 is not set +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_AXI_FAN_CONTROL is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_K10TEMP is not set +# CONFIG_SENSORS_FAM15H_POWER is not set +# CONFIG_SENSORS_AMD_ENERGY is not set +# CONFIG_SENSORS_APPLESMC is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ASPEED is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_CORSAIR_CPRO is not set +# CONFIG_SENSORS_CORSAIR_PSU is not set +# CONFIG_SENSORS_DRIVETEMP is not set +# CONFIG_SENSORS_DS620 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_DELL_SMM is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_FSCHMD is not set +# CONFIG_SENSORS_FTSTEUTATES is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_G762 is not set +# CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_I5500 is not set +# CONFIG_SENSORS_CORETEMP is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_POWR1220 is not set +# CONFIG_SENSORS_LINEAGE is not set +# CONFIG_SENSORS_LTC2945 is not set +# CONFIG_SENSORS_LTC2947_I2C is not set +# CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC4151 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4222 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LTC4260 is not set +# CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_MAX127 is not set +# CONFIG_SENSORS_MAX16065 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX1668 is not set +# CONFIG_SENSORS_MAX197 is not set +# CONFIG_SENSORS_MAX31730 is not set +# CONFIG_SENSORS_MAX6621 is not set +# CONFIG_SENSORS_MAX6639 is not set +# CONFIG_SENSORS_MAX6642 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MAX31790 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_TC654 is not set +# CONFIG_SENSORS_MR75203 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LM95234 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_LM95245 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_NTC_THERMISTOR is not set +# CONFIG_SENSORS_NCT6683 is not set +# CONFIG_SENSORS_NCT6775 is not set +# CONFIG_SENSORS_NCT7802 is not set +# CONFIG_SENSORS_NCT7904 is not set +# CONFIG_SENSORS_NPCM7XX is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_SBTSI is not set +# CONFIG_SENSORS_SHT21 is not set +# CONFIG_SENSORS_SHT3x is not set +# CONFIG_SENSORS_SHTC1 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_EMC6W201 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SCH5627 is not set +# CONFIG_SENSORS_SCH5636 is not set +# CONFIG_SENSORS_STTS751 is not set +# CONFIG_SENSORS_SMM665 is not set +# CONFIG_SENSORS_ADC128D818 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_INA209 is not set +# CONFIG_SENSORS_INA2XX is not set +# CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_TC74 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set +# CONFIG_SENSORS_TMP103 is not set +# CONFIG_SENSORS_TMP108 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_TMP513 is not set +# CONFIG_SENSORS_VIA_CPUTEMP is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83773G is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_XGENE is not set + +# +# ACPI drivers +# +# CONFIG_SENSORS_ACPI_POWER is not set +# CONFIG_SENSORS_ATK0110 is not set +CONFIG_THERMAL=y +# CONFIG_THERMAL_NETLINK is not set +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_GOV_FAIR_SHARE is not set +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_BANG_BANG is not set +CONFIG_THERMAL_GOV_USER_SPACE=y +# CONFIG_THERMAL_EMULATION is not set + +# +# Intel thermal drivers +# +# CONFIG_INTEL_POWERCLAMP is not set +CONFIG_X86_PKG_TEMP_THERMAL=m +# CONFIG_INTEL_SOC_DTS_THERMAL is not set + +# +# ACPI INT340X thermal drivers +# +# CONFIG_INT340X_THERMAL is not set +# end of ACPI INT340X thermal drivers + +# CONFIG_INTEL_PCH_THERMAL is not set +# end of Intel thermal drivers + +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_CORE is not set +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_OPEN_TIMEOUT=0 +# CONFIG_WATCHDOG_SYSFS is not set + +# +# Watchdog Pretimeout Governors +# + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_WDAT_WDT is not set +# CONFIG_XILINX_WATCHDOG is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set +# CONFIG_DW_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM1535_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_EBC_C384_WDT is not set +# CONFIG_F71808E_WDT is not set +# CONFIG_SP5100_TCO is not set +# CONFIG_SBC_FITPC2_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_IBMASR is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I6300ESB_WDT is not set +# CONFIG_IE6XX_WDT is not set +# CONFIG_ITCO_WDT is not set +# CONFIG_IT8712F_WDT is not set +# CONFIG_IT87_WDT is not set +# CONFIG_HP_WATCHDOG is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_PC87413_WDT is not set +# CONFIG_NV_TCO is not set +# CONFIG_60XX_WDT is not set +# CONFIG_CPU5_WDT is not set +# CONFIG_SMSC_SCH311X_WDT is not set +# CONFIG_SMSC37B787_WDT is not set +# CONFIG_TQMX86_WDT is not set +# CONFIG_VIA_WDT is not set +# CONFIG_W83627HF_WDT is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_W83977F_WDT is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_SBC_EPX_C3_WATCHDOG is not set +# CONFIG_NI903X_WDT is not set +# CONFIG_NIC7018_WDT is not set + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set +CONFIG_BCMA_POSSIBLE=y +# CONFIG_BCMA is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_AS3711 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_BD9571MWV is not set +# CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_MADERA is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_DA9062 is not set +# CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DA9150 is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_MFD_MP2629 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set +# CONFIG_LPC_ICH is not set +# CONFIG_LPC_SCH is not set +# CONFIG_MFD_INTEL_LPSS_ACPI is not set +# CONFIG_MFD_INTEL_LPSS_PCI is not set +# CONFIG_MFD_INTEL_PMC_BXT is not set +# CONFIG_MFD_INTEL_PMT is not set +# CONFIG_MFD_IQS62X is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77843 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_MT6360 is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SKY81452 is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_TI_LMU is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS80031 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TQMX86 is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# end of Multifunction device drivers + +# CONFIG_REGULATOR is not set +# CONFIG_RC_CORE is not set +# CONFIG_MEDIA_CEC_SUPPORT is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +# CONFIG_AGP_SIS is not set +# CONFIG_AGP_VIA is not set +CONFIG_INTEL_GTT=y +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +# CONFIG_VGA_SWITCHEROO is not set +CONFIG_DRM=y +CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DP_AUX_CHARDEV is not set +# CONFIG_DRM_DEBUG_MM is not set +# CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +# CONFIG_DRM_DP_CEC is not set + +# +# I2C encoder or helper chips +# +# CONFIG_DRM_I2C_CH7006 is not set +# CONFIG_DRM_I2C_SIL164 is not set +# CONFIG_DRM_I2C_NXP_TDA998X is not set +# CONFIG_DRM_I2C_NXP_TDA9950 is not set +# end of I2C encoder or helper chips + +# +# ARM devices +# +# end of ARM devices + +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_AMDGPU is not set +# CONFIG_DRM_NOUVEAU is not set +CONFIG_DRM_I915=y +CONFIG_DRM_I915_FORCE_PROBE="" +CONFIG_DRM_I915_CAPTURE_ERROR=y +CONFIG_DRM_I915_COMPRESS_ERROR=y +CONFIG_DRM_I915_USERPTR=y +# CONFIG_DRM_I915_GVT is not set +CONFIG_DRM_I915_FENCE_TIMEOUT=10000 +CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 +CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 +CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 +CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 +CONFIG_DRM_I915_STOP_TIMEOUT=100 +CONFIG_DRM_I915_TIMESLICE_DURATION=1 +# CONFIG_DRM_VGEM is not set +# CONFIG_DRM_VKMS is not set +# CONFIG_DRM_VMWGFX is not set +# CONFIG_DRM_GMA500 is not set +# CONFIG_DRM_AST is not set +# CONFIG_DRM_MGAG200 is not set +# CONFIG_DRM_QXL is not set +# CONFIG_DRM_BOCHS is not set +# CONFIG_DRM_VIRTIO_GPU is not set +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# end of Display Panels + +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +# CONFIG_DRM_ANALOGIX_ANX78XX is not set +# end of Display Interface Bridges + +# CONFIG_DRM_ETNAVIV is not set +# CONFIG_DRM_CIRRUS_QEMU is not set +# CONFIG_DRM_VBOXVIDEO is not set +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_UVESA is not set +# CONFIG_FB_VESA is not set +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_OPENCORES is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_IBM_GXT4500 is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_SIMPLE is not set +# CONFIG_FB_SM712 is not set +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_APPLE is not set +# CONFIG_BACKLIGHT_QCOM_WLED is not set +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set +# CONFIG_BACKLIGHT_ARCXCNN is not set +# end of Backlight & LCD device support + +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set +# end of Console display driver support + +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# end of Graphics support + +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_SEQ_DEVICE=y +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_SEQUENCER=y +CONFIG_SND_SEQ_DUMMY=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_SEQ_MIDI_EVENT=y +CONFIG_SND_DRIVERS=y +# CONFIG_SND_PCSP is not set +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_ALOOP is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ASIHPI is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LOLA is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SE6X is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set + +# +# HD-Audio +# +CONFIG_SND_HDA=y +CONFIG_SND_HDA_INTEL=y +CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_RECONFIG is not set +# CONFIG_SND_HDA_INPUT_BEEP is not set +# CONFIG_SND_HDA_PATCH_LOADER is not set +# CONFIG_SND_HDA_CODEC_REALTEK is not set +# CONFIG_SND_HDA_CODEC_ANALOG is not set +# CONFIG_SND_HDA_CODEC_SIGMATEL is not set +# CONFIG_SND_HDA_CODEC_VIA is not set +# CONFIG_SND_HDA_CODEC_HDMI is not set +# CONFIG_SND_HDA_CODEC_CIRRUS is not set +# CONFIG_SND_HDA_CODEC_CONEXANT is not set +# CONFIG_SND_HDA_CODEC_CA0110 is not set +# CONFIG_SND_HDA_CODEC_CA0132 is not set +# CONFIG_SND_HDA_CODEC_CMEDIA is not set +# CONFIG_SND_HDA_CODEC_SI3054 is not set +# CONFIG_SND_HDA_GENERIC is not set +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +# end of HD-Audio + +CONFIG_SND_HDA_CORE=y +CONFIG_SND_HDA_COMPONENT=y +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_INTEL_NHLT=y +CONFIG_SND_INTEL_DSP_CONFIG=y +CONFIG_SND_PCMCIA=y +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set +# CONFIG_SND_SOC is not set +CONFIG_SND_X86=y +# CONFIG_HDMI_LPE_AUDIO is not set + +# +# HID support +# +CONFIG_HID=y +# CONFIG_HID_BATTERY_STRENGTH is not set +CONFIG_HIDRAW=y +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +# CONFIG_HID_ACRUX is not set +CONFIG_HID_APPLE=y +# CONFIG_HID_AUREAL is not set +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +# CONFIG_HID_COUGAR is not set +# CONFIG_HID_MACALLY is not set +# CONFIG_HID_PRODIKEYS is not set +# CONFIG_HID_CMEDIA is not set +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EMS_FF is not set +# CONFIG_HID_ELECOM is not set +CONFIG_HID_EZKEY=y +# CONFIG_HID_GEMBIRD is not set +# CONFIG_HID_GFRM is not set +# CONFIG_HID_GLORIOUS is not set +# CONFIG_HID_VIVALDI is not set +# CONFIG_HID_KEYTOUCH is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_WALTOP is not set +# CONFIG_HID_VIEWSONIC is not set +CONFIG_HID_GYRATION=y +# CONFIG_HID_ICADE is not set +CONFIG_HID_ITE=y +# CONFIG_HID_JABRA is not set +# CONFIG_HID_TWINHAN is not set +CONFIG_HID_KENSINGTON=y +# CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LED is not set +# CONFIG_HID_LENOVO is not set +CONFIG_HID_LOGITECH=y +# CONFIG_HID_LOGITECH_HIDPP is not set +CONFIG_LOGITECH_FF=y +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGIG940_FF is not set +CONFIG_LOGIWHEELS_FF=y +# CONFIG_HID_MAGICMOUSE is not set +# CONFIG_HID_MALTRON is not set +# CONFIG_HID_MAYFLASH is not set +CONFIG_HID_REDRAGON=y +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_HID_NTI is not set +# CONFIG_HID_ORTEK is not set +CONFIG_HID_PANTHERLORD=y +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=y +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_PLANTRONICS is not set +# CONFIG_HID_PRIMAX is not set +# CONFIG_HID_SAITEK is not set +CONFIG_HID_SAMSUNG=y +# CONFIG_HID_SPEEDLINK is not set +# CONFIG_HID_STEAM is not set +# CONFIG_HID_STEELSERIES is not set +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_RMI is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TIVO is not set +CONFIG_HID_TOPSEED=y +# CONFIG_HID_THINGM is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_UDRAW_PS3 is not set +# CONFIG_HID_WIIMOTE is not set +# CONFIG_HID_XINMO is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +# CONFIG_HID_SENSOR_HUB is not set +# CONFIG_HID_ALPS is not set +# end of Special HID drivers + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set +# end of I2C HID support + +# +# Intel ISH HID support +# +# CONFIG_INTEL_ISH_HID is not set +# end of Intel ISH HID support + +# +# AMD SFH HID Support +# +# CONFIG_AMD_SFH_HID is not set +# end of AMD SFH HID Support +# end of HID support + +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +# CONFIG_USB_LED_TRIG is not set +# CONFIG_USB_ULPI_BUS is not set +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB is not set +CONFIG_USB_PCI=y + +# +# USB port drivers +# + +# +# USB Physical Layer drivers +# +# CONFIG_NOP_USB_XCEIV is not set +# end of USB Physical Layer drivers + +# CONFIG_USB_GADGET is not set +# CONFIG_TYPEC is not set +# CONFIG_USB_ROLE_SWITCH is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +# CONFIG_LEDS_CLASS_FLASH is not set +# CONFIG_LEDS_CLASS_MULTICOLOR is not set +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +# CONFIG_LEDS_APU is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3532 is not set +# CONFIG_LEDS_LM3642 is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_CLEVO_MAIL is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_INTEL_SS4200 is not set +# CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_TLC591XX is not set +# CONFIG_LEDS_LM355x is not set + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +# CONFIG_LEDS_BLINKM is not set +# CONFIG_LEDS_MLXCPLD is not set +# CONFIG_LEDS_MLXREG is not set +# CONFIG_LEDS_USER is not set +# CONFIG_LEDS_NIC78BX is not set +# CONFIG_LEDS_TI_LMU_COMMON is not set + +# +# Flash and Torch LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +# CONFIG_LEDS_TRIGGER_TIMER is not set +# CONFIG_LEDS_TRIGGER_ONESHOT is not set +# CONFIG_LEDS_TRIGGER_DISK is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_CPU is not set +# CONFIG_LEDS_TRIGGER_ACTIVITY is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set + +# +# iptables trigger is under Netfilter config (LED target) +# +# CONFIG_LEDS_TRIGGER_TRANSIENT is not set +# CONFIG_LEDS_TRIGGER_CAMERA is not set +# CONFIG_LEDS_TRIGGER_PANIC is not set +# CONFIG_LEDS_TRIGGER_NETDEV is not set +# CONFIG_LEDS_TRIGGER_PATTERN is not set +# CONFIG_LEDS_TRIGGER_AUDIO is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=y +# CONFIG_EDAC_AMD64 is not set +# CONFIG_EDAC_E752X is not set +# CONFIG_EDAC_I82975X is not set +# CONFIG_EDAC_I3000 is not set +# CONFIG_EDAC_I3200 is not set +# CONFIG_EDAC_IE31200 is not set +# CONFIG_EDAC_X38 is not set +# CONFIG_EDAC_I5400 is not set +# CONFIG_EDAC_I7CORE is not set +# CONFIG_EDAC_I5000 is not set +# CONFIG_EDAC_I5100 is not set +# CONFIG_EDAC_I7300 is not set +# CONFIG_EDAC_SBRIDGE is not set +# CONFIG_EDAC_SKX is not set +# CONFIG_EDAC_I10NM is not set +# CONFIG_EDAC_PND2 is not set +# CONFIG_EDAC_IGEN6 is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set +CONFIG_RTC_NVMEM=y + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +# CONFIG_RTC_DRV_ABEOZ9 is not set +# CONFIG_RTC_DRV_ABX80X is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8523 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF85363 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_RV3032 is not set +# CONFIG_RTC_DRV_RV8803 is not set +# CONFIG_RTC_DRV_SD3078 is not set + +# +# SPI RTC drivers +# +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_PCF2127 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set +# CONFIG_RTC_DRV_RX6110 is not set + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1685_FAMILY is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_DS2404 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_FTRTC010 is not set + +# +# HID Sensor RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=y +CONFIG_DMA_ACPI=y +# CONFIG_ALTERA_MSGDMA is not set +# CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD is not set +# CONFIG_INTEL_IOATDMA is not set +# CONFIG_PLX_DMA is not set +# CONFIG_XILINX_ZYNQMP_DPDMA is not set +# CONFIG_QCOM_HIDMA_MGMT is not set +# CONFIG_QCOM_HIDMA is not set +CONFIG_DW_DMAC_CORE=y +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set +# CONFIG_DW_EDMA is not set +# CONFIG_DW_EDMA_PCIE is not set +CONFIG_HSU_DMA=y +# CONFIG_SF_PDMA is not set + +# +# DMA Clients +# +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set + +# +# DMABUF options +# +CONFIG_SYNC_FILE=y +# CONFIG_SW_SYNC is not set +# CONFIG_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# end of DMABUF options + +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_VFIO is not set +# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +# CONFIG_VDPA is not set +CONFIG_VHOST_MENU=y +# CONFIG_VHOST_NET is not set +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Microsoft Hyper-V guest support +# +# CONFIG_HYPERV is not set +# end of Microsoft Hyper-V guest support + +# CONFIG_GREYBUS is not set +# CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y +# CONFIG_ACPI_WMI is not set +# CONFIG_ACERHDF is not set +# CONFIG_ACER_WIRELESS is not set +# CONFIG_AMD_PMC is not set +# CONFIG_APPLE_GMUX is not set +# CONFIG_ASUS_LAPTOP is not set +# CONFIG_ASUS_WIRELESS is not set +CONFIG_EEEPC_LAPTOP=y +# CONFIG_DCDBAS is not set +# CONFIG_DELL_SMBIOS is not set +# CONFIG_DELL_RBTN is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DELL_SMO8800 is not set +# CONFIG_AMILO_RFKILL is not set +# CONFIG_FUJITSU_LAPTOP is not set +# CONFIG_FUJITSU_TABLET is not set +# CONFIG_GPD_POCKET_FAN is not set +# CONFIG_HP_ACCEL is not set +# CONFIG_HP_WIRELESS is not set +# CONFIG_IBM_RTL is not set +# CONFIG_IDEAPAD_LAPTOP is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_THINKPAD_ACPI is not set +# CONFIG_INTEL_ATOMISP2_PM is not set +# CONFIG_INTEL_HID_EVENT is not set +# CONFIG_INTEL_MENLOW is not set +# CONFIG_INTEL_OAKTRAIL is not set +# CONFIG_INTEL_VBTN is not set +# CONFIG_MSI_LAPTOP is not set +# CONFIG_SAMSUNG_LAPTOP is not set +# CONFIG_SAMSUNG_Q10 is not set +# CONFIG_TOSHIBA_BT_RFKILL is not set +# CONFIG_TOSHIBA_HAPS is not set +# CONFIG_ACPI_CMPC is not set +# CONFIG_COMPAL_LAPTOP is not set +# CONFIG_PANASONIC_LAPTOP is not set +# CONFIG_SONY_LAPTOP is not set +# CONFIG_SYSTEM76_ACPI is not set +# CONFIG_TOPSTAR_LAPTOP is not set +# CONFIG_I2C_MULTI_INSTANTIATE is not set +# CONFIG_MLX_PLATFORM is not set +# CONFIG_INTEL_IPS is not set +# CONFIG_INTEL_RST is not set +# CONFIG_INTEL_SMARTCONNECT is not set + +# +# Intel Speed Select Technology interface support +# +# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set +# end of Intel Speed Select Technology interface support + +# CONFIG_INTEL_TURBO_MAX_3 is not set +# CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set +# CONFIG_INTEL_PMC_CORE is not set +# CONFIG_INTEL_PMT_CLASS is not set +# CONFIG_INTEL_PMT_TELEMETRY is not set +# CONFIG_INTEL_PMT_CRASHLOG is not set +# CONFIG_INTEL_PUNIT_IPC is not set +# CONFIG_INTEL_SCU_PCI is not set +# CONFIG_INTEL_SCU_PLATFORM is not set +CONFIG_PMC_ATOM=y +# CONFIG_CHROME_PLATFORMS is not set +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_3_POWER_OPREGION is not set +# CONFIG_SURFACE_GPE is not set +# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_HAVE_CLK=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y +# CONFIG_COMMON_CLK_MAX9485 is not set +# CONFIG_COMMON_CLK_SI5341 is not set +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI544 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# end of Clock Source drivers + +CONFIG_MAILBOX=y +CONFIG_PCC=y +# CONFIG_ALTERA_MBOX is not set +CONFIG_IOMMU_IOVA=y +CONFIG_IOASID=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# end of Generic IOMMU Pagetable Support + +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_DMA=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_V2 is not set +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_SVM is not set +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set +# CONFIG_IRQ_REMAP is not set + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set +# CONFIG_RPMSG_VIRTIO is not set +# end of Rpmsg drivers + +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# end of NXP/Freescale QorIQ SoC drivers + +# +# i.MX SoC drivers +# +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# end of Enable LiteX SoC Builder specific drivers + +# +# Qualcomm SoC drivers +# +# end of Qualcomm SoC drivers + +# CONFIG_SOC_TI is not set + +# +# Xilinx SoC drivers +# +# CONFIG_XILINX_VCU is not set +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +# CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set + +# +# IRQ chip support +# +# end of IRQ chip support + +# CONFIG_IPACK_BUS is not set +# CONFIG_RESET_CONTROLLER is not set + +# +# PHY Subsystem +# +# CONFIG_GENERIC_PHY is not set +# CONFIG_USB_LGM_PHY is not set +# CONFIG_BCM_KONA_USB2_PHY is not set +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_INTEL_LGM_EMMC is not set +# end of PHY Subsystem + +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set + +# +# Performance monitor support +# +# end of Performance monitor support + +CONFIG_RAS=y +# CONFIG_USB4 is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# end of Android + +# CONFIG_LIBNVDIMM is not set +# CONFIG_DAX is not set +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# end of HW tracing support + +# CONFIG_FPGA is not set +# CONFIG_TEE is not set +# CONFIG_UNISYS_VISORBUS is not set +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +# CONFIG_INTERCONNECT is not set +# CONFIG_COUNTER is not set +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_VALIDATE_FS_PARSER is not set +CONFIG_FS_IOMAP=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_F2FS_FS is not set +# CONFIG_FS_DAX is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +# CONFIG_EXPORTFS_BLOCK_OPS is not set +CONFIG_FILE_LOCKING=y +CONFIG_MANDATORY_FILE_LOCKING=y +# CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_FANOTIFY is not set +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_AUTOFS_FS=y +# CONFIG_FUSE_FS is not set +CONFIG_OVERLAY_FS=y +CONFIG_OVERLAY_FS_REDIRECT_DIR=y +CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +# CONFIG_OVERLAY_FS_METACOPY is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +# CONFIG_UDF_FS is not set +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +# CONFIG_EXFAT_FS is not set +# CONFIG_NTFS_FS is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_CHILDREN is not set +CONFIG_PROC_PID_ARCH_STATUS=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +# CONFIG_TMPFS_INODE64 is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_MEMFD_CREATE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +# CONFIG_CONFIGFS_FS is not set +CONFIG_EFIVAR_FS=m +# end of Pseudo filesystems + +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_PSTORE is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_EROFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V2=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +# CONFIG_NFS_SWAP is not set +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DISABLE_UDP_SUPPORT=y +# CONFIG_NFSD is not set +CONFIG_GRACE_PERIOD=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +# CONFIG_SUNRPC_DEBUG is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y +# CONFIG_UNICODE is not set +CONFIG_IO_WQ=y +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_REQUEST_CACHE is not set +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITY_WRITABLE_HOOKS=y +# CONFIG_SECURITYFS is not set +CONFIG_SECURITY_NETWORK=y +CONFIG_PAGE_TABLE_ISOLATION=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +# CONFIG_SECURITY_PATH is not set +# CONFIG_INTEL_TXT is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +# CONFIG_HARDENED_USERCOPY is not set +# CONFIG_FORTIFY_SOURCE is not set +# CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 +CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 +CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_LOADPIN is not set +# CONFIG_SECURITY_YAMA is not set +# CONFIG_SECURITY_SAFESETID is not set +# CONFIG_SECURITY_LOCKDOWN_LSM is not set +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set +# CONFIG_EVM is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor,bpf" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +# end of Memory initialization +# end of Kernel hardening options +# end of Security options + +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_USER is not set +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +# CONFIG_CRYPTO_PCRYPT is not set +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=y +# CONFIG_CRYPTO_TEST is not set +CONFIG_CRYPTO_ENGINE=y + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_DH is not set +# CONFIG_CRYPTO_ECDH is not set +# CONFIG_CRYPTO_ECRDSA is not set +# CONFIG_CRYPTO_SM2 is not set +# CONFIG_CRYPTO_CURVE25519 is not set +# CONFIG_CRYPTO_CURVE25519_X86 is not set + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +# CONFIG_CRYPTO_AEGIS128 is not set +# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=y + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CFB is not set +CONFIG_CRYPTO_CTR=y +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_OFB is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_KEYWRAP is not set +# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set +# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set +# CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_ESSIV is not set + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_CRC32 is not set +# CONFIG_CRYPTO_CRC32_PCLMUL is not set +# CONFIG_CRYPTO_XXHASH is not set +# CONFIG_CRYPTO_BLAKE2B is not set +# CONFIG_CRYPTO_BLAKE2S is not set +# CONFIG_CRYPTO_BLAKE2S_X86 is not set +# CONFIG_CRYPTO_CRCT10DIF is not set +CONFIG_CRYPTO_GHASH=y +# CONFIG_CRYPTO_POLY1305 is not set +# CONFIG_CRYPTO_POLY1305_X86_64 is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA1_SSSE3 is not set +# CONFIG_CRYPTO_SHA256_SSSE3 is not set +# CONFIG_CRYPTO_SHA512_SSSE3 is not set +CONFIG_CRYPTO_SHA256=y +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_SHA3 is not set +# CONFIG_CRYPTO_SM3 is not set +# CONFIG_CRYPTO_STREEBOG is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_TI is not set +# CONFIG_CRYPTO_AES_NI_INTEL is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_CHACHA20 is not set +# CONFIG_CRYPTO_CHACHA20_X86_64 is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set +# CONFIG_CRYPTO_SM4 is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_TWOFISH_X86_64 is not set +# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set +# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_842 is not set +# CONFIG_CRYPTO_LZ4 is not set +# CONFIG_CRYPTO_LZ4HC is not set +# CONFIG_CRYPTO_ZSTD is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_JITTERENTROPY=y +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +# CONFIG_CRYPTO_USER_API_RNG is not set +# CONFIG_CRYPTO_USER_API_AEAD is not set +CONFIG_CRYPTO_HASH_INFO=y + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=y +# CONFIG_CRYPTO_LIB_BLAKE2S is not set +# CONFIG_CRYPTO_LIB_CHACHA is not set +# CONFIG_CRYPTO_LIB_CURVE25519 is not set +CONFIG_CRYPTO_LIB_DES=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 +# CONFIG_CRYPTO_LIB_POLY1305 is not set +# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_PADLOCK is not set +# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +# CONFIG_CRYPTO_DEV_CCP is not set +# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set +# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set +# CONFIG_CRYPTO_DEV_QAT_C62X is not set +# CONFIG_CRYPTO_DEV_QAT_4XXX is not set +# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set +# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set +# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set +# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set +CONFIG_CRYPTO_DEV_VIRTIO=y +# CONFIG_CRYPTO_DEV_SAFEXCEL is not set +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +# end of Certificates for signature checking + +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +# CONFIG_PACKING is not set +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +# CONFIG_CORDIC is not set +# CONFIG_PRIME_NUMBERS is not set +CONFIG_RATIONAL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_USE_SYM_ANNOTATIONS=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC64 is not set +# CONFIG_CRC4 is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +# CONFIG_CRC8 is not set +CONFIG_XXHASH=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_DECOMPRESS_ZSTD=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_INTERVAL_TREE=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_SWIOTLB=y +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +CONFIG_SGL_ALLOC=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_CLZ_TAB=y +# CONFIG_IRQ_POLL is not set +CONFIG_MPILIB=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_TIME_NS=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_ARCH_HAS_COPY_MC=y +CONFIG_ARCH_STACKWALK=y +CONFIG_SBITMAP=y +# CONFIG_STRING_SELFTEST is not set +# end of Library routines + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DYNAMIC_DEBUG_CORE is not set +CONFIG_SYMBOLIC_ERRNAME=y +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set +CONFIG_FRAME_WARN=2048 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_STACK_VALIDATION=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KCSAN=y +# end of Generic Kernel Debugging Instruments + +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_OWNER is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_ARCH_HAS_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set +CONFIG_GENERIC_PTDUMP=y +# CONFIG_PTDUMP_DEBUGFS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_STACK_USAGE=y +# CONFIG_SCHED_STACK_END_CHECK is not set +CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VM_PGTABLE is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y +# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +# CONFIG_SOFTLOCKUP_DETECTOR is not set +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y +# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +# CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# end of Scheduler Debugging + +# CONFIG_DEBUG_TIMEKEEPING is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_WW_MUTEX_SELFTEST is not set +# CONFIG_SCF_TORTURE_TEST is not set +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set + +# +# Debug kernel data structures +# +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PLIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Debug kernel data structures + +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +# CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_BOOTTIME_TRACING is not set +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_HWLAT_TRACER is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_TRACER_SNAPSHOT is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +CONFIG_UPROBE_EVENTS=y +CONFIG_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +# CONFIG_SYNTH_EVENTS is not set +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACE_EVENT_INJECT is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +CONFIG_PROVIDE_OHCI1394_DMA_INIT=y +# CONFIG_SAMPLES is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +# CONFIG_STRICT_DEVMEM is not set + +# +# x86 Debugging +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y +CONFIG_EARLY_PRINTK_USB=y +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +CONFIG_EARLY_PRINTK_DBGP=y +# CONFIG_EARLY_PRINTK_USB_XDBC is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_TLBFLUSH is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEBUG_BOOT_PARAMS=y +# CONFIG_CPA_DEBUG is not set +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +CONFIG_X86_DEBUG_FPU=y +# CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_UNWINDER_ORC=y +# CONFIG_UNWINDER_FRAME_POINTER is not set +# end of x86 Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_FAULT_INJECTION is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_MIN_HEAP is not set +# CONFIG_TEST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_REED_SOLOMON_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_STRING_HELPERS is not set +# CONFIG_TEST_STRSCPY is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set +# CONFIG_TEST_UUID is not set +# CONFIG_TEST_XARRAY is not set +# CONFIG_TEST_OVERFLOW is not set +# CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_HASH is not set +# CONFIG_TEST_IDA is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_BITOPS is not set +# CONFIG_TEST_VMALLOC is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_BLACKHOLE_DEV is not set +# CONFIG_FIND_BIT_BENCHMARK is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_SYSCTL is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_TEST_KMOD is not set +# CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_STACKINIT is not set +# CONFIG_TEST_MEMINIT is not set +# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_TEST_FPU is not set +# CONFIG_MEMTEST is not set +# end of Kernel Testing and Coverage +# end of Kernel hacking diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg new file mode 100644 index 0000000..0288d60 --- /dev/null +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -0,0 +1,59 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log gsmtap 172.18.3.202 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 172.18.3.201 + apn internet + gtpu-mode kernel-gtp + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.222.0/24 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.222.0/24 + no shutdown +# apn inet6 +# apn inet46 + default-apn internet + no shutdown ggsn -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:44:51 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:44:51 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 1: Verified-1 I'd like to merge this myself, after doing some more testing. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 19 Feb 2021 18:44:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:45:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:45:40 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... ttcn3-ggsn-test: add kernel test Make it possible to run ttcn3-ggsn-test against osmo-ggsn with the GTP kernel module. This feature is enabled by environment variables explained in ttcn3-ggsn-test/jenkins.sh, and can either use the pre-built kernel from Debian, or build a kernel from source. The kernel runs inside QEMU inside the usual osmo-ggsn-master docker image. Thanks to Pau for providing the kernel config and kernel-test scripts that this patch is based on! I ended up modifying them quite a bit to fit the docker use case, and to build the initrd (so we can use the stock debian kernel). Related: OS#3208 Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d --- M .gitignore M jenkins-common.sh M osmo-ggsn-latest/Dockerfile M osmo-ggsn-master/Dockerfile A scripts/kernel-test/initrd-build.sh A scripts/kernel-test/initrd-init.sh A scripts/kernel-test/kernel-build.sh A scripts/kernel-test/prepare.sh A scripts/kernel-test/qemu-ifdown.sh A scripts/kernel-test/qemu-ifup.sh A scripts/kernel-test/run-qemu.sh A ttcn3-ggsn-test/initrd-ggsn.sh M ttcn3-ggsn-test/jenkins.sh A ttcn3-ggsn-test/kernel-config A ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 15 files changed, 5,267 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/23005/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:46:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:46:31 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I54e752048eed2a170a1cf4e0fd410de255b9de5d Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/23006/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f6d1bf4..782047f 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -21,6 +21,12 @@ - ttcn3-ggsn-test: blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * + - ttcn3-ggsn-test-kernel: + blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" + timer: 10 04 * * * + - ttcn3-ggsn-test-kernel-net-next: + blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" + timer: 20 04 * * * - ttcn3-msc-test: blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * @@ -212,6 +218,20 @@ builders: - shell: |- export REGISTRY_HOST="registry.osmocom.org" + + case "{job-name}" in + ttcn3-ggsn-test-kernel) + # Run against debian's kernel + export KERNEL_TEST=1 + ;; + ttcn3-ggsn-test-kernel-net-next) + # Build net-next kernel from source, default git repo from: + # docker-playground.git scripts/kernel-test/kernel-build.sh + export KERNEL_TEST=1 + export KERNEL_BUILD=1 + ;; + esac + case "{job-name}" in TTCN3-centos-*-latest) cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:46:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:46:56 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 1: Verified-1 -1 to remember the dependency -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 19 Feb 2021 18:46:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:47:52 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:47:52 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I54e752048eed2a170a1cf4e0fd410de255b9de5d Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/23006/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 18:48:06 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 19 Feb 2021 18:48:06 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 2: Verified-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 19 Feb 2021 18:48:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 19:24:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 19 Feb 2021 19:24:11 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Feb 2021 19:24:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:32:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:32:31 +0000 Subject: Change in osmo-ggsn[master]: .gitignore: ignore debian/libgtp* In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22999 ) Change subject: .gitignore: ignore debian/libgtp* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I41fa611917defeab13f01a59dcc3f95961f10bda Gerrit-Change-Number: 22999 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:32:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:32:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:32:44 +0000 Subject: Change in osmo-ggsn[master]: deb/rpm: build with --enable-gtp-linux In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 ) Change subject: deb/rpm: build with --enable-gtp-linux ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic001ec6c5ec9887706a5b27f2a48cd61942ab4ee Gerrit-Change-Number: 23000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:32:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:32:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:32:48 +0000 Subject: Change in osmo-ggsn[master]: .gitignore: ignore debian/libgtp* In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/22999 ) Change subject: .gitignore: ignore debian/libgtp* ...................................................................... .gitignore: ignore debian/libgtp* Change-Id: I41fa611917defeab13f01a59dcc3f95961f10bda --- M .gitignore 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index cb27dff..80e4837 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ # debian debian/osmo-ggsn/ debian/*.debhelper -debian/libgtp1 +debian/libgtp*/ debian/osmo-ggsn-dbg debian/*.log debian/autoreconf.* -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/22999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I41fa611917defeab13f01a59dcc3f95961f10bda Gerrit-Change-Number: 22999 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:32:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:32:48 +0000 Subject: Change in osmo-ggsn[master]: deb/rpm: build with --enable-gtp-linux In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 ) Change subject: deb/rpm: build with --enable-gtp-linux ...................................................................... deb/rpm: build with --enable-gtp-linux Allow optional use of the GTP kernel module. Related: OS#3208 Change-Id: Ic001ec6c5ec9887706a5b27f2a48cd61942ab4ee --- M contrib/osmo-ggsn.spec.in M debian/control M debian/rules 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index 4e8b11e..83a1ca7 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -34,6 +34,7 @@ BuildRequires: pkgconfig(libosmocore) >= 1.1.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 BuildRequires: pkgconfig(libosmovty) >= 1.1.0 +BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 Obsoletes: openggsn %{?systemd_requires} @@ -69,6 +70,7 @@ echo "%{version}" >.tarball-version autoreconf -fi %configure \ + --enable-gtp-linux \ --disable-static \ --docdir="%{_docdir}/%{name}" \ --with-systemdsystemunitdir=%{_unitdir} \ diff --git a/debian/control b/debian/control index 0822773..1fd1937 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,8 @@ libdpkg-perl, git, dh-autoreconf, libosmocore-dev (>= 1.4.0), - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev, + libgtpnl-dev (>= 1.2.0) Standards-Version: 3.9.6 Vcs-Browser: http://git.osmocom.org/osmo-ggsn/ Vcs-Git: git://git.osmocom.org/osmo-ggsn diff --git a/debian/rules b/debian/rules index c5c7708..c11700c 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,10 @@ dh_strip -plibgtp6 --dbg-package=libgtp-dbg override_dh_auto_configure: - dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals + dh_auto_configure -- \ + --enable-gtp-linux \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --enable-manuals # Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) override_dh_compress: -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic001ec6c5ec9887706a5b27f2a48cd61942ab4ee Gerrit-Change-Number: 23000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:35:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:35:17 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/23001/1/nplab-m3ua-test/jenkins.sh File nplab-m3ua-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23001/1/nplab-m3ua-test/jenkins.sh at a38 PS1, Line 38: doc where does this command disappear to? I can see the network_remove and collect_logs being present in clean_up_common, but not any container stop commands? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:35:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:35:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:35:32 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 ) Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:35:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:35:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:35:53 +0000 Subject: Change in docker-playground[master]: jenkins-common: put fix_perms() in clean_up_common In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23003 ) Change subject: jenkins-common: put fix_perms() in clean_up_common ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 Gerrit-Change-Number: 23003 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:35:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:36:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:36:05 +0000 Subject: Change in docker-playground[master]: osmo-ggsn-master: add configure --enable-gtp-linux In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23004 ) Change subject: osmo-ggsn-master: add configure --enable-gtp-linux ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 Gerrit-Change-Number: 23004 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:36:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 19 22:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 19 Feb 2021 22:44:29 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/23005/2/ttcn3-ggsn-test/kernel-config File ttcn3-ggsn-test/kernel-config: https://gerrit.osmocom.org/c/docker-playground/+/23005/2/ttcn3-ggsn-test/kernel-config at 5 PS2, Line 5: CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" it might be best to only store those few things we need to enable compared to a defconfig. I think kconfig-diff could be used to generate that. so you could do a 'make defconfig' and then compare the result of that with kconfig-diff in order to obtain which incremental changes are needed. you can then do "make defconfig my-config-fragment.config" during the build process. The point is to not store whatever was the default in 5.11.0-rc6, but to rely on any kernel to know what is a reasonable default, and only apply the changes needed. It might also be an idea to start from 'tinyconfig'. The principle remains the same: don't store the full config but just the diff. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 19 Feb 2021 22:44:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Feb 20 01:44:21 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 01:44:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <60306980699e2_6c892abbc860c5f828956c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 62s] | ~~~~~~~~~~~~~~~~~ [ 62s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o netns.o netns.c [ 62s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o util.o util.c [ 62s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o icmpv6.o icmpv6.c [ 62s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o checksum.o checksum.c [ 62s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -fomit-frame-pointer -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 62s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 62s] 21 | #include [ 62s] | ^~~~~~~~~~~~~~~~~ [ 62s] compilation terminated. [ 62s] make[2]: *** [Makefile:412: gtp-kernel.o] Error 1 [ 62s] make[2]: *** Waiting for unfinished jobs.... [ 62s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 62s] make[1]: *** [Makefile:486: all-recursive] Error 1 [ 62s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 62s] make: *** [Makefile:391: all] Error 2 [ 62s] error: Bad exit status from /var/tmp/rpm-tmp.pAKoZS (%build) [ 62s] [ 62s] [ 62s] RPM build errors: [ 62s] line 39: It's not recommended to have unversioned Obsoletes: Obsoletes: openggsn [ 62s] Bad exit status from /var/tmp/rpm-tmp.pAKoZS (%build) [ 62s] ### VM INTERACTION START ### [ 65s] [ 54.806434] sysrq: Power Off [ 65s] [ 54.810053] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] old-atreju2 failed "build osmo-ggsn.spec" at Sat Feb 20 01:44:15 UTC 2021. [ 65s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 02:05:50 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 02:05:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <60306e874eacb_6c892abbc860c5f828996d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o debug.o debug.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o in46_addr.o in46_addr.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netdev.o netdev.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netns.o netns.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o util.o util.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o icmpv6.o icmpv6.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o checksum.o checksum.c [ 90s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 90s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 90s] #include [ 90s] ^~~~~~~~~~~~~~~~~ [ 90s] compilation terminated. [ 90s] make[2]: *** [Makefile:400: gtp-kernel.o] Error 1 [ 90s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 90s] make[1]: *** [Makefile:484: all-recursive] Error 1 [ 90s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 90s] make: *** [Makefile:389: all] Error 2 [ 90s] error: Bad exit status from /var/tmp/rpm-tmp.IPVsXx (%build) [ 90s] [ 90s] [ 90s] RPM build errors: [ 90s] Bad exit status from /var/tmp/rpm-tmp.IPVsXx (%build) [ 90s] ### VM INTERACTION START ### [ 94s] [ 66.133798] sysrq: SysRq : Power Off [ 94s] [ 66.135050] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] obs-arm-8 failed "build osmo-ggsn.spec" at Sat Feb 20 02:05:35 UTC 2021. [ 94s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 02:07:17 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 02:07:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <60306ee1d13e5_6c892abbc860c5f828998be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 78s] netdev.c: In function 'netdev_addaddr6': [ 78s] netdev.c:418:19: note: at offset 4 to object 'n' with size 16 declared here [ 78s] 418 | struct nlmsghdr n; [ 78s] | ^ [ 78s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o checksum.o checksum.c [ 78s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 78s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 78s] 21 | #include [ 78s] | ^~~~~~~~~~~~~~~~~ [ 78s] compilation terminated. [ 78s] make[2]: *** [Makefile:412: gtp-kernel.o] Error 1 [ 78s] make[2]: *** Waiting for unfinished jobs.... [ 78s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 78s] make[1]: *** [Makefile:486: all-recursive] Error 1 [ 78s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 78s] make: *** [Makefile:391: all] Error 2 [ 78s] error: Bad exit status from /var/tmp/rpm-tmp.TLVro5 (%build) [ 78s] [ 78s] [ 78s] RPM build errors: [ 78s] line 39: It's not recommended to have unversioned Obsoletes: Obsoletes: openggsn [ 78s] Bad exit status from /var/tmp/rpm-tmp.TLVro5 (%build) [ 78s] ### VM INTERACTION START ### [ 81s] [ 63.618134] sysrq: Power Off [ 81s] [ 63.620824] reboot: Power down [ 82s] ### VM INTERACTION END ### [ 82s] [ 82s] obs-arm-9 failed "build osmo-ggsn.spec" at Sat Feb 20 02:07:16 UTC 2021. [ 82s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 02:15:34 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 02:15:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <603070dfbb7c4_6c892abbc860c5f829025ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o in46_addr.o in46_addr.c [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netdev.o netdev.c [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netns.o netns.c [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o util.o util.c [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o icmpv6.o icmpv6.c [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o checksum.o checksum.c [ 45s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 45s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 45s] #include [ 45s] ^~~~~~~~~~~~~~~~~ [ 45s] compilation terminated. [ 45s] make[2]: *** [Makefile:400: gtp-kernel.o] Error 1 [ 45s] make[2]: *** Waiting for unfinished jobs.... [ 45s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 45s] make[1]: *** [Makefile:484: all-recursive] Error 1 [ 46s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 46s] make: *** [Makefile:389: all] Error 2 [ 46s] error: Bad exit status from /var/tmp/rpm-tmp.m58egs (%build) [ 46s] [ 46s] [ 46s] RPM build errors: [ 46s] Bad exit status from /var/tmp/rpm-tmp.m58egs (%build) [ 46s] ### VM INTERACTION START ### [ 49s] [ 41.634772] sysrq: SysRq : Power Off [ 49s] [ 41.638413] reboot: Power down [ 49s] ### VM INTERACTION END ### [ 49s] [ 49s] sheep85 failed "build osmo-ggsn.spec" at Sat Feb 20 02:15:22 UTC 2021. [ 49s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 02:27:03 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 02:27:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <603073906ea2_6c892abbc860c5f829041f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 44s] netdev.c:418:19: note: at offset 4 to object 'n' with size 16 declared here [ 44s] 418 | struct nlmsghdr n; [ 44s] | ^ [ 44s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o icmpv6.o icmpv6.c [ 44s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o checksum.o checksum.c [ 44s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 44s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 44s] 21 | #include [ 44s] | ^~~~~~~~~~~~~~~~~ [ 44s] compilation terminated. [ 44s] make[2]: *** [Makefile:412: gtp-kernel.o] Error 1 [ 44s] make[2]: *** Waiting for unfinished jobs.... [ 44s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 44s] make[1]: *** [Makefile:486: all-recursive] Error 1 [ 44s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 44s] make: *** [Makefile:391: all] Error 2 [ 44s] error: Bad exit status from /var/tmp/rpm-tmp.GVk4nK (%build) [ 44s] [ 44s] [ 44s] RPM build errors: [ 44s] line 39: It's not recommended to have unversioned Obsoletes: Obsoletes: openggsn [ 44s] Bad exit status from /var/tmp/rpm-tmp.GVk4nK (%build) [ 44s] ### VM INTERACTION START ### [ 47s] [ 40.578902] sysrq: Power Off [ 47s] [ 40.584847] reboot: Power down [ 47s] ### VM INTERACTION END ### [ 47s] [ 47s] old-atreju2 failed "build osmo-ggsn.spec" at Sat Feb 20 02:26:55 UTC 2021. [ 47s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 02:36:12 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 02:36:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <603075ac30117_6c892abbc860c5f829055f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 55s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o in46_addr.o in46_addr.c [ 55s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netdev.o netdev.c [ 55s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netns.o netns.c [ 55s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o util.o util.c [ 55s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o icmpv6.o icmpv6.c [ 56s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o checksum.o checksum.c [ 56s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 56s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 56s] #include [ 56s] ^~~~~~~~~~~~~~~~~ [ 56s] compilation terminated. [ 56s] make[2]: *** [Makefile:400: gtp-kernel.o] Error 1 [ 56s] make[2]: *** Waiting for unfinished jobs.... [ 56s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 56s] make[1]: *** [Makefile:484: all-recursive] Error 1 [ 56s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 56s] make: *** [Makefile:389: all] Error 2 [ 56s] error: Bad exit status from /var/tmp/rpm-tmp.VlohPw (%build) [ 56s] [ 56s] [ 56s] RPM build errors: [ 56s] Bad exit status from /var/tmp/rpm-tmp.VlohPw (%build) [ 56s] ### VM INTERACTION START ### [ 59s] [ 50.393756] sysrq: Power Off [ 59s] [ 50.401670] reboot: Power down [ 59s] ### VM INTERACTION END ### [ 59s] [ 59s] lamb26 failed "build osmo-ggsn.spec" at Sat Feb 20 02:36:01 UTC 2021. [ 59s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 02:56:29 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 02:56:29 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60307a78e229a_6c892abbc860c5f82909878@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 108s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 108s] [COMPILING libboard/qmod/source/card_pres.c] [ 108s] [COMPILING libboard/qmod/source/wwan_led.c] [ 108s] [COMPILING libboard/qmod/source/i2c.c] [ 108s] [COMPILING libboard/qmod/source/board_qmod.c] [ 108s] [COMPILING apps/dfu/main.c] [ 108s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 108s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 108s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 109s] Memory region Used Size Region Size %age Used [ 109s] rom: 16588 B 16 KB 101.25% [ 109s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 109s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 109s] collect2: error: ld returned 1 exit status [ 109s] % [ 109s] make[2]: *** [Makefile:234: flash] Error 1 [ 109s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 109s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 109s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 109s] dh_auto_build: error: make -j1 returned exit code 2 [ 109s] make: *** [debian/rules:16: build] Error 25 [ 109s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 109s] ### VM INTERACTION START ### [ 112s] [ 102.536712] sysrq: Power Off [ 112s] [ 102.538652] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] hci-cnode1-m0 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 20 02:56:15 UTC 2021. [ 112s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 03:34:50 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 03:34:50 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6030836582527_6c892abbc860c5f8291356@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 159s] [COMPILING apps/dfu/main.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 160s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 160s] Memory region Used Size Region Size %age Used [ 160s] rom: 16580 B 16 KB 101.20% [ 160s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 160s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 160s] collect2: error: ld returned 1 exit status [ 160s] % [ 160s] make[2]: *** [Makefile:234: flash] Error 1 [ 160s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 160s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 160s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 160s] dh_auto_build: error: make -j1 returned exit code 2 [ 160s] make: *** [debian/rules:16: build] Error 25 [ 160s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 160s] ### VM INTERACTION START ### [ 163s] [ 150.104732] sysrq: Power Off [ 163s] [ 150.110101] reboot: Power down [ 163s] ### VM INTERACTION END ### [ 163s] [ 163s] lamb53 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 20 03:34:47 UTC 2021. [ 163s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 03:36:50 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 03:36:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <603083db94ee0_6c892abbc860c5f829140e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o in46_addr.o in46_addr.c [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netdev.o netdev.c [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o netns.o netns.c [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o util.o util.c [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o icmpv6.o icmpv6.c [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o checksum.o checksum.c [ 149s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -pthread -I/usr/include/libosmocore/ -DGTP_KERNEL -I/usr/include/libgtpnl -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 149s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 149s] #include [ 149s] ^~~~~~~~~~~~~~~~~ [ 149s] compilation terminated. [ 149s] make[2]: *** [Makefile:400: gtp-kernel.o] Error 1 [ 149s] make[2]: *** Waiting for unfinished jobs.... [ 149s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 149s] make[1]: *** [Makefile:484: all-recursive] Error 1 [ 149s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 149s] make: *** [Makefile:389: all] Error 2 [ 149s] error: Bad exit status from /var/tmp/rpm-tmp.yBkGlO (%build) [ 149s] [ 149s] [ 149s] RPM build errors: [ 149s] Bad exit status from /var/tmp/rpm-tmp.yBkGlO (%build) [ 149s] ### VM INTERACTION START ### [ 153s] [ 126.535380] sysrq: SysRq : Power Off [ 153s] [ 126.538533] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] obs-arm-5 failed "build osmo-ggsn.spec" at Sat Feb 20 03:36:35 UTC 2021. [ 153s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 03:38:33 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 03:38:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <60308452ab65f_6c892abbc860c5f8291438b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-ggsn failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 250s] | ~~~~~~~~~~~~~~~~~ [ 250s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o netns.o netns.c [ 250s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o util.o util.c [ 250s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o icmpv6.o icmpv6.c [ 250s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o checksum.o checksum.c [ 251s] gcc -DHAVE_CONFIG_H -I. -I.. -O2 -fno-builtin -Wall -DSBINDIR='"/usr/sbin"' -ggdb -I/usr/include/libosmocore/ -pthread -DGTP_KERNEL -I/usr/include/libgtpnl -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -std=gnu11 -c -o gtp-kernel.o gtp-kernel.c [ 251s] gtp-kernel.c:21:10: fatal error: libmnl/libmnl.h: No such file or directory [ 251s] 21 | #include [ 251s] | ^~~~~~~~~~~~~~~~~ [ 251s] compilation terminated. [ 251s] make[2]: *** [Makefile:412: gtp-kernel.o] Error 1 [ 251s] make[2]: *** Waiting for unfinished jobs.... [ 251s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710/lib' [ 251s] make[1]: *** [Makefile:486: all-recursive] Error 1 [ 251s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-ggsn-1.6.0.20.7710' [ 251s] make: *** [Makefile:391: all] Error 2 [ 251s] error: Bad exit status from /var/tmp/rpm-tmp.2siQTK (%build) [ 251s] [ 251s] [ 251s] RPM build errors: [ 251s] line 39: It's not recommended to have unversioned Obsoletes: Obsoletes: openggsn [ 251s] Bad exit status from /var/tmp/rpm-tmp.2siQTK (%build) [ 251s] ### VM INTERACTION START ### [ 254s] [ 196.127688] sysrq: Power Off [ 254s] [ 196.321062] reboot: Power down [ 255s] ### VM INTERACTION END ### [ 255s] [ 255s] armbuild21 failed "build osmo-ggsn.spec" at Sat Feb 20 03:38:26 UTC 2021. [ 255s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:06:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:06:30 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: Remove duplicate #include section References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23007 ) Change subject: gtp-kernel: Remove duplicate #include section ...................................................................... gtp-kernel: Remove duplicate #include section This was probably a wrong patch merge at some point. Change-Id: I54191aca8fd55de84d86591035fe9785d379205f --- M lib/gtp-kernel.c 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/07/23007/1 diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index f6df408..b898ed7 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -31,10 +31,6 @@ #include "../gtp/pdp.h" #include "../gtp/gtp.h" -#include -#include -#include - #include "gtp-kernel.h" static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I54191aca8fd55de84d86591035fe9785d379205f Gerrit-Change-Number: 23007 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:06:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:06:31 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: don't #include libmnl headers References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 ) Change subject: gtp-kernel: don't #include libmnl headers ...................................................................... gtp-kernel: don't #include libmnl headers * we don't check for libmnl via pkg-config in configure.ac * we don't add libmnl include path to CFLAGS As a result, we cannot #include related files. All we really need is a forward-declaration of 'struct mnl_socket' to which we then add a pointer. Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 --- M contrib/osmo-ggsn.spec.in M lib/gtp-kernel.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/08/23008/1 diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index 83a1ca7..d752a8e 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -30,7 +30,6 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libgtpnl) >= 1.0.0 -BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libosmocore) >= 1.1.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 BuildRequires: pkgconfig(libosmovty) >= 1.1.0 diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index b898ed7..7cd19ad 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -18,7 +18,6 @@ #include #include -#include #include @@ -54,6 +53,8 @@ buf4, buf6, inet_ntoa(ia)); } +struct mnl_socket; + static struct { int genl_id; struct mnl_socket *nl; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 Gerrit-Change-Number: 23008 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:27:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:27:45 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: Remove duplicate #include section In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23007 ) Change subject: gtp-kernel: Remove duplicate #include section ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I54191aca8fd55de84d86591035fe9785d379205f Gerrit-Change-Number: 23007 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 10:27:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:29:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:29:09 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: don't #include libmnl headers In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 to look at the new patch set (#2). Change subject: gtp-kernel: don't #include libmnl headers ...................................................................... gtp-kernel: don't #include libmnl headers * we don't check for libmnl via pkg-config in configure.ac * we don't add libmnl include path to CFLAGS As a result, we cannot #include related files. libmnl is completely encapsulated by libgtpnl. It even includes a forward-declaration of 'struct mnl_socket'. Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 --- M contrib/osmo-ggsn.spec.in M lib/gtp-kernel.c 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/08/23008/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 Gerrit-Change-Number: 23008 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:29:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:29:15 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: Remove duplicate #include section In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23007 ) Change subject: gtp-kernel: Remove duplicate #include section ...................................................................... gtp-kernel: Remove duplicate #include section This was probably a wrong patch merge at some point. Change-Id: I54191aca8fd55de84d86591035fe9785d379205f --- M lib/gtp-kernel.c 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index f6df408..b898ed7 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -31,10 +31,6 @@ #include "../gtp/pdp.h" #include "../gtp/gtp.h" -#include -#include -#include - #include "gtp-kernel.h" static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I54191aca8fd55de84d86591035fe9785d379205f Gerrit-Change-Number: 23007 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:30:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:30:11 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 20 Feb 2021 10:30:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:30:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:30:12 +0000 Subject: Change in osmo-bsc[master]: Disallow changing the type of an existing BTS from the vty In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22964 ) Change subject: Disallow changing the type of an existing BTS from the vty ...................................................................... Disallow changing the type of an existing BTS from the vty Changing the BTS type is not supported, so don't allow it. For example, Changing from type sysmobts to type rbs2000 may hit an OSMO_ASSERT in om2k_bts_fsm_alloc() The default BTS type if osmo-bsc is started with an empty configuration and the operator issues config terminal->network->bts 0 will be "unknown". This type and only this type can be changed from the vty config node. Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index d3f8a73..c8dfa8d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2333,6 +2333,9 @@ int rc; rc = gsm_set_bts_type(bts, str2btstype(argv[0])); + if (rc == -EBUSY) + vty_out(vty, "%% Changing the type of an existing BTS is not supported.%s", + VTY_NEWLINE); if (rc < 0) return CMD_WARNING; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 548d724..1d0979d 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -492,6 +492,9 @@ { struct gsm_bts_model *model; + if (bts->type != GSM_BTS_TYPE_UNKNOWN && type != bts->type) + return -EBUSY; + model = bts_model_find(type); if (!model) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0df97ef128a1bbd84c787654d1d842dce4dad819 Gerrit-Change-Number: 22964 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 10:30:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 10:30:23 +0000 Subject: Change in osmo-remsim[master]: manual: fix formating of a bullet point list in bankd csv file part In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/22998 ) Change subject: manual: fix formating of a bullet point list in bankd csv file part ...................................................................... manual: fix formating of a bullet point list in bankd csv file part Change-Id: Ib56dbfae4ebf14321bfed855291341a50f862148 --- M doc/manuals/chapters/remsim-bankd.adoc 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/chapters/remsim-bankd.adoc b/doc/manuals/chapters/remsim-bankd.adoc index 87dafa1..ab7a362 100644 --- a/doc/manuals/chapters/remsim-bankd.adoc +++ b/doc/manuals/chapters/remsim-bankd.adoc @@ -108,6 +108,7 @@ This CSV file specifies the mapping between the string names of the PCSC readers and the RSPRO bandk/slot numbers. The format is as follows: + * first column: bankd number * second column: slot number within bankd * third column: extended POSIX regular expression matching the slot -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/22998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib56dbfae4ebf14321bfed855291341a50f862148 Gerrit-Change-Number: 22998 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 14:40:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 14:40:39 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: don't #include libmnl headers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 ) Change subject: gtp-kernel: don't #include libmnl headers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 Gerrit-Change-Number: 23008 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 14:40:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 14:40:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 14:40:41 +0000 Subject: Change in osmo-ggsn[master]: gtp-kernel: don't #include libmnl headers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 ) Change subject: gtp-kernel: don't #include libmnl headers ...................................................................... gtp-kernel: don't #include libmnl headers * we don't check for libmnl via pkg-config in configure.ac * we don't add libmnl include path to CFLAGS As a result, we cannot #include related files. libmnl is completely encapsulated by libgtpnl. It even includes a forward-declaration of 'struct mnl_socket'. Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 --- M contrib/osmo-ggsn.spec.in M lib/gtp-kernel.c 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index 83a1ca7..d752a8e 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -30,7 +30,6 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libgtpnl) >= 1.0.0 -BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libosmocore) >= 1.1.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 BuildRequires: pkgconfig(libosmovty) >= 1.1.0 diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index b898ed7..2a731e6 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -18,7 +18,6 @@ #include #include -#include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0af869cc3c8e30b69d73a4985c56ef7743565e95 Gerrit-Change-Number: 23008 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 16:34:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 16:34:54 +0000 Subject: Change in osmo-cbc[master]: rest_api.c: Add missing \n in log line after error message References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23009 ) Change subject: rest_api.c: Add missing \n in log line after error message ...................................................................... rest_api.c: Add missing \n in log line after error message Change-Id: If2e9134d827891468df7ae35b89d6dfb798eb0dc --- M src/rest_api.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/09/23009/1 diff --git a/src/rest_api.c b/src/rest_api.c index 91e7d40..c70d096 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -589,7 +589,7 @@ return U_CALLBACK_COMPLETE; err: jsonstr = json_dumps(json_req, 0); - LOGP(DREST, LOGL_ERROR, "ERROR: %s (%s)", errstr, jsonstr); + LOGP(DREST, LOGL_ERROR, "ERROR: %s (%s)\n", errstr, jsonstr); free(jsonstr); json_decref(json_req); talloc_free(riop); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If2e9134d827891468df7ae35b89d6dfb798eb0dc Gerrit-Change-Number: 23009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:08:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:08:15 +0000 Subject: Change in osmo-cbc[master]: bring JSON schema in sync with reality References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23010 ) Change subject: bring JSON schema in sync with reality ...................................................................... bring JSON schema in sync with reality Change-Id: I80f394e76d8c57f367f0049ee52df02d943ad105 --- M cbc.schema.json M smscb.schema.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/10/23010/1 diff --git a/cbc.schema.json b/cbc.schema.json index cdaab38..c4d03dc 100644 --- a/cbc.schema.json +++ b/cbc.schema.json @@ -42,7 +42,7 @@ "num_of_bcast": { "$ref": "#/definitions/number_of_broadcasts" }, "scope": { "$ref": "#/definitions/scope" }, "warning_period_sec": { "$ref": "#/definitions/warning_period_sec" }, - "smscb": { "$ref": "smscb.schema.json#definitions/smscb_message" } + "smscb_message": { "$ref": "smscb.schema.json#definitions/smscb_message" } }, "required": [ "scope", "smscb" } } diff --git a/smscb.schema.json b/smscb.schema.json index a683263..0a3273c 100644 --- a/smscb.schema.json +++ b/smscb.schema.json @@ -67,7 +67,7 @@ "dcs_class": { "$ref": "#/definitions/dcs_class" }, "data_utf8": { "type": "string" } }, - "required": [ "data" ] + "required": [ "data_utf8" ] }, "page": { "type": "string" -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I80f394e76d8c57f367f0049ee52df02d943ad105 Gerrit-Change-Number: 23010 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:09:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:09:25 +0000 Subject: Change in osmo-cbc[master]: rest_api.c: Add missing \n in log line after error message In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23009 ) Change subject: rest_api.c: Add missing \n in log line after error message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If2e9134d827891468df7ae35b89d6dfb798eb0dc Gerrit-Change-Number: 23009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:09:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:09:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:09:31 +0000 Subject: Change in osmo-cbc[master]: bring JSON schema in sync with reality In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23010 ) Change subject: bring JSON schema in sync with reality ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I80f394e76d8c57f367f0049ee52df02d943ad105 Gerrit-Change-Number: 23010 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 20 Feb 2021 17:09:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:09:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:09:50 +0000 Subject: Change in osmo-pcu[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22985 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f9c56313cfaa74ebe666f44763a83d8102f5484 Gerrit-Change-Number: 22985 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:09:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:09:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:09:54 +0000 Subject: Change in osmo-pcu[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22986 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idcc4875592c81f17ac98c4f6098492b3d9dd33d2 Gerrit-Change-Number: 22986 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:09:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:04 +0000 Subject: Change in osmo-pcu[master]: Use NULL as default value for pointer type In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22993 ) Change subject: Use NULL as default value for pointer type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief2368954c71005c529e3eea3fee5df2630e44c1 Gerrit-Change-Number: 22993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:10:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:23 +0000 Subject: Change in osmo-pcu[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22985 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I7f9c56313cfaa74ebe666f44763a83d8102f5484 Related: OS#5034 --- M tests/alloc/AllocTest.cpp M tests/app_info/AppInfoTest.cpp M tests/bitcomp/BitcompTest.cpp M tests/edge/EdgeTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 7 files changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index ecc3e80..eced0b8 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -814,6 +814,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO); if (getenv("LOGL_DEBUG")) log_set_log_level(osmo_stderr_target, LOGL_DEBUG); diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index f145fa5..707deb7 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -175,6 +175,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1"); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/bitcomp/BitcompTest.cpp b/tests/bitcomp/BitcompTest.cpp index 14246fe..c3aa5c6 100644 --- a/tests/bitcomp/BitcompTest.cpp +++ b/tests/bitcomp/BitcompTest.cpp @@ -194,6 +194,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMACUL,1"); test_EPDAN_decode_tree(); @@ -213,4 +215,3 @@ void l1if_close_pdch() { abort(); } void l1if_open_pdch() { abort(); } } - diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 6161e0e..8536cfc 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1396,6 +1396,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 677c695..583335c 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -614,6 +614,8 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_log_level(osmo_stderr_target, LOGL_INFO); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DPCU,3:DRLCMAC,3"); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 24fd109..8d0a5d0 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3265,6 +3265,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:" "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DLBSSGP,3:DPCU,5:" "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:"); diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 038d737..e9bcf4e 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -927,6 +927,8 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO); log_set_category_filter(osmo_stderr_target, DTBFUL, 1, LOGL_INFO); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7f9c56313cfaa74ebe666f44763a83d8102f5484 Gerrit-Change-Number: 22985 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:23 +0000 Subject: Change in osmo-pcu[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22986 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Idcc4875592c81f17ac98c4f6098492b3d9dd33d2 --- M tests/alloc/AllocTest.cpp M tests/alloc/MslotTest.cpp M tests/app_info/AppInfoTest.cpp M tests/bitcomp/BitcompTest.cpp M tests/codel/codel_test.c M tests/edge/EdgeTest.cpp M tests/fn/FnTest.cpp M tests/llc/LlcTest.cpp M tests/ms/MsTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 11 files changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index eced0b8..cd48b29 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -813,7 +813,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO); diff --git a/tests/alloc/MslotTest.cpp b/tests/alloc/MslotTest.cpp index 96b82a5..96fe61b 100644 --- a/tests/alloc/MslotTest.cpp +++ b/tests/alloc/MslotTest.cpp @@ -149,7 +149,7 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp index 707deb7..e89680b 100644 --- a/tests/app_info/AppInfoTest.cpp +++ b/tests/app_info/AppInfoTest.cpp @@ -174,7 +174,7 @@ tall_pcu_ctx = talloc_named_const(NULL, 1, "AppInfoTest"); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1"); diff --git a/tests/bitcomp/BitcompTest.cpp b/tests/bitcomp/BitcompTest.cpp index c3aa5c6..69ef511 100644 --- a/tests/bitcomp/BitcompTest.cpp +++ b/tests/bitcomp/BitcompTest.cpp @@ -193,7 +193,7 @@ osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMACUL,1"); diff --git a/tests/codel/codel_test.c b/tests/codel/codel_test.c index 4244eae..e8de634 100644 --- a/tests/codel/codel_test.c +++ b/tests/codel/codel_test.c @@ -137,7 +137,7 @@ { osmo_init_logging2(NULL, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); printf("===== CoDel test START\n"); diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 8536cfc..134e856 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1395,7 +1395,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/fn/FnTest.cpp b/tests/fn/FnTest.cpp index 4281fc3..e5ac46d 100644 --- a/tests/fn/FnTest.cpp +++ b/tests/fn/FnTest.cpp @@ -152,7 +152,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); the_pcu = gprs_pcu_alloc(tall_pcu_ctx); diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index bfcac77..d98636a 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -229,7 +229,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:"); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 583335c..498c835 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -612,7 +612,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 8d0a5d0..d921cbe 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3264,7 +3264,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:" diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index e9bcf4e..643ce4c 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -926,7 +926,7 @@ msgb_talloc_ctx_init(tall_pcu_ctx, 0); osmo_init_logging2(tall_pcu_ctx, &gprs_log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idcc4875592c81f17ac98c4f6098492b3d9dd33d2 Gerrit-Change-Number: 22986 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:23 +0000 Subject: Change in osmo-pcu[master]: Use NULL as default value for pointer type In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22993 ) Change subject: Use NULL as default value for pointer type ...................................................................... Use NULL as default value for pointer type Using zero there is confusing since it's a pointer to an integer. Change-Id: Ief2368954c71005c529e3eea3fee5df2630e44c1 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 4c68a87..6b34418 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -147,7 +147,7 @@ */ static int find_least_busy_pdch(const struct gprs_rlcmac_trx *trx, enum gprs_rlcmac_tbf_direction dir, uint8_t mask, int (*fn)(const struct gprs_rlcmac_pdch *, enum gprs_rlcmac_tbf_direction dir), - int *free_tfi = 0, int *free_usf = 0) + int *free_tfi = NULL, int *free_usf = NULL) { unsigned ts; int min_used = INT_MAX; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief2368954c71005c529e3eea3fee5df2630e44c1 Gerrit-Change-Number: 22993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:27 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22994 ) Change subject: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I397495c158bce1c2715991371368b0d84cf69261 Gerrit-Change-Number: 22994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:10:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:43 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_rx() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22995 ) Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_rx() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I06c97d81636e251f81c26f3aa042c70717be083a Gerrit-Change-Number: 22995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:10:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:46 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22994 ) Change subject: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I397495c158bce1c2715991371368b0d84cf69261 Gerrit-Change-Number: 22994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:10:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:10:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:10:59 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Mark mslot_class properties const In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22996 ) Change subject: find_multi_slots: Mark mslot_class properties const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief038c75bc02d0e987135f29599014eab88447dd Gerrit-Change-Number: 22996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:10:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:12 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_type() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22997 ) Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_type() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688 Gerrit-Change-Number: 22997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:11:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:14 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22994 ) Change subject: find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration ...................................................................... find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration Change-Id: I397495c158bce1c2715991371368b0d84cf69261 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 6b34418..469ede3 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -556,7 +556,7 @@ /* Check for each UL (TX) slot */ /* Iterate through possible numbers of TX slots */ - for (num_tx = 1; num_tx <= mslot_class_get_tx(mslot_class); num_tx += 1) { + for (num_tx = 1; num_tx <= Tx; num_tx += 1) { uint16_t tx_valid_win = (1 << num_tx) - 1; uint8_t rx_mask[MASK_TR + 1]; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I397495c158bce1c2715991371368b0d84cf69261 Gerrit-Change-Number: 22994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:14 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_rx() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22995 ) Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_rx() ...................................................................... find_multi_slots: Avoid multiple calls to mslot_class_get_rx() Change-Id: I06c97d81636e251f81c26f3aa042c70717be083a --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 469ede3..1645b87 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -516,7 +516,8 @@ */ int find_multi_slots(struct gprs_rlcmac_trx *trx, uint8_t mslot_class, uint8_t *ul_slots, uint8_t *dl_slots) { - uint8_t Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ + uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ + Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */ max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; int16_t rx_window, tx_window; @@ -534,7 +535,7 @@ return -EINVAL; } - max_slots = OSMO_MAX(mslot_class_get_rx(mslot_class), Tx); + max_slots = OSMO_MAX(Rx, Tx); if (*dl_slots == 0) *dl_slots = 0xff; @@ -590,7 +591,7 @@ if ((tx_window & (1 << ((ul_ts+num_tx-1) % 8))) == 0) continue; - num_rx = OSMO_MIN(mslot_class_get_rx(mslot_class), Sum - num_tx); + num_rx = OSMO_MIN(Rx, Sum - num_tx); rx_valid_win = (1 << num_rx) - 1; /* Rotate group of RX slots: DDD-----, -DDD----, ..., DD-----D */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I06c97d81636e251f81c26f3aa042c70717be083a Gerrit-Change-Number: 22995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:15 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Mark mslot_class properties const In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22996 ) Change subject: find_multi_slots: Mark mslot_class properties const ...................................................................... find_multi_slots: Mark mslot_class properties const This way it's clear for reader that those variables are never touched during the function. Change-Id: Ief038c75bc02d0e987135f29599014eab88447dd --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 1645b87..cb054cd 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -516,10 +516,10 @@ */ int find_multi_slots(struct gprs_rlcmac_trx *trx, uint8_t mslot_class, uint8_t *ul_slots, uint8_t *dl_slots) { - uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ - Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ - Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */ - max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; + const uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ + Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ + Sum = mslot_class_get_sum(mslot_class); /* Max number of Tx + Rx slots */ + uint8_t max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; int16_t rx_window, tx_window; char slot_info[9] = {0}; int max_capacity = -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief038c75bc02d0e987135f29599014eab88447dd Gerrit-Change-Number: 22996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:15 +0000 Subject: Change in osmo-pcu[master]: find_multi_slots: Avoid multiple calls to mslot_class_get_type() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22997 ) Change subject: find_multi_slots: Avoid multiple calls to mslot_class_get_type() ...................................................................... find_multi_slots: Avoid multiple calls to mslot_class_get_type() Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688 --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index cb054cd..5f0bcc5 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -518,7 +518,8 @@ { const uint8_t Rx = mslot_class_get_rx(mslot_class), /* Max number of Rx slots */ Tx = mslot_class_get_tx(mslot_class), /* Max number of Tx slots */ - Sum = mslot_class_get_sum(mslot_class); /* Max number of Tx + Rx slots */ + Sum = mslot_class_get_sum(mslot_class), /* Max number of Tx + Rx slots */ + Type = mslot_class_get_type(mslot_class); uint8_t max_slots, num_rx, num_tx, mask_sel, pdch_slots, ul_ts, dl_ts; int16_t rx_window, tx_window; char slot_info[9] = {0}; @@ -574,7 +575,7 @@ /* for multislot type 1: don't split the window to wrap around. * E.g. 'UU-----U' is invalid for a 4 TN window. Except 8 TN window. * See 45.002 B.1 */ - if (mslot_class_get_type(mslot_class) == 1 && num_tx < 8 && + if (Type == 1 && num_tx < 8 && tx_valid_win & (1 << 0) && tx_valid_win & (1 << 7)) continue; @@ -602,7 +603,7 @@ /* for multislot type 1: don't split the window to wrap around. * E.g. 'DD-----D' is invalid for a 4 TN window. Except 8 TN window. * See 45.002 B.1 */ - if (mslot_class_get_type(mslot_class) == 1 && num_rx < 8 && + if (Type == 1 && num_rx < 8 && (rx_valid_win & (1 << 0)) && (rx_valid_win & (1 << 7))) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9cda52befe32a7727ab479bc151d10106fb94688 Gerrit-Change-Number: 22997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:37 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22990 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:11:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:11:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:11:57 +0000 Subject: Change in openbsc[master]: gitignore: Ignore configure~ file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22991 ) Change subject: gitignore: Ignore configure~ file ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/openbsc/+/22991/1/openbsc/tests/smpp/smpp_test.c File openbsc/tests/smpp/smpp_test.c: https://gerrit.osmocom.org/c/openbsc/+/22991/1/openbsc/tests/smpp/smpp_test.c at 70 PS1, Line 70: log_set_print_category(osmo_stderr_target, 0); unrelated change -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie2ec89307ca941e52cb898ce045e423c44f32658 Gerrit-Change-Number: 22991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:11:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:06 +0000 Subject: Change in openbsc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22992 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2bd75313daab58704625245af2dd39d88ee42872 Gerrit-Change-Number: 22992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:12:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:19 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/openbsc/+/22990 ) Change subject: tests: Explicitly drop category from log ...................................................................... Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:35 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22990 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: removed my review as ther appear to be bist in the next patch that belong here. -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:12:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:44 +0000 Subject: Change in osmo-bts[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22983 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8713f4e04e92b4d7e211c499fc6e78983edfb139 Gerrit-Change-Number: 22983 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:12:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:50 +0000 Subject: Change in osmo-bts[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22984 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd1ee307252d19ae535d2234523036c319e4c0ec Gerrit-Change-Number: 22984 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:12:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:52 +0000 Subject: Change in osmo-bts[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22983 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I8713f4e04e92b4d7e211c499fc6e78983edfb139 Related: OS#5034 --- M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c M tests/tx_power/tx_power_test.c 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 6f5f2bf..0c9bbbf 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -527,6 +527,8 @@ osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); #define exec_test(test) \ exec_power_test(test, ARRAY_SIZE(test), #test) diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index c58812b..d7f4ea8 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -325,6 +325,8 @@ osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_power_loop(); test_pf_algo_ewma(); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index dbabc87..c3a8b4e 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -249,6 +249,8 @@ osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); bts = gsm_bts_alloc(tall_bts_ctx, 0); if (!bts) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8713f4e04e92b4d7e211c499fc6e78983edfb139 Gerrit-Change-Number: 22983 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:52 +0000 Subject: Change in osmo-bts[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22984 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: Ifd1ee307252d19ae535d2234523036c319e4c0ec --- M tests/power/bs_power_loop_test.c M tests/power/ms_power_loop_test.c M tests/tx_power/tx_power_test.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 0c9bbbf..53fdbba 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -525,7 +525,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c index d7f4ea8..0d86310 100644 --- a/tests/power/ms_power_loop_test.c +++ b/tests/power/ms_power_loop_test.c @@ -323,7 +323,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DLOOP].loglevel = LOGL_DEBUG; osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c index c3a8b4e..3724f56 100644 --- a/tests/tx_power/tx_power_test.c +++ b/tests/tx_power/tx_power_test.c @@ -247,7 +247,7 @@ osmo_init_logging2(tall_bts_ctx, &bts_log_info); osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG; - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd1ee307252d19ae535d2234523036c319e4c0ec Gerrit-Change-Number: 22984 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:12:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:12:58 +0000 Subject: Change in osmo-msc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22979 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Gerrit-Change-Number: 22979 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:12:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:13:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:13:01 +0000 Subject: Change in osmo-msc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22979 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Related: OS#5034 --- M tests/db_sms/db_sms_test.c M tests/msc_vlr/msc_vlr_tests.c M tests/smpp/smpp_test.c 3 files changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c index 24c86e5..011bd51 100644 --- a/tests/db_sms/db_sms_test.c +++ b/tests/db_sms/db_sms_test.c @@ -519,6 +519,7 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_set_print_level(osmo_stderr_target, 1); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 87d1abd..b311f67 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1192,6 +1192,7 @@ log_set_print_timestamp(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); if (cmdline_opts.verbose) { diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index 1abb63b..b7df653 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -81,6 +81,8 @@ osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_coding_scheme(); return EXIT_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I089c0001fc75e81558c3e860827e4d434cf1eab3 Gerrit-Change-Number: 22979 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:13:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:13:47 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 ) Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 20 Feb 2021 17:13:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:13:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:13:59 +0000 Subject: Change in libosmocore[master]: tests: Set print_category values explicitly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 ) Change subject: tests: Set print_category values explicitly ...................................................................... tests: Set print_category values explicitly This will alow easily changing default values for print_category vs print_category_hex later. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Related: OS#5034 Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 --- M tests/fsm/fsm_test.c M tests/gb/bssgp_fc_test.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns_test.c M tests/gsup/gsup_test.c M tests/logging/logging_test.c M tests/loggingrb/loggingrb_test.c M tests/oap/oap_client_test.c M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/write_queue/wqueue_test.c 11 files changed, 19 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index fe48b2b..23e24cf 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -414,6 +414,8 @@ log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); log_set_use_color(stderr_target, 0); + log_set_print_category(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL); g_ctx = NULL; diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c index cc38777..23bcd57 100644 --- a/tests/gb/bssgp_fc_test.c +++ b/tests/gb/bssgp_fc_test.c @@ -149,6 +149,8 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); tall_msgb_ctx = msgb_talloc_ctx_init(ctx, 0); diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index d8ed06f..37719a9 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -524,6 +524,8 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_log_level(osmo_stderr_target, LOGL_INFO); unitdata = talloc_zero(ctx, struct osmo_wqueue); osmo_wqueue_init(unitdata, 100); diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index f70e493..e8e8b80 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -904,6 +904,8 @@ void *ctx = talloc_named_const(NULL, 0, "gprs_ns_test"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index f34ac7a..f84072c 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -752,6 +752,7 @@ log_set_print_filename(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); test_gsup_messages_dec_enc(); diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index b9cb57f..d036dc5 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -78,6 +78,7 @@ log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); log_set_print_filename(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 1); log_set_use_color(stderr_target, 0); diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c index 0b2ae5b..4a4d1f9 100644 --- a/tests/loggingrb/loggingrb_test.c +++ b/tests/loggingrb/loggingrb_test.c @@ -65,6 +65,8 @@ log_add_target(ringbuf_target); log_set_all_filter(ringbuf_target, 1); log_set_print_filename(ringbuf_target, 0); + log_set_print_category(ringbuf_target, 0); + log_set_print_category_hex(ringbuf_target, 0); log_parse_category_mask(ringbuf_target, "DRLL:DCC"); log_parse_category_mask(ringbuf_target, "DRLL"); diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c index dadf2ee..0ac32ea 100644 --- a/tests/oap/oap_client_test.c +++ b/tests/oap/oap_client_test.c @@ -261,6 +261,7 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DLOAP,1"); diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c index e70b8be..9705038 100644 --- a/tests/socket/socket_sctp_test.c +++ b/tests/socket/socket_sctp_test.c @@ -223,6 +223,8 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); #ifdef HAVE_LIBSCTP test_sockinit2_multiaddr_simple(); test_sockinit2_multiaddr_several(); diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 0bf2127..9619553 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -401,6 +401,8 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_sockinit(); test_sockinit2(); diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c index 827e4e8..9c7a36e 100644 --- a/tests/write_queue/wqueue_test.c +++ b/tests/write_queue/wqueue_test.c @@ -73,6 +73,8 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); + log_set_print_category_hex(stderr_target, 0); + log_set_print_category(stderr_target, 0); test_wqueue_limit(); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 Gerrit-Change-Number: 22961 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:00 +0000 Subject: Change in libosmocore[master]: Drop use of log_set_print_filename() API inside libosmocore In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22962 ) Change subject: Drop use of log_set_print_filename() API inside libosmocore ...................................................................... Drop use of log_set_print_filename() API inside libosmocore Let's use log_set_print_filename2() API instead, which has less ackward behavior implications like changing the print status of category-hex. Related: OS#5034 Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da --- M tests/fsm/fsm_dealloc_test.c M tests/fsm/fsm_test.c M tests/gb/bssgp_fc_test.c M tests/gb/gprs_bssgp_test.c M tests/gb/gprs_ns2_test.c M tests/gb/gprs_ns_test.c M tests/gsup/gsup_test.c M tests/logging/logging_test.c M tests/loggingrb/loggingrb_test.c M tests/oap/oap_client_test.c M tests/socket/socket_sctp_test.c M tests/socket/socket_test.c M tests/tdef/tdef_test.c M tests/write_queue/wqueue_test.c M utils/osmo-ns-dummy.c 15 files changed, 16 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/fsm/fsm_dealloc_test.c b/tests/fsm/fsm_dealloc_test.c index 48f80e5..f4be93d 100644 --- a/tests/fsm/fsm_dealloc_test.c +++ b/tests/fsm/fsm_dealloc_test.c @@ -443,7 +443,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 1); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 23e24cf..2cfdacd 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -412,7 +412,7 @@ log_init(&log_info, NULL); stderr_target = log_target_create_stderr(); log_add_target(stderr_target); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_use_color(stderr_target, 0); log_set_print_category(stderr_target, 0); log_set_print_category_hex(stderr_target, 0); diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c index 23bcd57..63e8308 100644 --- a/tests/gb/bssgp_fc_test.c +++ b/tests/gb/bssgp_fc_test.c @@ -148,7 +148,7 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c index 52e986e..43fc056 100644 --- a/tests/gb/gprs_bssgp_test.c +++ b/tests/gb/gprs_bssgp_test.c @@ -298,7 +298,7 @@ osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); msgb_talloc_ctx_init(ctx, 0); diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index 37719a9..cc1b2f1 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -522,8 +522,7 @@ void *ctx = talloc_named_const(NULL, 0, "gprs_ns2_test"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); log_set_log_level(osmo_stderr_target, LOGL_INFO); diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index e8e8b80..454a29e 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -906,11 +906,9 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); - osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); - - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); + osmo_signal_register_handler(SS_L_NS, &test_signal, NULL); setlinebuf(stdout); diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index f84072c..3d7ea40 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -749,7 +749,7 @@ { void *ctx = talloc_named_const(NULL, 0, "gsup_test"); osmo_init_logging2(ctx, &info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index d036dc5..f873958 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -77,7 +77,7 @@ stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 1); log_set_use_color(stderr_target, 0); diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c index 4a4d1f9..19378c3 100644 --- a/tests/loggingrb/loggingrb_test.c +++ b/tests/loggingrb/loggingrb_test.c @@ -64,7 +64,7 @@ ringbuf_target = log_target_create_rb(0x1000); log_add_target(ringbuf_target); log_set_all_filter(ringbuf_target, 1); - log_set_print_filename(ringbuf_target, 0); + log_set_print_filename2(ringbuf_target, LOG_FILENAME_NONE); log_set_print_category(ringbuf_target, 0); log_set_print_category_hex(ringbuf_target, 0); diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c index 0ac32ea..622912f 100644 --- a/tests/oap/oap_client_test.c +++ b/tests/oap/oap_client_test.c @@ -260,7 +260,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DLOAP,1"); diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c index 9705038..4ca52a3 100644 --- a/tests/socket/socket_sctp_test.c +++ b/tests/socket/socket_sctp_test.c @@ -222,7 +222,7 @@ ctx = talloc_named_const(NULL, 0, "socket_test_sctp"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); #ifdef HAVE_LIBSCTP diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 9619553..614db55 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -400,7 +400,7 @@ ctx = talloc_named_const(NULL, 0, "socket_test"); osmo_init_logging2(ctx, &info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/tdef/tdef_test.c b/tests/tdef/tdef_test.c index ede3082..d188eed 100644 --- a/tests/tdef/tdef_test.c +++ b/tests/tdef/tdef_test.c @@ -477,7 +477,7 @@ ctx = talloc_named_const(NULL, 0, "tdef_test.c"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c index 9c7a36e..3823ef5 100644 --- a/tests/write_queue/wqueue_test.c +++ b/tests/write_queue/wqueue_test.c @@ -72,7 +72,7 @@ log_init(&log_info, NULL); stderr_target = log_target_create_stderr(); log_add_target(stderr_target); - log_set_print_filename(stderr_target, 0); + log_set_print_filename2(stderr_target, LOG_FILENAME_NONE); log_set_print_category_hex(stderr_target, 0); log_set_print_category(stderr_target, 0); diff --git a/utils/osmo-ns-dummy.c b/utils/osmo-ns-dummy.c index ee7f591..0af1a89 100644 --- a/utils/osmo-ns-dummy.c +++ b/utils/osmo-ns-dummy.c @@ -227,8 +227,7 @@ osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_log_level(osmo_stderr_target, LOGL_INFO); msgb_talloc_ctx_init(ctx, 0); osmo_stats_init(ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifc78e1dcba5baf0b41f6ccbbbd1e3f06552d73da Gerrit-Change-Number: 22962 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:00 +0000 Subject: Change in libosmocore[master]: logging: Deprecate API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22963 ) Change subject: logging: Deprecate API log_set_print_filename ...................................................................... logging: Deprecate API log_set_print_filename Let's flag the API as deprecated so that people start using log_set_print_filename2() API instead, which has less ackward behavior implications like changing the print status of category-hex. Related: OS#5034 Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a --- M include/osmocom/core/logging.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 4361cad..01850c4 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -377,7 +377,7 @@ void log_set_print_extended_timestamp(struct log_target *target, int); void log_set_print_timestamp(struct log_target *target, int); void log_set_print_tid(struct log_target *target, int); -void log_set_print_filename(struct log_target *target, int); +void log_set_print_filename(struct log_target *target, int) OSMO_DEPRECATED("Use log_set_print_filename2() instead"); void log_set_print_filename2(struct log_target *target, enum log_filename_type lft); void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos); void log_set_print_category(struct log_target *target, int); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If9b6b322989536a12094e6105c3aabc84d8be24a Gerrit-Change-Number: 22963 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:07 +0000 Subject: Change in osmo-trx[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22987 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaa77f8a7d3f752173507afd988bd76a8aa632082 Gerrit-Change-Number: 22987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:14:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:12 +0000 Subject: Change in osmo-trx[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22988 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3cc0a92da39ab2594b3a7cefb314e2f2ecb628e2 Gerrit-Change-Number: 22988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:14:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:13 +0000 Subject: Change in osmo-trx[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22987 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: Iaa77f8a7d3f752173507afd988bd76a8aa632082 Related: OS#5034 --- M tests/CommonLibs/LogTest.cpp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/CommonLibs/LogTest.cpp b/tests/CommonLibs/LogTest.cpp index 0087070..973e5b2 100644 --- a/tests/CommonLibs/LogTest.cpp +++ b/tests/CommonLibs/LogTest.cpp @@ -61,6 +61,8 @@ log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); log_set_print_level(osmo_stderr_target, 1); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); Log(MYCAT, LOGL_FATAL, __BASE_FILE__, __LINE__).get() << "testing the logger."; Log(MYCAT, LOGL_ERROR, __BASE_FILE__, __LINE__).get() << "testing the logger."; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaa77f8a7d3f752173507afd988bd76a8aa632082 Gerrit-Change-Number: 22987 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:14 +0000 Subject: Change in osmo-trx[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22988 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I3cc0a92da39ab2594b3a7cefb314e2f2ecb628e2 --- M tests/CommonLibs/LogTest.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/CommonLibs/LogTest.cpp b/tests/CommonLibs/LogTest.cpp index 973e5b2..f203706 100644 --- a/tests/CommonLibs/LogTest.cpp +++ b/tests/CommonLibs/LogTest.cpp @@ -59,7 +59,7 @@ osmo_init_logging2(tall_ctx, &linfo); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 1); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3cc0a92da39ab2594b3a7cefb314e2f2ecb628e2 Gerrit-Change-Number: 22988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:28 +0000 Subject: Change in osmo-msc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22980 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 Gerrit-Change-Number: 22980 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:14:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:30 +0000 Subject: Change in osmo-msc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22980 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 --- M tests/db_sms/db_sms_test.c M tests/mncc/mncc_test.c M tests/msc_vlr/msc_vlr_tests.c M tests/smpp/smpp_test.c M tests/sms_queue/sms_queue_test.c 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c index 011bd51..87dd79e 100644 --- a/tests/db_sms/db_sms_test.c +++ b/tests/db_sms/db_sms_test.c @@ -518,7 +518,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_set_print_level(osmo_stderr_target, 1); diff --git a/tests/mncc/mncc_test.c b/tests/mncc/mncc_test.c index 580b479..f752cab 100644 --- a/tests/mncc/mncc_test.c +++ b/tests/mncc/mncc_test.c @@ -70,7 +70,7 @@ void *ctx = talloc_named_const(NULL, 0, "smpp_test"); osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index b311f67..56f3684 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1190,7 +1190,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DLSMS, 1, LOGL_DEBUG); diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index b7df653..d86da54 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -80,7 +80,7 @@ void *ctx = talloc_named_const(NULL, 0, "smpp_test"); osmo_init_logging2(ctx, &log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index 4918be2..f681657 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -246,7 +246,7 @@ OSMO_ASSERT(osmo_stderr_target); log_set_use_color(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DLOAP,1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4c1116aafb155b5fb216b01054332dcb91c18401 Gerrit-Change-Number: 22980 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:40 +0000 Subject: Change in osmo-bsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22981 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d48c0c0aa46065560a020369e3b0544385f173e Gerrit-Change-Number: 22981 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:14:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:47 +0000 Subject: Change in osmo-bsc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22982 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4e0eb8842333c89d15fb6728a34716ea1eb4935d Gerrit-Change-Number: 22982 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:14:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:49 +0000 Subject: Change in osmo-bsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22981 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I4d48c0c0aa46065560a020369e3b0544385f173e Related: OS#5034 --- M tests/acc/acc_test.c M tests/subscr/bsc_subscr_test.c 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c index 73757c7..759ff13 100644 --- a/tests/acc/acc_test.c +++ b/tests/acc/acc_test.c @@ -495,7 +495,8 @@ tall_bsc_ctx = talloc_named_const(NULL, 0, "gsm0408_test"); osmo_init_logging2(tall_bsc_ctx, &log_info); log_set_log_level(osmo_stderr_target, LOGL_INFO); - log_set_print_category_hex(osmo_stderr_target, false); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); osmo_fsm_log_addr(false); diff --git a/tests/subscr/bsc_subscr_test.c b/tests/subscr/bsc_subscr_test.c index 619d5e6..77769a1 100644 --- a/tests/subscr/bsc_subscr_test.c +++ b/tests/subscr/bsc_subscr_test.c @@ -134,6 +134,7 @@ log_set_print_filename(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); bsc_subscribers = talloc_zero(ctx, struct llist_head); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d48c0c0aa46065560a020369e3b0544385f173e Gerrit-Change-Number: 22981 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:14:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:14:50 +0000 Subject: Change in osmo-bsc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22982 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I4e0eb8842333c89d15fb6728a34716ea1eb4935d --- M tests/subscr/bsc_subscr_test.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/subscr/bsc_subscr_test.c b/tests/subscr/bsc_subscr_test.c index 77769a1..14e069d 100644 --- a/tests/subscr/bsc_subscr_test.c +++ b/tests/subscr/bsc_subscr_test.c @@ -131,7 +131,7 @@ void *ctx = talloc_named_const(NULL, 0, "bsc_subscr_test"); printf("Testing BSC subscriber core code.\n"); osmo_init_logging2(ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4e0eb8842333c89d15fb6728a34716ea1eb4935d Gerrit-Change-Number: 22982 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:15:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:15:17 +0000 Subject: Change in osmo-mgw[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/22978 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/22978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I761d2bf99aa5a009ff489584d804634e58588125 Gerrit-Change-Number: 22978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:15:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:15:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:15:18 +0000 Subject: Change in osmo-mgw[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/22978 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I761d2bf99aa5a009ff489584d804634e58588125 --- M tests/mgcp_client/mgcp_client_test.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index e2e8bf8..9f09a99 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -689,9 +689,10 @@ ctx = talloc_named_const(NULL, 1, "mgcp_client_test"); msgb_talloc_ctx_init(ctx, 0); osmo_init_logging2(ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_set_category_filter(osmo_stderr_target, DLMGCP, 1, LOGL_DEBUG); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/22978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I761d2bf99aa5a009ff489584d804634e58588125 Gerrit-Change-Number: 22978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:15:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:15:33 +0000 Subject: Change in osmo-hlr[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22975 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 Gerrit-Change-Number: 22975 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 17:15:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 17:15:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 17:15:35 +0000 Subject: Change in osmo-hlr[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/22975 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename log_set_print_category_hex(0) is added in some places since the old API used to set that internally to keep backward compatiblity. Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 --- M tests/auc/auc_test.c M tests/auc/gen_ts_55_205_test_sets/main_template.c M tests/db/db_test.c M tests/gsup/gsup_test.c M tests/mslookup/mdns_test.c M tests/mslookup/mslookup_client_mdns_test.c M tests/mslookup/mslookup_client_test.c M tests/mslookup/mslookup_test.c 8 files changed, 17 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c index c0620db..6bf2eb2 100644 --- a/tests/auc/auc_test.c +++ b/tests/auc/auc_test.c @@ -668,9 +668,13 @@ void *tall_ctx = talloc_named_const(NULL, 1, "auc_test"); osmo_init_logging2(tall_ctx, &hlr_log_info); - log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose); + log_set_print_filename2(osmo_stderr_target, + cmdline_opts.verbose ? + LOG_FILENAME_BASENAME : + LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1"); diff --git a/tests/auc/gen_ts_55_205_test_sets/main_template.c b/tests/auc/gen_ts_55_205_test_sets/main_template.c index 3fafdf5..509416a 100644 --- a/tests/auc/gen_ts_55_205_test_sets/main_template.c +++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c @@ -106,9 +106,10 @@ void *tall_ctx = talloc_named_const(NULL, 1, "test"); msgb_talloc_ctx_init(tall_ctx, 0); osmo_init_logging2(tall_ctx, &hlr_log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1"); diff --git a/tests/db/db_test.c b/tests/db/db_test.c index c1df9bf..0c68238 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -980,9 +980,13 @@ handle_options(argc, argv); osmo_init_logging2(ctx, &hlr_log_info); - log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose); + log_set_print_filename2(osmo_stderr_target, + cmdline_opts.verbose ? + LOG_FILENAME_BASENAME : + LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1"); diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 1a7bb76..88c6093 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -101,7 +101,7 @@ { ctx = talloc_named_const(NULL, 0, "gsup_test"); osmo_init_logging2(ctx, &info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c index 8a60e85..0c8be46 100644 --- a/tests/mslookup/mdns_test.c +++ b/tests/mslookup/mdns_test.c @@ -583,7 +583,7 @@ void *ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 1); log_set_print_category(osmo_stderr_target, 1); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c index 5e558b4..dc9d1d5 100644 --- a/tests/mslookup/mslookup_client_mdns_test.c +++ b/tests/mslookup/mslookup_client_mdns_test.c @@ -233,7 +233,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/mslookup/mslookup_client_test.c b/tests/mslookup/mslookup_client_test.c index 40be011..9fcb983 100644 --- a/tests/mslookup/mslookup_client_test.c +++ b/tests/mslookup/mslookup_client_test.c @@ -174,7 +174,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/tests/mslookup/mslookup_test.c b/tests/mslookup/mslookup_test.c index 1672bd0..a5efa00 100644 --- a/tests/mslookup/mslookup_test.c +++ b/tests/mslookup/mslookup_test.c @@ -73,7 +73,7 @@ ctx = talloc_named_const(NULL, 0, "main"); osmo_init_logging2(ctx, NULL); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_level(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/22975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 Gerrit-Change-Number: 22975 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 18:03:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 18:03:16 +0000 Subject: Change in osmo-cbc[master]: rest_api.c: Add missing \n in log line after error message In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23009 ) Change subject: rest_api.c: Add missing \n in log line after error message ...................................................................... rest_api.c: Add missing \n in log line after error message Change-Id: If2e9134d827891468df7ae35b89d6dfb798eb0dc --- M src/rest_api.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rest_api.c b/src/rest_api.c index 91e7d40..c70d096 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -589,7 +589,7 @@ return U_CALLBACK_COMPLETE; err: jsonstr = json_dumps(json_req, 0); - LOGP(DREST, LOGL_ERROR, "ERROR: %s (%s)", errstr, jsonstr); + LOGP(DREST, LOGL_ERROR, "ERROR: %s (%s)\n", errstr, jsonstr); free(jsonstr); json_decref(json_req); talloc_free(riop); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If2e9134d827891468df7ae35b89d6dfb798eb0dc Gerrit-Change-Number: 23009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 18:03:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 18:03:16 +0000 Subject: Change in osmo-cbc[master]: bring JSON schema in sync with reality In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23010 ) Change subject: bring JSON schema in sync with reality ...................................................................... bring JSON schema in sync with reality Change-Id: I80f394e76d8c57f367f0049ee52df02d943ad105 --- M cbc.schema.json M smscb.schema.json 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/cbc.schema.json b/cbc.schema.json index cdaab38..c4d03dc 100644 --- a/cbc.schema.json +++ b/cbc.schema.json @@ -42,7 +42,7 @@ "num_of_bcast": { "$ref": "#/definitions/number_of_broadcasts" }, "scope": { "$ref": "#/definitions/scope" }, "warning_period_sec": { "$ref": "#/definitions/warning_period_sec" }, - "smscb": { "$ref": "smscb.schema.json#definitions/smscb_message" } + "smscb_message": { "$ref": "smscb.schema.json#definitions/smscb_message" } }, "required": [ "scope", "smscb" } } diff --git a/smscb.schema.json b/smscb.schema.json index a683263..0a3273c 100644 --- a/smscb.schema.json +++ b/smscb.schema.json @@ -67,7 +67,7 @@ "dcs_class": { "$ref": "#/definitions/dcs_class" }, "data_utf8": { "type": "string" } }, - "required": [ "data" ] + "required": [ "data_utf8" ] }, "page": { "type": "string" -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I80f394e76d8c57f367f0049ee52df02d943ad105 Gerrit-Change-Number: 23010 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 19:05:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 19:05:20 +0000 Subject: Change in osmo-cbc[master]: fix encoding of CBSP cell identifiers References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23011 ) Change subject: fix encoding of CBSP cell identifiers ...................................................................... fix encoding of CBSP cell identifiers We need to use the matching enum values if we actually want to match correctly. Before this patch, the Cell List Items in CBSP were encoded wrongly. Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48 --- M src/smscb_peer_fsm.c 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/11/23011/1 diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 341c205..4e431ff 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -149,25 +149,28 @@ static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci) { switch (cci->id_discr) { - case CELL_IDENT_NO_CELL: + case CBC_CELL_ID_NONE: break; - case CELL_IDENT_WHOLE_GLOBAL: + case CBC_CELL_ID_CGI: u->global = cci->u.cgi; + printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global))); break; - case CELL_IDENT_LAC_AND_CI: + case CBC_CELL_ID_LAC_CI: u->lac_and_ci = cci->u.lac_and_ci; break; - case CELL_IDENT_CI: + case CBC_CELL_ID_CI: u->ci = cci->u.ci; break; - case CELL_IDENT_LAI: + case CBC_CELL_ID_LAI: u->lai_and_lac = cci->u.lai; break; - case CELL_IDENT_LAC: + case CBC_CELL_ID_LAC: u->lac = cci->u.lac; break; - case CELL_IDENT_BSS: + case CBC_CELL_ID_BSS: break; + default: + OSMO_ASSERT(0); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48 Gerrit-Change-Number: 23011 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 19:08:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 19:08:53 +0000 Subject: Change in osmo-cbc[master]: fix encoding of CBSP cell identifiers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23011 ) Change subject: fix encoding of CBSP cell identifiers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48 Gerrit-Change-Number: 23011 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 19:08:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 19:08:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 20 Feb 2021 19:08:55 +0000 Subject: Change in osmo-cbc[master]: fix encoding of CBSP cell identifiers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23011 ) Change subject: fix encoding of CBSP cell identifiers ...................................................................... fix encoding of CBSP cell identifiers We need to use the matching enum values if we actually want to match correctly. Before this patch, the Cell List Items in CBSP were encoded wrongly. Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48 --- M src/smscb_peer_fsm.c 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 341c205..4e431ff 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -149,25 +149,28 @@ static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci) { switch (cci->id_discr) { - case CELL_IDENT_NO_CELL: + case CBC_CELL_ID_NONE: break; - case CELL_IDENT_WHOLE_GLOBAL: + case CBC_CELL_ID_CGI: u->global = cci->u.cgi; + printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global))); break; - case CELL_IDENT_LAC_AND_CI: + case CBC_CELL_ID_LAC_CI: u->lac_and_ci = cci->u.lac_and_ci; break; - case CELL_IDENT_CI: + case CBC_CELL_ID_CI: u->ci = cci->u.ci; break; - case CELL_IDENT_LAI: + case CBC_CELL_ID_LAI: u->lai_and_lac = cci->u.lai; break; - case CELL_IDENT_LAC: + case CBC_CELL_ID_LAC: u->lac = cci->u.lac; break; - case CELL_IDENT_BSS: + case CBC_CELL_ID_BSS: break; + default: + OSMO_ASSERT(0); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Iea3e2a28573baaead308eb9c8475c6b8093d0b48 Gerrit-Change-Number: 23011 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 21:48:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 20 Feb 2021 21:48:20 +0000 Subject: Change in osmo-bts[master]: ta_control: fix Timing Advance control for SDCCH channels In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22907 ) Change subject: ta_control: fix Timing Advance control for SDCCH channels ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b Gerrit-Change-Number: 22907 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 20 Feb 2021 21:48:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 21:49:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 20 Feb 2021 21:49:52 +0000 Subject: Change in osmo-trx[master]: Add VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 20 Feb 2021 21:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 22:28:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 20 Feb 2021 22:28:59 +0000 Subject: Change in osmo-bsc[master]: abis_nm: enrich debug messages with contextual info In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20148 ) Change subject: abis_nm: enrich debug messages with contextual info ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I68f64e6cae061a49733c4885ba383d2b9b4cfca9 Gerrit-Change-Number: 20148 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 20 Feb 2021 22:28:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 20 22:32:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 20 Feb 2021 22:32:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu/GPRS_Components: work around a race condition in f_rx_rlcmac_dl_b... In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20461 ) Change subject: pcu/GPRS_Components: work around a race condition in f_rx_rlcmac_dl_block() ...................................................................... Abandoned I assume it has been already fixed by Pau. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20461 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: I8d01e153913a5441113af1866ff2897ee4a987db Gerrit-Change-Number: 20461 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Feb 20 23:31:04 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 23:31:04 +0000 Subject: Build failure of network:osmocom:nightly/orcania in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <60319bceac42b_6c892abbc860c5f83068853@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/orcania/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/orcania failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly orcania Last lines of build log: [ 26s] [ 1.572985] pci-host-generic 4010000000.pcie: ECAM ioremap failed [ 27s] [ 2.809883] sg: section 4 reloc 1 sym '_raw_write_lock_irqsave': relocation 28 out of range (0xbf009024 -> 0xc100b14c) [ 27s] [FAILED] Failed to start Load Kernel Modules. [ 37s] ### VM INTERACTION END ### [ 37s] 2nd stage started in virtual machine [ 37s] machine type: armv7l [ 37s] Linux version: 5.10.16-1-lpae #1 SMP Sat Feb 13 16:20:19 UTC 2021 (11381f3) [ 37s] Increasing log level from now on... [ 37s] [ 13.284689] sysrq: Changing Loglevel [ 37s] [ 13.285597] sysrq: Loglevel set to 4 [ 37s] Enable sysrq operations [ 38s] Setting up swapspace version 1, size = 2 GiB (2097147904 bytes) [ 38s] no label, UUID=46c78bb6-435b-4c40-9d16-409ec7e522f1 [ 38s] swapon: /dev/vda: found signature [pagesize=4096, signature=swap] [ 38s] swapon: /dev/vda: pagesize=4096, swapsize=2097152000, devsize=2097152000 [ 38s] swapon /dev/vda [ 38s] WARNING: udev not running, creating extra device nodes [ 38s] logging output to //.build.log... [ 38s] processing recipe /.build-srcdir/orcania.spec ... [ 38s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/orcania.spec build ... [ 38s] initializing rpm db... [ 38s] /usr/bin/rpmdb: error while loading shared libraries: liblua5.4.so.5: cannot open shared object file: No such file or directory [ 38s] ### VM INTERACTION START ### [ 41s] [ 17.112980] sysrq: Power Off [ 41s] [ 17.115530] reboot: Power down [ 41s] ### VM INTERACTION END ### [ 41s] [ 41s] obs-arm-6 failed "build orcania.spec" at Sat Feb 20 23:30:54 UTC 2021. [ 41s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 23:37:04 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 23:37:04 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <60319d33cea9f_6c892abbc860c5f83069591@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/ulfius failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 30s] [ 3.252346] sg: section 4 reloc 1 sym '_raw_write_lock_irqsave': relocation 28 out of range (0xbf009024 -> 0xc100b14c) [ 30s] [FAILED] Failed to start Load Kernel Modules. [ 34s] [ 7.041753] dm_bufio: section 4 reloc 169 sym '_raw_spin_lock': relocation 28 out of range (0xbf00a510 -> 0xc100afb0) [ 40s] ### VM INTERACTION END ### [ 40s] 2nd stage started in virtual machine [ 40s] machine type: armv7l [ 40s] Linux version: 5.10.16-1-lpae #1 SMP Sat Feb 13 16:20:19 UTC 2021 (11381f3) [ 40s] Increasing log level from now on... [ 40s] [ 13.725709] sysrq: Changing Loglevel [ 40s] [ 13.726608] sysrq: Loglevel set to 4 [ 40s] Enable sysrq operations [ 41s] Setting up swapspace version 1, size = 2 GiB (2097147904 bytes) [ 41s] no label, UUID=cff1f517-d8c0-40c8-9f17-3a92a81c78f7 [ 41s] swapon: /dev/vda: found signature [pagesize=4096, signature=swap] [ 41s] swapon: /dev/vda: pagesize=4096, swapsize=2097152000, devsize=2097152000 [ 41s] swapon /dev/vda [ 41s] WARNING: udev not running, creating extra device nodes [ 41s] logging output to //.build.log... [ 41s] processing recipe /.build-srcdir/ulfius.spec ... [ 41s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/ulfius.spec build ... [ 41s] initializing rpm db... [ 41s] /usr/bin/rpmdb: error while loading shared libraries: liblua5.4.so.5: cannot open shared object file: No such file or directory [ 41s] ### VM INTERACTION START ### [ 44s] [ 17.660997] sysrq: Power Off [ 44s] [ 17.663558] reboot: Power down [ 45s] ### VM INTERACTION END ### [ 45s] [ 45s] obs-arm-5 failed "build ulfius.spec" at Sat Feb 20 23:36:53 UTC 2021. [ 45s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 20 23:49:05 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 20 Feb 2021 23:49:05 +0000 Subject: Build failure of network:osmocom:nightly/sofia-sip in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <6031a00722d25_6c892abbc860c5f8307155b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/sofia-sip/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/sofia-sip failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly sofia-sip Last lines of build log: [ 25s] [ 2.501195] sg: section 4 reloc 1 sym '_raw_write_lock_irqsave': relocation 28 out of range (0xbf009024 -> 0xc100b14c) [ 25s] [FAILED] Failed to start Load Kernel Modules. [ 28s] [ 4.716033] dm_bufio: section 4 reloc 169 sym '_raw_spin_lock': relocation 28 out of range (0xbf00a510 -> 0xc100afb0) [ 34s] ### VM INTERACTION END ### [ 34s] 2nd stage started in virtual machine [ 35s] machine type: armv7l [ 35s] Linux version: 5.10.16-1-lpae #1 SMP Sat Feb 13 16:20:19 UTC 2021 (11381f3) [ 35s] Increasing log level from now on... [ 35s] [ 11.776159] sysrq: Changing Loglevel [ 35s] [ 11.776992] sysrq: Loglevel set to 4 [ 35s] Enable sysrq operations [ 35s] Setting up swapspace version 1, size = 2 GiB (2097147904 bytes) [ 35s] no label, UUID=91221406-09a4-4bfa-ba83-8e2cd0d04b3d [ 35s] swapon: /dev/vda: found signature [pagesize=4096, signature=swap] [ 35s] swapon: /dev/vda: pagesize=4096, swapsize=2097152000, devsize=2097152000 [ 35s] swapon /dev/vda [ 35s] WARNING: udev not running, creating extra device nodes [ 35s] logging output to //.build.log... [ 35s] processing recipe /.build-srcdir/sofia-sip.spec ... [ 35s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/sofia-sip.spec build ... [ 35s] initializing rpm db... [ 35s] /usr/bin/rpmdb: error while loading shared libraries: liblua5.4.so.5: cannot open shared object file: No such file or directory [ 35s] ### VM INTERACTION START ### [ 38s] [ 15.425787] sysrq: Power Off [ 38s] [ 15.428667] reboot: Power down [ 38s] ### VM INTERACTION END ### [ 39s] [ 39s] obs-arm-6 failed "build sofia-sip.spec" at Sat Feb 20 23:48:51 UTC 2021. [ 39s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Feb 21 00:11:31 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Sun, 21 Feb 2021 00:11:31 +0000 Subject: Change in osmo-trx[master]: Add VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 1: I'd rather have a hidden command, since this is only useful for debugging or testing stuff with rfds... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 21 Feb 2021 00:11:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 00:17:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 21 Feb 2021 00:17:38 +0000 Subject: Change in osmo-trx[master]: Add VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 1: > Patch Set 1: > > I'd rather have a hidden command, since this is only useful for debugging or testing stuff with rfds... ACK. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 21 Feb 2021 00:17:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 00:27:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 21 Feb 2021 00:27:11 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: Hello Jenkins Builder, Hoernchen, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 to look at the new patch set (#2). Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Add a (hidden) VTY parameter for Rx/Tx freq. shifting Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Related: SYS#4454 --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp 4 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/22942/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 00:40:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 21 Feb 2021 00:40:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 ) Change subject: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() ...................................................................... PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() Change-Id: Ife9cea132f47c528702e653ac061fa3851090a24 --- M pcu/PCU_Tests.ttcn 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/23012/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 5ab208b..1d35a55 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -501,8 +501,7 @@ * IUT that causes it to send an unreasonable Timing Advance value > 0 despite * no active TBF exists at the moment of establishment (idle mode). */ testcase TC_ta_idle_dl_tbf_ass() runs on RAW_PCU_Test_CT { - var OCT4 tlli := f_rnd_octstring(4); - var GsmRrMessage rr_imm_ass; + var GprsMS ms := valueof(t_GprsMS_def); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -512,17 +511,17 @@ /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); - f_bssgp_client_llgmm_assign(TLLI_UNUSED, tlli); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* SGSN sends some DL data, PCU will initiate Packet Downlink * Assignment on CCCH (PCH). We don't care about the payload. */ - BSSGP[0].send(ts_BSSGP_DL_UD(tlli, f_rnd_octstring(10))); - rr_imm_ass := f_pcuif_rx_imm_ass(PCU_IF_SAPI_PCH, tr_IMM_TBF_ASS(dl := true)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(10))); + f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); /* Make sure that Timing Advance is 0 (the actual value is not known yet). * As per 3GPP S 44.018, section 3.5.3.1.2, the network *shall* initiate * the procedures defined in 3GPP TS 44.060 or use the polling mechanism. */ - if (rr_imm_ass.payload.imm_ass.timing_advance != 0) { + if (ms.dl_tbf.rr_imm_ass.payload.imm_ass.timing_advance != 0) { setverdict(fail, "Timing Advance value doesn't match"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 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: Ife9cea132f47c528702e653ac061fa3851090a24 Gerrit-Change-Number: 23012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 08:48:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 21 Feb 2021 08:48:17 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/CommonLibs/trx_vty.c File CommonLibs/trx_vty.c: https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/CommonLibs/trx_vty.c at 263 PS2, Line 263: baseband frequency baseband is baseband, I'd say by definition it is centered around 0Hz. So there's not really any "baseband frequency". What you are shifting is the carrier frequency. I would suggest something like "Apply artificial offset to Rx/Tx carrier frequency". -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 21 Feb 2021 08:48:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 08:49:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 21 Feb 2021 08:49:15 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/Transceiver52M/osmo-trx.cpp File Transceiver52M/osmo-trx.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/Transceiver52M/osmo-trx.cpp at 546 PS2, Line 546: Tune freq. offset..... As this is a "hidden" feature for developers only, I would suppress printing that line if "freq_offset == 0". The normal user is just likely going to be confused what this is all about. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 21 Feb 2021 08:49:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 08:49:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 21 Feb 2021 08:49:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 ) Change subject: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 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: Ife9cea132f47c528702e653ac061fa3851090a24 Gerrit-Change-Number: 23012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 21 Feb 2021 08:49:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 08:51:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 21 Feb 2021 08:51:31 +0000 Subject: Change in osmo-bsc[master]: abis_nm: enrich debug messages with contextual info In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20148 ) Change subject: abis_nm: enrich debug messages with contextual info ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I68f64e6cae061a49733c4885ba383d2b9b4cfca9 Gerrit-Change-Number: 20148 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 21 Feb 2021 08:51:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 08:52:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 21 Feb 2021 08:52:01 +0000 Subject: Change in osmo-bts[master]: ta_control: fix Timing Advance control for SDCCH channels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22907 ) Change subject: ta_control: fix Timing Advance control for SDCCH channels ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b Gerrit-Change-Number: 22907 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 21 Feb 2021 08:52:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 11:01:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 21 Feb 2021 11:01:52 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/CommonLibs/trx_vty.c File CommonLibs/trx_vty.c: https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/CommonLibs/trx_vty.c at 263 PS2, Line 263: baseband frequency > baseband is baseband, I'd say by definition it is centered around 0Hz. [?] Makes sense, thanks! Done. https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/Transceiver52M/osmo-trx.cpp File Transceiver52M/osmo-trx.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/22942/2/Transceiver52M/osmo-trx.cpp at 546 PS2, Line 546: Tune freq. offset..... > As this is a "hidden" feature for developers only, I would suppress printing that line if "freq_offs [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 21 Feb 2021 11:01:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 21 11:01:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 21 Feb 2021 11:01:57 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: Hello Jenkins Builder, Hoernchen, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 to look at the new patch set (#3). Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Add a (hidden) VTY parameter for Rx/Tx freq. shifting Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Related: SYS#4454 --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp 4 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/22942/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 00:43:04 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 00:43:04 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23013 ) Change subject: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 ...................................................................... gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 Makes more understandable and clear what's meant in the code. Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 --- M src/gb/gprs_bssgp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/23013/1 diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 5c71699..abe5fb4 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -380,7 +380,7 @@ /* When we receive a BVC-RESET PDU (at least of a PTP BVCI), the BSS * informs us about its RAC + Cell ID, so we can create a mapping */ - if (bctx->is_sgsn && bvci != 0 && bvci != 1) { + if (bctx->is_sgsn && bvci != BVCI_SIGNALLING && bvci != BVCI_PTM) { if (!TLVP_PRES_LEN(tp, BSSGP_IE_CELL_ID, 8)) { LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx RESET " "missing mandatory IE\n", bvci); @@ -394,7 +394,7 @@ } /* Acknowledge the RESET to the BTS */ - if (bvci == 0 || bvci == 1 || bctx->is_sgsn) + if (bvci == BVCI_SIGNALLING || bvci == BVCI_PTM || bctx->is_sgsn) bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_RESET_ACK, nsei, bvci, ns_bvci); else -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 Gerrit-Change-Number: 23013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 00:43:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 00:43:13 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: add support for SGSN oriented RESET In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22945 ) Change subject: gprs_bssgp: add support for SGSN oriented RESET ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 22 Feb 2021 00:43:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 01:11:07 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 01:11:07 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23014 ) Change subject: gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN ...................................................................... gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN Related: SYS#5354 Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 --- M src/gprs_bssgp_pcu.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/23014/1 diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 9f0afe8..deb7711 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -415,6 +415,7 @@ struct tlv_parsed tp; enum bssgp_pdu_type pdu_type = (enum bssgp_pdu_type) bgph->pdu_type; uint16_t ns_bvci = msgb_bvci(msg), nsei = msgb_nsei(msg); + uint16_t bvci; int data_len; int rc = 0; struct bssgp_bvc_ctx *bctx; @@ -456,6 +457,13 @@ } if (pdu_type == BSSGP_PDUT_BVC_RESET) { + if (ns_bvci != BVCI_SIGNALLING || !TLVP_PRESENT(&tp, BSSGP_IE_BVCI)) + return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg); + + bvci = tlvp_val16be(&tp, BSSGP_IE_BVCI); + if (bvci != the_pcu->bssgp.bctx->bvci) + return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, NULL, msg); + return bssgp_rcvmsg(msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 Gerrit-Change-Number: 23014 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 01:11:08 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 01:11:08 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: add comments to the pcu states References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23015 ) Change subject: gprs_bssgp_pcu: add comments to the pcu states ...................................................................... gprs_bssgp_pcu: add comments to the pcu states Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 --- M src/gprs_bssgp_pcu.h 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/23015/1 diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index db77cbb..6c6de1d 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -53,10 +53,14 @@ struct osmo_timer_list bvc_timer; + /* state: is the NSVC unblocked? */ int nsvc_unblocked; + /* state: true if bvc signalling needs to be reseted or waiting for reset ack */ int bvc_sig_reset; + /* state: true if bvc ptp needs to be reseted or waiting for reset ack */ int bvc_reset; + /* state: true if bvc ptp is unblocked */ int bvc_unblocked; /* Flow control */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 Gerrit-Change-Number: 23015 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 01:11:16 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 01:11:16 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originate... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22946 ) Change subject: gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originated BSSGP-RESET ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 Gerrit-Change-Number: 22946 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 22 Feb 2021 01:11:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 01:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 01:13:13 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originate... In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22946 to look at the new patch set (#3). Change subject: gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originated BSSGP-RESET ...................................................................... gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originated BSSGP-RESET Use primitives instead of parsing the message a second time. Set bctx->is_sgsn to false to allow the BSSGP layer to send back a RESET_ACK with cell information. Related: OS#3879 Depends: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 (libosmocore) Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 --- M src/gprs_bssgp_pcu.c 1 file changed, 35 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/22946/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 Gerrit-Change-Number: 22946 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 01:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 01:13:13 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/23014 ) Change subject: gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN ...................................................................... gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN Related: OS#3879 Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 --- M src/gprs_bssgp_pcu.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/23014/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 Gerrit-Change-Number: 23014 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 01:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 01:13:13 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: add comments to the pcu states In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/23015 ) Change subject: gprs_bssgp_pcu: add comments to the pcu states ...................................................................... gprs_bssgp_pcu: add comments to the pcu states Related: OS#3879 Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 --- M src/gprs_bssgp_pcu.h 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/23015/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 Gerrit-Change-Number: 23015 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 22 01:44:56 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 22 Feb 2021 01:44:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60330ca6855bd_6c892abbc860c5f83241649@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 85s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 85s] [COMPILING libboard/qmod/source/card_pres.c] [ 85s] [COMPILING libboard/qmod/source/wwan_led.c] [ 85s] [COMPILING libboard/qmod/source/i2c.c] [ 85s] [COMPILING libboard/qmod/source/board_qmod.c] [ 85s] [COMPILING apps/dfu/main.c] [ 85s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 85s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 85s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 86s] Memory region Used Size Region Size %age Used [ 86s] rom: 16588 B 16 KB 101.25% [ 86s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 86s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 86s] collect2: error: ld returned 1 exit status [ 86s] % [ 86s] make[2]: *** [Makefile:234: flash] Error 1 [ 86s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 86s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 86s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 86s] dh_auto_build: error: make -j1 returned exit code 2 [ 86s] make: *** [debian/rules:16: build] Error 25 [ 86s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 86s] ### VM INTERACTION START ### [ 89s] [ 82.607111] sysrq: Power Off [ 89s] [ 82.609255] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] build74 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 22 01:44:54 UTC 2021. [ 89s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Feb 22 01:48:56 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 22 Feb 2021 01:48:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60330d97436a1_6c892abbc860c5f8324179d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 115s] [COMPILING apps/dfu/main.c] [ 115s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 115s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 115s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 115s] Memory region Used Size Region Size %age Used [ 115s] rom: 16580 B 16 KB 101.20% [ 115s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 115s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 115s] collect2: error: ld returned 1 exit status [ 115s] % [ 115s] make[2]: *** [Makefile:234: flash] Error 1 [ 115s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 115s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 115s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 115s] dh_auto_build: error: make -j1 returned exit code 2 [ 115s] make: *** [debian/rules:16: build] Error 25 [ 115s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 115s] ### VM INTERACTION START ### [ 118s] [ 108.457533] sysrq: Power Off [ 118s] [ 108.461996] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] sheep86 failed "build simtrace2_0.7.0.70.657c.dsc" at Mon Feb 22 01:48:51 UTC 2021. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 22 02:05:09 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 02:05:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 ) Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... pcu: add TC_sns_so_bvc_reset_unknown_bvci Do an SGSN oriented reset of signalling BVCI, then the SGSN tries to reset an unknown BVCI. Related: OS#3879 Change-Id: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/23016/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index c4f6b6e..fabe06c 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -17,6 +17,7 @@ import from NS_Emulation all; import from NS_Types all; import from RAW_NS all; +import from BSSGP_Types all; /********************************************************************************** * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) @@ -246,6 +247,38 @@ f_clean_ns_codec(); } +/* do an SGSN oriented reset of signalling BVCI, then the SGSN tries to reset an unknown BVCI. */ +testcase TC_sns_so_bvc_reset_unknown_bvci() runs on RAW_Test_CT { + f_init_ns_codec(mp_nsconfig); + f_init_pcuif(); + f_incoming_sns_size(); + f_incoming_sns_config(); + f_outgoing_sns_config(); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + /* Expect BVC-RESET, but ignore it to prevent a race condition of BVC RESETs */ + var template PDU_NS pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, 0, omit)); + f_ns_exp(pdu, idx := 0); + /* SGSN originated BVC-RESET on an uninitialized sign BVC */ + f_tx_bvc_reset_rx_ack(0, omit, omit, idx := 0); + + /* Expect BVC-RESET PTP BVC, but ignore it to prevent a race condition of BVC RESETs */ + pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id)); + f_ns_exp(pdu); + + /* Send a BVC-RESET on the wrong BVC */ + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, mp_gb_cfg.bvc[0].bvci + 1, + omit)); + NSCP[0].send(ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))); + NSCP[0].receive(tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BSSGP_STATUS(mp_gb_cfg.bvc[0].bvci + 1, BSSGP_CAUSE_BVCI_UNKNOWN, *))); + setverdict(pass); + + f_clean_ns_codec(); +} + /* Test adding new IP endpoints at runtime */ testcase TC_sns_add() runs on RAW_Test_CT { f_sns_bringup_1c1u(); @@ -328,6 +361,7 @@ execute( TC_sns_1c1u_separate() ); execute( TC_sns_1c1u_so_bvc_reset() ); execute( TC_sns_1c1u_so_bvc_reset_too_early() ); + execute( TC_sns_so_bvc_reset_unknown_bvci() ); execute( TC_sns_add() ); execute( TC_sns_add_nack() ); execute( TC_sns_del() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 02:05:25 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 02:05:25 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originate... In-Reply-To: References: Message-ID: Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/22946 to look at the new patch set (#4). Change subject: gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originated BSSGP-RESET ...................................................................... gprs_bssgp_pcu: rework BSSGP Reset messages to support SGSN originated BSSGP-RESET Use primitives instead of parsing the message a second time. Set bctx->is_sgsn to false to allow the BSSGP layer to send back a RESET_ACK with cell information. Related: OS#3879 Depends: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 (libosmocore) Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 --- M src/gprs_bssgp_pcu.c 1 file changed, 34 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/22946/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3afaf826798e362270ffa622c24bfd124ef25cd1 Gerrit-Change-Number: 22946 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 02:05:25 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 02:05:25 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 to look at the new patch set (#3). Change subject: gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN ...................................................................... gprs_bssgp_pdu: ensure only known BVCI can be resetted by the SGSN Related: OS#3879 Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 --- M src/gprs_bssgp_pcu.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/23014/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 Gerrit-Change-Number: 23014 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 02:05:38 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 02:05:38 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 to look at the new patch set (#4). Change subject: gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN ...................................................................... gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN Related: OS#3879 Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 --- M src/gprs_bssgp_pcu.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/23014/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 Gerrit-Change-Number: 23014 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 02:05:38 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 22 Feb 2021 02:05:38 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: add comments to the pcu states In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23015 to look at the new patch set (#4). Change subject: gprs_bssgp_pcu: add comments to the pcu states ...................................................................... gprs_bssgp_pcu: add comments to the pcu states Related: OS#3879 Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 --- M src/gprs_bssgp_pcu.h 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/23015/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 Gerrit-Change-Number: 23015 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Feb 22 03:50:20 2021 From: admin at opensuse.org (OBS Notification) Date: Mon, 22 Feb 2021 03:50:20 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60332a085d136_6c892abbc860c5f83245432@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 409s] building additional files... [ 409s] checking if compiling is necessary... [ 409s] the output file doesn't exist [ 409s] pdflatex -interaction=batchmode test-usermanual.tex [ 409s] pdflatex failed [ 409s] test-usermanual.tex:525: pdfTeX error (ext4): \pdfendlink ended up in different nesting level than \pdfstartlink. [ 409s] test-usermanual.tex:525: leading text: {\bf E [ 409s] [ 409s] A possible reason for transformation failure is invalid DocBook [ 409s] (as reported by xmllint) [ 409s] [ 409s] Error: pdflatex compilation failed [ 409s] [ 409s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 409s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 409s] make[2]: *** [Makefile:440: all-recursive] Error 1 [ 409s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 409s] make[1]: *** [Makefile:364: all] Error 2 [ 409s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 409s] dh_auto_build: error: make -j1 returned exit code 2 [ 409s] make: *** [debian/rules:5: binary] Error 25 [ 409s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 409s] ### VM INTERACTION START ### [ 411s] Powering off. [ 411s] [ 394.035637] reboot: Power down [ 411s] ### VM INTERACTION END ### [ 411s] [ 411s] lamb17 failed "build osmo-gsm-manuals-dev_1.0.0.dsc" at Mon Feb 22 03:50:07 UTC 2021. [ 411s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:57:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Feb 2021 08:57:29 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... jenkins-common.sh: add common clean up trap Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning of the jenkins.sh files. Move the common clean up code from the end of every jenkins.sh file into clean_up_common(), which gets called by the trap. Add a custom clean_up() function to those jenkins.sh files that need additional clean up. Replace explicit container stop commands (for containers attached to the docker network) with one call to network_clean() in clean_up_common(). It kills all containers attached to the docker network. The motivation for this change is the upcoming optional build of initrd and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a short smoke test will be performed to make sure we can boot the kernel and initrd, before continuing to run the entire testsuite against it. If building or the smoke test fails, we must do a proper clean up of the network and fix permissions. Related: OS#3208 Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 24 files changed, 92 insertions(+), 171 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/23001/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:57:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Feb 2021 08:57:29 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23002 to look at the new patch set (#2). Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... */jenkins.sh: set -e after setting clean up trap Abort the script and trigger the clean up script, whenever any of the commands below to prepare the testsuite are failing. This saves time with figuring out why suddenly all or most tests are failing, and avoids running the entire testsuite on jenkins if it's obviously not going to work. Related: OS#3208 Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 --- M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 23 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/02/23002/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:57:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Feb 2021 08:57:29 +0000 Subject: Change in docker-playground[master]: jenkins-common: put fix_perms() in clean_up_common In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23003 to look at the new patch set (#2). Change subject: jenkins-common: put fix_perms() in clean_up_common ...................................................................... jenkins-common: put fix_perms() in clean_up_common Don't call fix_perms from collect_logs anymore, it looks like it was only added there to avoid adding it at the end of each jenkins.sh. Now that we have clean_up_common, put it there. Related: OS#3208 Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/23003/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 Gerrit-Change-Number: 23003 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:57:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Feb 2021 08:57:29 +0000 Subject: Change in docker-playground[master]: osmo-ggsn-master: add configure --enable-gtp-linux In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23004 to look at the new patch set (#2). Change subject: osmo-ggsn-master: add configure --enable-gtp-linux ...................................................................... osmo-ggsn-master: add configure --enable-gtp-linux Related: OS#3208 Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 --- M osmo-ggsn-master/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/04/23004/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 Gerrit-Change-Number: 23004 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:57:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Feb 2021 08:57:29 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23005 to look at the new patch set (#3). Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... ttcn3-ggsn-test: add kernel test Make it possible to run ttcn3-ggsn-test against osmo-ggsn with the GTP kernel module. This feature is enabled by environment variables explained in ttcn3-ggsn-test/jenkins.sh, and can either use the pre-built kernel from Debian, or build a kernel from source. The kernel runs inside QEMU inside the usual osmo-ggsn-master docker image. Thanks to Pau for providing the kernel config and kernel-test scripts that this patch is based on! I ended up modifying them quite a bit to fit the docker use case, and to build the initrd (so we can use the stock debian kernel). Related: OS#3208 Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d --- M .gitignore M jenkins-common.sh M osmo-ggsn-latest/Dockerfile M osmo-ggsn-master/Dockerfile A scripts/kernel-test/initrd-build.sh A scripts/kernel-test/initrd-init.sh A scripts/kernel-test/kernel-build.sh A scripts/kernel-test/prepare.sh A scripts/kernel-test/qemu-ifdown.sh A scripts/kernel-test/qemu-ifup.sh A scripts/kernel-test/run-qemu.sh A ttcn3-ggsn-test/initrd-ggsn.sh M ttcn3-ggsn-test/jenkins.sh A ttcn3-ggsn-test/kernel-config A ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 15 files changed, 5,267 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/23005/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:57:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 22 Feb 2021 08:57:56 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/23001/1/nplab-m3ua-test/jenkins.sh File nplab-m3ua-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23001/1/nplab-m3ua-test/jenkins.sh at a38 PS1, Line 38: doc > where does this command disappear to? I can see the network_remove and collect_logs being present i [?] I've extended the commit message: Replace explicit container stop commands (for containers attached to the docker network) with one call to network_clean() in clean_up_common(). It kills all containers attached to the docker network. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 08:57:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 08:58:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 08:58:11 +0000 Subject: Change in libosmocore[master]: CBSP: fix encoding/decoding of keep-alive repetition period References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23017 ) Change subject: CBSP: fix encoding/decoding of keep-alive repetition period ...................................................................... CBSP: fix encoding/decoding of keep-alive repetition period Even though the value is only between 0..120s, they didn't encode it 1:1 in the uint8_t, but 3GPP chose to use the same encoding as for the warning period (which has a much larger range). Let's fix this in our implementation. Before this patch, osmo-cbc wanted to send 30s keep-alive repetition period, but a spec-compliant receiver actually decoded this as 80s. Change-Id: I04baa6b6b99b092fa0512b3b6138a363c7f3a13d --- M src/gsm/cbsp.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/23017/1 diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index 2c7a7b7..fa599c5 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -352,7 +352,12 @@ /* 8.1.3.18a KEEP ALIVE */ static int cbsp_enc_keep_alive(struct msgb *msg, const struct osmo_cbsp_keep_alive *in) { - msgb_tv_put(msg, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, in->repetition_period); + int rperiod = encode_wperiod(in->repetition_period); + if (in->repetition_period > 120) + return -EINVAL; + if (rperiod < 0) + return -EINVAL; + msgb_tv_put(msg, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, rperiod); return 0; } @@ -1083,12 +1088,14 @@ static int cbsp_dec_keep_alive(struct osmo_cbsp_keep_alive *out, const struct tlv_parsed *tp, struct msgb *in, void *ctx) { + uint8_t rperiod; if (!TLVP_PRES_LEN(tp, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, 1)) { osmo_cbsp_errstr = "missing/short mandatory IE"; return -EINVAL; } - out->repetition_period = *TLVP_VAL(tp, CBSP_IEI_KEEP_ALIVE_REP_PERIOD); + rperiod = *TLVP_VAL(tp, CBSP_IEI_KEEP_ALIVE_REP_PERIOD); + out->repetition_period = decode_wperiod(rperiod); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04baa6b6b99b092fa0512b3b6138a363c7f3a13d Gerrit-Change-Number: 23017 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:06:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:06:23 +0000 Subject: Change in libosmocore[master]: CBSP: Fix encoding of warning period References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23018 ) Change subject: CBSP: Fix encoding of warning period ...................................................................... CBSP: Fix encoding of warning period The warning period encoding was wrong, resulting in way too short warning periods being encoded than intended/specified by the caller. Change-Id: Idf3cae48a6ab45550d7bbd937bb49a0e1a4e8aed --- M src/gsm/cbsp.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/23018/1 diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index fa599c5..353f53f 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -130,13 +130,13 @@ if (secs <= 10) return secs; if (secs <= 30) - return (secs-10)/2; + return 10 + (secs-10)/2; if (secs <= 120) - return (secs-30)/5; + return 30 + (secs-30)/5; if (secs <= 600) - return (secs-120)/10; + return 120 + (secs-120)/10; if (secs <= 60*60) - return (secs-600)/30; + return 600 + (secs-600)/30; osmo_cbsp_errstr = "warning period out of range"; return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf3cae48a6ab45550d7bbd937bb49a0e1a4e8aed Gerrit-Change-Number: 23018 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:25:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:25:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 ) Change subject: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 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: Ife9cea132f47c528702e653ac061fa3851090a24 Gerrit-Change-Number: 23012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:25:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:25:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:25:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 ) Change subject: PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() ...................................................................... PCU_Tests: make use of GprsMS in TC_ta_idle_dl_tbf_ass() Change-Id: Ife9cea132f47c528702e653ac061fa3851090a24 --- M pcu/PCU_Tests.ttcn 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 5ab208b..1d35a55 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -501,8 +501,7 @@ * IUT that causes it to send an unreasonable Timing Advance value > 0 despite * no active TBF exists at the moment of establishment (idle mode). */ testcase TC_ta_idle_dl_tbf_ass() runs on RAW_PCU_Test_CT { - var OCT4 tlli := f_rnd_octstring(4); - var GsmRrMessage rr_imm_ass; + var GprsMS ms := valueof(t_GprsMS_def); /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -512,17 +511,17 @@ /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); - f_bssgp_client_llgmm_assign(TLLI_UNUSED, tlli); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); /* SGSN sends some DL data, PCU will initiate Packet Downlink * Assignment on CCCH (PCH). We don't care about the payload. */ - BSSGP[0].send(ts_BSSGP_DL_UD(tlli, f_rnd_octstring(10))); - rr_imm_ass := f_pcuif_rx_imm_ass(PCU_IF_SAPI_PCH, tr_IMM_TBF_ASS(dl := true)); + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(10))); + f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); /* Make sure that Timing Advance is 0 (the actual value is not known yet). * As per 3GPP S 44.018, section 3.5.3.1.2, the network *shall* initiate * the procedures defined in 3GPP TS 44.060 or use the polling mechanism. */ - if (rr_imm_ass.payload.imm_ass.timing_advance != 0) { + if (ms.dl_tbf.rr_imm_ass.payload.imm_ass.timing_advance != 0) { setverdict(fail, "Timing Advance value doesn't match"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23012 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: Ife9cea132f47c528702e653ac061fa3851090a24 Gerrit-Change-Number: 23012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:26:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:26:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: factor-out HTTP_Adapter.ttcn References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 ) Change subject: remsim: factor-out HTTP_Adapter.ttcn ...................................................................... remsim: factor-out HTTP_Adapter.ttcn There are other test suites (like osmo-cbc) which can reuse some of the HTTP utility code that was developed within the remsim test suite Change-Id: I87a728272d47649e4faa628fad44d6f8673c8169 --- A library/HTTP_Adapter.ttcn M remsim/RemsimServer_Tests.ttcn M remsim/gen_links.sh 3 files changed, 103 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/23019/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn new file mode 100644 index 0000000..a9d0d83 --- /dev/null +++ b/library/HTTP_Adapter.ttcn @@ -0,0 +1,101 @@ +module HTTP_Adapter { + +/* HTTP Adapter component, originally part of Integration Tests for osmo-remsim-server + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This test suite tests osmo-remsim-server by attaching to the external interfaces + * such as RSPRO for simulated clients + bankds and RSRES (REST backend interface). + */ + +import from HTTPmsg_Types all; +import from HTTPmsg_PortType all; + +type component http_CT { + port HTTPmsg_PT HTTP; + var charstring g_http_host; + var integer g_http_port; +}; + +function f_http_init(charstring host, integer http_port) runs on http_CT { + map(self:HTTP, system:HTTP); + g_http_host := host; + g_http_port := http_port; +} + +template (value) Connect ts_HTTP_Connect(template (value) charstring hostname, + template (value) integer http_port := 80, + template (value) boolean use_ssl := false) := { + hostname := hostname, + portnumber := http_port, + use_ssl := use_ssl +} +template (value) Close ts_HTTP_Close := { client_id := omit }; + +template (value) HeaderLines ts_HTTP_Header(charstring body) := { + { header_name := "Content-Type", header_value := "application/json" }, + { header_name := "Content-Length", header_value := int2str(lengthof(body)) } +} + +template (value) HTTPMessage ts_HTTP_Req(charstring url, + charstring method := "GET", + charstring body := "", + integer v_maj := 1, integer v_min := 1) := { + request := { + client_id := omit, + method := method, + uri := url, + version_major := v_maj, + version_minor := v_min, + header := ts_HTTP_Header(body), + body := body + } +} + +template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := { + response := { + client_id := ?, + version_major := ?, + version_minor := ?, + statuscode := sts, + statustext := ?, + header := ?, + body := ? + } +}; + +template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); + +/* run a HTTP request and return the response */ +function f_http_transact(charstring url, charstring method := "GET", + charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx) +runs on http_CT return HTTPMessage { + var HTTPMessage resp; + timer T := 2.0; + + HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); + //HTTP.receive(Connect_result:?); + HTTP.send(ts_HTTP_Req(url, method, body)); + T.start; + alt { + [] HTTP.receive(exp) -> value resp { + setverdict(pass); + } + [] HTTP.receive(tr_HTTP_Resp) -> value resp { + setverdict(fail, "Unexpected HTTP response ", resp); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for HTTP response"); + self.stop; + } + } + HTTP.send(ts_HTTP_Close); + return resp; +} + +} diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index 1ca5ce9..fd7a1a4 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -24,90 +24,9 @@ import from HTTPmsg_Types all; import from HTTPmsg_PortType all; +import from HTTP_Adapter all; import from JSON_Types all; -type component http_CT { - port HTTPmsg_PT HTTP; - var charstring g_http_host; - var integer g_http_port; -}; - -function f_http_init(charstring host, integer http_port) runs on http_CT { - map(self:HTTP, system:HTTP); - g_http_host := host; - g_http_port := http_port; -} - -template (value) Connect ts_HTTP_Connect(template (value) charstring hostname, - template (value) integer http_port := 80, - template (value) boolean use_ssl := false) := { - hostname := hostname, - portnumber := http_port, - use_ssl := use_ssl -} -template (value) Close ts_HTTP_Close := { client_id := omit }; - -template (value) HeaderLines ts_HTTP_Header(charstring body) := { - { header_name := "Content-Type", header_value := "application/json" }, - { header_name := "Content-Length", header_value := int2str(lengthof(body)) } -} - -template (value) HTTPMessage ts_HTTP_Req(charstring url, - charstring method := "GET", - charstring body := "", - integer v_maj := 1, integer v_min := 1) := { - request := { - client_id := omit, - method := method, - uri := url, - version_major := v_maj, - version_minor := v_min, - header := ts_HTTP_Header(body), - body := body - } -} - -template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := { - response := { - client_id := ?, - version_major := ?, - version_minor := ?, - statuscode := sts, - statustext := ?, - header := ?, - body := ? - } -}; - -template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); - -/* run a HTTP request and return the response */ -function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx) -runs on http_CT return HTTPMessage { - var HTTPMessage resp; - timer T := 2.0; - - HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); - //HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body)); - T.start; - alt { - [] HTTP.receive(exp) -> value resp { - setverdict(pass); - } - [] HTTP.receive(tr_HTTP_Resp) -> value resp { - setverdict(fail, "Unexpected HTTP response ", resp); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for HTTP response"); - self.stop; - } - } - HTTP.send(ts_HTTP_Close); - return resp; -} - /* run a HTTP GET on specified URL expecting json in RSRES format as response */ function f_rsres_get(charstring url, template integer exp_sts := 200) runs on http_CT return JsRoot { diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index 995abfb..b25375b 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -42,6 +42,7 @@ FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn " #RSL_Types.ttcn RSL_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="HTTP_Adapter.ttcn " FILES+="VPCD_Types.ttcn VPCD_CodecPort.ttcn VPCD_CodecPort_CtrlFunct.ttcn VPCD_CodecPort_CtrlFunctDef.cc VPCD_Adapter.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 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: I87a728272d47649e4faa628fad44d6f8673c8169 Gerrit-Change-Number: 23019 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:26:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:26:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: Make timeout configurable References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 ) Change subject: HTTP_Adapter: Make timeout configurable ...................................................................... HTTP_Adapter: Make timeout configurable Change-Id: Icdcba367dc12c0f20a733572da250d7db22c03ee --- M library/HTTP_Adapter.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/23020/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index a9d0d83..03de1f3 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -73,10 +73,11 @@ /* run a HTTP request and return the response */ function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx) + charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, + float tout := 2.0) runs on http_CT return HTTPMessage { var HTTPMessage resp; - timer T := 2.0; + timer T := tout; HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); //HTTP.receive(Connect_result:?); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 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: Icdcba367dc12c0f20a733572da250d7db22c03ee Gerrit-Change-Number: 23020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:26:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:26:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 ) Change subject: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() ...................................................................... HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() There are some use cases in which we don't want a blocking wait for the full HTTP request to complete. Let's split it up in two parts, and make the existing f_http_transact() a wrapper around them. Also, enable the generation of the Connect_result primitive to detect connection failures. Change-Id: I5c7575c0b58c3606d25d8f8cfccd47cfb7a8c400 --- M library/HTTP_Adapter.ttcn M remsim/REMSIM_Tests.default 2 files changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/23021/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index 03de1f3..a957fdd 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -71,17 +71,17 @@ template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); -/* run a HTTP request and return the response */ -function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, - float tout := 2.0) +function f_http_tx_request(charstring url, charstring method := "GET", charstring body := "") +runs on http_CT { + HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); + HTTP.receive(Connect_result:?); + HTTP.send(ts_HTTP_Req(url, method, body)); +} + +function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0) runs on http_CT return HTTPMessage { var HTTPMessage resp; timer T := tout; - - HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); - //HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body)); T.start; alt { [] HTTP.receive(exp) -> value resp { @@ -99,4 +99,13 @@ return resp; } +/* run a HTTP request and return the response */ +function f_http_transact(charstring url, charstring method := "GET", + charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, + float tout := 2.0) +runs on http_CT return HTTPMessage { + f_http_tx_request(url, method, body); + return f_http_rx_response(exp, tout); +} + } diff --git a/remsim/REMSIM_Tests.default b/remsim/REMSIM_Tests.default index 7a41555..3059a8d 100644 --- a/remsim/REMSIM_Tests.default +++ b/remsim/REMSIM_Tests.default @@ -1,3 +1,3 @@ [TESTPORT_PARAMETERS] system.HTTP.http_debugging := "yes" -system.HTTP.use_notification_ASPs := "no" +system.HTTP.use_notification_ASPs := "yes" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 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: I5c7575c0b58c3606d25d8f8cfccd47cfb7a8c400 Gerrit-Change-Number: 23021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:26:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:26:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cbc: Initial set of CBC tess for osmo-cbc References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 ) Change subject: cbc: Initial set of CBC tess for osmo-cbc ...................................................................... cbc: Initial set of CBC tess for osmo-cbc osmo-cbc is the Osmocom cell broadcast centre. So far, there was no TTCN-3 test suite. Let's change that. Change-Id: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f --- M Makefile A cbc/CBC_Tests.cfg A cbc/CBC_Tests.default A cbc/CBC_Tests.ttcn A cbc/ECBE_Types.ttcn A cbc/SABP_Selftest.ttcn A cbc/gen_links.sh A cbc/regen_makefile.sh M library/CBSP_Templates.ttcn M library/CBSP_Types.ttcn M library/SABP_Adapter.ttcn 11 files changed, 929 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/23022/1 diff --git a/Makefile b/Makefile index 2510e28..319cb87 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS=bsc bsc-nat bts ccid fr fr-net gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ +SUBDIRS=bsc bsc-nat bts cbc ccid fr fr-net gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ sccp selftest sgsn simtrace sip stp sysinfo smlc NPROC=$(shell nproc 2>/dev/null) diff --git a/cbc/CBC_Tests.cfg b/cbc/CBC_Tests.cfg new file mode 100644 index 0000000..7c2a3ac --- /dev/null +++ b/cbc/CBC_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./CBC_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +CBC_Tests.control diff --git a/cbc/CBC_Tests.default b/cbc/CBC_Tests.default new file mode 100644 index 0000000..48fe83d --- /dev/null +++ b/cbc/CBC_Tests.default @@ -0,0 +1,12 @@ +[LOGGING] +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; + +[TESTPORT_PARAMETERS] +*.CBCVTY.PROMPT1 := "OsmoCBC> " +*.TCP.noDelay := "yes" // turn off nagle +*.HTTP.use_notification_ASPs := "yes" + +[MODULE_PARAMETERS] +// Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoCBC"; + +[EXECUTE] diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn new file mode 100644 index 0000000..36fa55c --- /dev/null +++ b/cbc/CBC_Tests.ttcn @@ -0,0 +1,467 @@ +module CBC_Tests { + +import from Osmocom_Types all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; +import from CBSP_Types all; +import from CBSP_Templates all; +import from CBSP_Adapter all; +import from CBSP_CodecPort all; +import from Socket_API_Definitions all; + +import from HTTP_Adapter all; +import from HTTPmsg_Types all; +import from ECBE_Types all; + +modulepar { + charstring mp_cbc_host := "127.0.0.1"; + integer mp_cbc_port := 48049; + integer mp_ecbe_port := 12345; +}; + +type component test_CT extends CBSP_Adapter_CT, http_CT { +}; + +/********************************************************************************* + * ECBE (REST) interface + *********************************************************************************/ + +function f_ecbe_tx_post_cbs(EcbeCbcMessage cbc) +runs on http_CT { + var charstring body := oct2char(enc_EcbeCbcMessage(cbc)); + log("TX POST CBS: ", body); + var HTTPMessage http_resp; + f_http_tx_request(url := "/api/ecbe/v1/message", method := "POST", body := body); +} + +function f_ecbe_rx_resp(template integer exp_sts := (200..299)) +runs on http_CT return HTTPResponse { + var HTTPMessage http_resp := f_http_rx_response(tr_HTTP_Resp(exp_sts), tout := 20.0); + return http_resp.response; +} + +/* run a HTTP POST to add a new CBC message */ +function f_ecbe_post_cbs(EcbeCbcMessage cbc, template integer exp_sts := 201) +runs on http_CT return HTTPResponse { + f_ecbe_tx_post_cbs(cbc); + return f_ecbe_rx_resp(exp_sts) +} + +function f_ecbe_tx_delete_cbs(integer msg_id) +runs on http_CT { + f_http_tx_request("/api/ecbe/v1/message/" & int2str(msg_id), method := "DELETE"); +} + +/* run a HTTP GET on specified URL expecting json in RSRES format as response */ +function f_ecbe_delete_cbs(integer msg_id, template integer exp_sts := 200) +runs on http_CT return HTTPResponse { + f_ecbe_tx_delete_cbs(msg_id); + return f_ecbe_rx_resp(exp_sts); +} + + +altstep as_cbsp_reset(integer idx) runs on CBSP_Adapter_CT { + var CBSP_RecvFrom rf; + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESET)) -> value rf { + var CBSP_IE ie; + f_cbsp_find_ie(rf.msg, CBSP_IEI_CELL_LIST, ie); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], + ts_CBSP_RESET_COMPL(ie.body.cell_list.cell_id))); + } +} + +private function f_cbs2ecbe_category(CBSP_Category cat_in) return EcbeCategory +{ + select (cat_in) { + case (CBSP_CATEG_HIGH_PRIO) { return high_priority; } + case (CBSP_CATEG_BACKGROUND) { return background; } + case (CBSP_CATEG_NORMAL) { return normal; } + case else { mtc.stop } + } +} + +private function f_cbs2ecbe_page(CBS_MessageContent inp) return EcbePage +{ + return hex2str(oct2hex(inp.payload)); +} + +/* convert from CBS_Message to EcbeCbcMessage */ +function f_cbs2ecbe(CBS_Message inp, charstring cbe_name) return EcbeCbcMessage +{ + var EcbeCbcMessage ret := { + cbe_name := cbe_name, + category := f_cbs2ecbe_category(inp.category), + repetition_period := inp.rep_period, + num_of_bcast := inp.num_bcast_req, + scope := { scope_plmn := {} }, + smscb_message := { + serial_nr := { + serial_nr_encoded := inp.ser_nr + }, + message_id := inp.msg_id, + payload := { + payload_encoded := { + dcs := inp.dcs, + pages := { } /* appended below */ + } + } + } + }; + for (var integer i := 0; i < lengthof(inp.content); i := i+1) { + ret.smscb_message.payload.payload_encoded.pages := + ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; + } + return ret; +} + +/********************************************************************************* + * CBSP interface + *********************************************************************************/ + +/* receive + acknowledge KEEP-ALIVE */ +altstep as_cbsp_keepalive_ack(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_KEEP_ALIVE)) { + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], ts_CBSP_KEEP_ALIVE_COMPL)); + } +} + +/* receive + ignore RESTART */ +altstep as_cbsp_restart(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESTART)); +} + +private function f_init(boolean raw := false) runs on test_CT { + f_http_init(mp_cbc_host, mp_ecbe_port); + CBSP_Adapter.f_connect(mp_cbc_host, mp_cbc_port, "", -1); + + if (not raw) { + var BSSMAP_FIELD_CellIdentificationList cell_list := { + cIl_allInBSS := ''O + }; + activate(as_cbsp_keepalive_ack(0)); + activate(as_cbsp_restart(0)); + f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_CBS, CBSP_RI_DATA_LOST)); + f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_EMERG, CBSP_RI_DATA_LOST)); + as_cbsp_reset(0); + } +} + +/* test whether or not we receive a valid KEEP-ALIVE from the CBC */ +testcase TC_rx_keepalive() runs on test_CT { + var CBSP_PDU rx; + var CBSP_IE ie; + + f_init(); + rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); + f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); + + setverdict(pass); +} + +/* test whether CBC terminates connection if KEEP-ALIVE is not answered by BSC */ +testcase TC_rx_keepalive_timeout() runs on test_CT { + var CBSP_PDU rx; + var CBSP_IE ie; + var integer ka_rep_per_s; + + f_init(); + rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); + f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); + + /* sleep for longer than the keep-alive period */ + ka_rep_per_s := f_cbsp_period2s(ie.body.keep_alive_rep_period); + f_sleep(int2float(ka_rep_per_s + 5)); + + /* expect the CBSP connection to be closed */ + CBSP[0].receive(PortEvent:{connClosed:=?}) + + setverdict(pass); +} + +type record CBS_Message { + uint16_t msg_id, + uint16_t ser_nr, + uint16_t old_ser_nr optional, + BSSMAP_FIELD_CellIdentificationList cell_list, + uint8_t channel_ind, + CBSP_Category category, + uint16_t rep_period, + uint16_t num_bcast_req, + uint8_t dcs, + CBS_MessageContents content +}; +type record CBS_MessageContent { + octetstring payload, + uint8_t user_len +}; +type record of CBS_MessageContent CBS_MessageContents; + +/* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ +private function f_cbsp_write(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on test_CT { + var template CBSP_IEs content_ies := {}; + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + for (var integer i := 0; i < lengthof(msg.content); i := i+1) { + //content_ies[i] := tr_CbspMsgContent(msg.content[i].payload, msg.content[i].user_len); + content_ies[i] := tr_CbspMsgContent(?, ?); + } + rx_templ := tr_CBSP_WRITE_CBS(msg.msg_id, msg.ser_nr, msg.cell_list, msg.channel_ind, + msg.category, msg.rep_period, msg.num_bcast_req, msg.dcs, + content_ies); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; + if (istemplatekind(tx_cell_list, "omit")) { + /* use the "expected list" when confirming the write-replace */ + tx_list := msg.cell_list; + } else { + /* use an user-provided different list of cells */ + tx_list := valueof(tx_cell_list); + } + if (istemplatekind(tx_compl_list, "omit")) { + tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); + } else { + tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, + valueof(tx_compl_list), tx_list, + msg.channel_ind); + } + } else { + tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), + omit, tx_cell_list, msg.channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +/* handle a CBSP-KILL and respond to it with COMPLETE or FAILURE depending on arguments */ +private function f_cbsp_handle_kill(integer idx, uint16_t msg_id, uint16_t ser_nr, + template BSSMAP_FIELD_CellIdentificationList exp_list, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_list, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit, + template (omit) uint8_t channel_ind := omit) +runs on test_CT { + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + + rx_templ := tr_CBSP_KILL(msg_id, ser_nr, exp_list, channel_ind); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + tx := ts_CBSP_KILL_COMPL(msg_id, ser_nr, tx_compl_list, tx_list, channel_ind); + } else { + tx := ts_CBSP_KILL_FAIL(msg_id, ser_nr, valueof(tx_fail_list), tx_compl_list, + tx_list, channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +private const BSSMAP_FIELD_CellIdentificationList cil_BSS := { + cIl_allInBSS := ''O +}; + +testcase TC_write_replace() runs on test_CT { + f_init(); + var CBS_Message msg := { + msg_id := 42, + ser_nr := 16752, + old_ser_nr := omit, + cell_list := cil_BSS, + channel_ind := 0, + category := CBSP_CATEG_NORMAL, + rep_period := 5, + num_bcast_req := 3, + dcs := 1, + content := { + { '00'O, 1 } + } + }; + f_cbsp_write(msg); + f_sleep(100.0); +} + +testcase TC_selftest() runs on test_CT { + const octetstring c_load_q := '0700000d0400080000f110012345671200'O; + const octetstring c_load_q_compl := '0800000f0a000a0000f1100123456700001200'O; + const octetstring c_reset := '1000000b0400080000f11001234567'O; + const octetstring c_reset_compl := '1100000b0400080000f11001234567'O; + const octetstring c_msg_sts_q := '0a0000130e022b0200000400080000f110012345671200'O; + const octetstring c_msg_sts_q_fail := '0c0000140e022b0200000900090000f11001234567021200'O; + const octetstring c_kill := '040000110e00000200000400080000f11001234567'O; + const octetstring c_kill_fail := '060000120e00000200000900090000f1100123456702'O; + const octetstring c_write_repl := '010000c70e022b0300300400080000f110012345671200050006000407000613020c400107f4f29c9e769f5de337b90c921d1b8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d100'O; + const octetstring c_write_repl_compl := '020000130e022b0300300400080000f110012345671200'O; + const octetstring c_write_repl_fail := '030000140e022b0300300900090000f110012345670d1200'O; + const octetstring c_msg_s_q := '0a0000130e022b0200900400080000f110012345671200'O; + const octetstring c_msg_s_q_compl := '0b0000160e022b02009008000b0000f110012345670008001200'O; + const octetstring c_kill_compl := '050000160e022b02008008000b0000f110012345670006001200'O; + + log(dec_CBSP_PDU(c_load_q)); + log(dec_CBSP_PDU(c_load_q_compl)); + log(dec_CBSP_PDU(c_reset)); + log(dec_CBSP_PDU(c_reset_compl)); + log(dec_CBSP_PDU(c_msg_sts_q)); + log(dec_CBSP_PDU(c_msg_sts_q_fail)); + log(dec_CBSP_PDU(c_kill)); + log(dec_CBSP_PDU(c_kill_fail)); + log(dec_CBSP_PDU(c_write_repl)); + log(dec_CBSP_PDU(c_write_repl_compl)); + log(dec_CBSP_PDU(c_write_repl_fail)); + log(dec_CBSP_PDU(c_msg_s_q)); + log(dec_CBSP_PDU(c_msg_s_q_compl)); + log(dec_CBSP_PDU(c_kill_compl)); +} + +import from SABP_Types all; +import from SABP_Templates all; +import from SABP_IEs all; +import from SABP_PDU_Descriptions all; + +testcase TC_selftest_sabp() runs on test_CT { + const octetstring c_write := '00000080930000080006000211120007000240c0000f0010000113f0030282ec0613f0030282ec070001400100000d0002012a000900020000000400010100000056029f01b4d90d064297d9ec37e8fe96b3c9a0303bdd68341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d10012'O; + + log(dec_SABP_PDU(c_write)); + log(enc_SABP_PDU(dec_SABP_PDU(c_write))); + + var template (value) Service_Areas_List sa_list := { + ts_SabpSai('62F224'O, '0023'O, '0042'O) + }; + var template (value) SABP_PDU tx; + + tx := ts_SABP_Write(int2bit(1, 16), int2bit(1, 16), sa_list, 23, 42, '00000000'B, '01011010'B); + log("Write: ", enc_SABP_PDU(valueof(tx))) + + var Service_Areas_List sa_list2 := { valueof(ts_SabpSai('62F224'O, '1000'O, '0042'O)) }; + for (var integer i := 0; i < 2500; i := i+1) { + sa_list2 := sa_list2 & {valueof(ts_SabpSai('62F224'O, '2000'O, int2oct(i,2))) }; + } + tx := ts_SABP_Write(int2bit(2, 16), int2bit(2, 16), sa_list2, 23, 42, '00000000'B, '01011010'B); + log("Write: ", enc_SABP_PDU(valueof(tx))) + + tx := ts_SABP_Restart(sa_list); + log("Restart: ", enc_SABP_PDU(valueof(tx))); +} + +/********************************************************************************* + * ECBE interface (verifying expected procedures on CBSP) + *********************************************************************************/ + +function f_create_and_delete(CBS_Message msg, + template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success) +runs on test_CT { + var EcbeCbcMessage ecbe := f_cbs2ecbe(msg, "TTCN-3"); + f_ecbe_tx_post_cbs(ecbe); + f_cbsp_write(msg, 0, cell_list_success); + f_ecbe_rx_resp(201); + + f_sleep(2.0); + + f_ecbe_tx_delete_cbs(msg.msg_id); + /* FIXME: cbc segfaults if we terminate here (if we don't wait for Connect_result? */ + f_cbsp_handle_kill(0, msg.msg_id, msg.ser_nr, cell_list_success, cell_list_success); + f_ecbe_rx_resp(200); +} + +private template (value) CBS_Message t_CBSmsg(uint16_t msg_id, uint16_t ser_nr) := { + msg_id := msg_id, + ser_nr := ser_nr, + old_ser_nr := omit, + cell_list := cil_BSS, + channel_ind := 0, + category := CBSP_CATEG_NORMAL, + rep_period := 5, + num_bcast_req := 3, + dcs := 1, + content := { + { '00'O, 1 } + } +}; + +/* specify a variety of different Cell Identifier formats to extend test coverage */ +testcase TC_ecbe_create_delete_cgi() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(43, 16752); + + cell_list_success := ts_BSSMAP_CIL_CGI({ + ts_BSSMAP_CI_CGI('901'H, '70'H, 23, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(44, 16752); + cell_list_success := ts_BSSMAP_CIL_LAC_CI({ + ts_BSSMAP_CI_LAC_CI(10001, 50001), + ts_BSSMAP_CI_LAC_CI(10002, 50002), + ts_BSSMAP_CI_LAC_CI(10003, 50003) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_lac() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(45, 16752); + cell_list_success := ts_BSSMAP_CIL_LAC({ + ts_BSSMAP_CI_LAC(10001), + ts_BSSMAP_CI_LAC(10002), + ts_BSSMAP_CI_LAC(10003) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_ci() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(46, 16752); + cell_list_success := ts_BSSMAP_CIL_CI({ + ts_BSSMAP_CI_CI(50001), + ts_BSSMAP_CI_CI(50002), + ts_BSSMAP_CI_CI(50003) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_lai() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(47, 16752); + cell_list_success := ts_BSSMAP_CIL_LAI({ + ts_BSSMAP_CI_LAI('901'H, '70'H, 25), + ts_BSSMAP_CI_LAI('901'H, '70'H, 26), + ts_BSSMAP_CI_LAI('901'H, '70'H, 27) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} + +control { + execute( TC_rx_keepalive() ); + execute( TC_rx_keepalive_timeout() ); + execute( TC_ecbe_create_delete_cgi() ); + execute( TC_ecbe_create_delete_lac_ci() ); + execute( TC_ecbe_create_delete_lac() ); + execute( TC_ecbe_create_delete_ci() ); + execute( TC_ecbe_create_delete_lai() ); +} + +} diff --git a/cbc/ECBE_Types.ttcn b/cbc/ECBE_Types.ttcn new file mode 100644 index 0000000..7c66fb9 --- /dev/null +++ b/cbc/ECBE_Types.ttcn @@ -0,0 +1,147 @@ +module ECBE_Types { + +/* Type definitions for the ECBE (External Cell Broadcast Entity) protocol of OsmoCBC */ +/* (C) 2021 by Harald Welte + * All rights reserved. + */ + +/*********************************************************************** + * smscb.schema.json + ***********************************************************************/ + +type charstring EcbeLanguageCode length(2); + +type integer EcbeMessageId (0..65535); + +type enumerated EcbeGeographicScope { + cell_wide_immediate, + plmn_wide, + lac_sac_tac_wide, + cell_wide +}; + +type integer EcbeMessageCode (0..1023); + +type integer EcbeUpdateNumber (0..15); + +type integer EcbeSerialNrEncoded (0..65535); + +type record EcbeSerialNrDecoded { + EcbeGeographicScope geo_scope, + EcbeMessageCode msg_code, + EcbeUpdateNumber update_nr +}; + +type union EcbeSerialNr { + EcbeSerialNrEncoded serial_nr_encoded, + EcbeSerialNrDecoded serial_nr_decoded +}; + +type integer EcbeDcsEncoded (0..255); + +type enumerated EcbeCharacterSet { + gsm, + eight_bit, + ucs2 +}; + +type integer EcbeDcsClass (0..3); + +type record EcbePayloadDecoded { + EcbeCharacterSet character_set optional, + EcbeLanguageCode Language optional, + EcbeDcsClass dcs_class optional, + charstring data_utf8 +}; + +type charstring EcbePage; +type record of EcbePage EcbePages; + +type record EcbePayloadEncoded { + EcbeDcsEncoded dcs, + EcbePages pages +}; + +type integer EcbeWarningTypeEncoded (0..127); + +type enumerated EcbeWarningTypeDecoded { + earthquake, + tsunami, + earthquake_and_tsunami, + test, + other, + rfu +}; + +type union EcbeWarningType { + EcbeWarningTypeEncoded warning_type_encoded, + EcbeWarningTypeDecoded warning_type_decoded +}; + +type record EcbePayloadEtws { + EcbeWarningType warning_type, + boolean emergency_user_alert optional, + boolean popup_on_display optional, + charstring warning_sec_info optional +}; + +type union EcbePayload { + EcbePayloadEncoded payload_encoded, + EcbePayloadDecoded payload_decoded, + EcbePayloadEtws payload_etws +}; + +type record EcbeSmscbMessage { + EcbeSerialNr serial_nr, + EcbeMessageId message_id, + EcbePayload payload +}; + +external function enc_EcbeSmscbMessage(in EcbeSmscbMessage inp) return octetstring + with { extension "prototype(convert) encode(JSON)" } +external function dec_EcbeSmscbMessage(in octetstring inp) return EcbeSmscbMessage + with { extension "prototype(convert) decode(JSON)" } + +/*********************************************************************** + * cbc.schema.json + ***********************************************************************/ + +type enumerated EcbeCategory { + normal, + high_priority, + background +}; + +type integer EcbeRepetitionPeriod (1..4095); + +type enumerated EcbeChannelIndicator { + basic, + extended +}; + +type integer EcbeWarningPeriodSec (0..3600); + +type integer EcbeNumberOfBroadcasts (0..65535); + +type record EcbeScopePlmn { +}; + +type union EcbeScope { + EcbeScopePlmn scope_plmn +}; + +type record EcbeCbcMessage { + charstring cbe_name optional, + EcbeCategory category optional, + EcbeRepetitionPeriod repetition_period optional, + EcbeNumberOfBroadcasts num_of_bcast optional, + EcbeScope scope, + EcbeSmscbMessage smscb_message +}; + +external function enc_EcbeCbcMessage(in EcbeCbcMessage inp) return octetstring + with { extension "prototype(convert) encode(JSON)" } +external function dec_EcbeCbcMessage(in octetstring inp) return EcbeCbcMessage + with { extension "prototype(convert) decode(JSON)" } + +} with { encode "JSON" } diff --git a/cbc/SABP_Selftest.ttcn b/cbc/SABP_Selftest.ttcn new file mode 100644 index 0000000..1f6ecb5 --- /dev/null +++ b/cbc/SABP_Selftest.ttcn @@ -0,0 +1,180 @@ +module SABP_Selftest { + +/* This is testing the SABP code, specifically re-creating the SABP messages from within + * the TCP stream using SABP_Adapter.f_APER_getMsgLen() for the various possible APER + * length determinant cases */ + +import from Osmocom_Types all; + +import from SABP_Adapter all; +import from SABP_Templates all; +import from IPL4asp_Types all; +import from IPL4asp_PortType all; + +modulepar { + charstring mp_bind_ip := "127.0.0.1"; + integer mp_bind_port := 12345; +} + +type component test_CT extends SABP_Adapter_CT { + port IPL4asp_PT TCP; + var integer g_tcp_conn_id; + timer Tguard := 10.0; +} + +template (value) ASP_Send ts_AS(integer conn_id, octetstring msg) := { + connId := conn_id, + proto := omit, + msg := msg +} + +private altstep as_Tguard() runs on test_CT { + [] Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +private function f_init() runs on test_CT { + var IPL4asp_Types.Result res; + var ASP_Event asp_evt; + + activate(as_Tguard()); + Tguard.start; + + f_bind(mp_bind_ip, mp_bind_port, 0); + + map(self:TCP, system:TCP); + res := f_IPL4_connect(TCP, mp_bind_ip, mp_bind_port, "", -1, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to SABP TCP port"); + mtc.stop; + } + g_tcp_conn_id := res.connId; + + SABP[0].receive(ASP_Event:{connOpened:=?}) -> value asp_evt { + g_sabp_conn_id[0] := asp_evt.connOpened.connId; + } +} + +/* send a given input octetstring 'stream' in chunks of 'chunk_size', spaced at 'delay' intervals */ +private function tcp_send_segmented(octetstring stream, integer chunk_size := 1, float delay := 0.05) +runs on test_CT { + var integer i; + + for (i := 0; i < lengthof(stream); i := i+chunk_size) { + var integer size := chunk_size; + if (lengthof(stream) - i < chunk_size) { + size := lengthof(stream) - i; + } + TCP.send(ts_AS(g_tcp_conn_id, substr(stream, i, size))); + f_sleep(delay); + } +} + +/* a simple SABP-RESTART message with single-byte length dteerminant (shorter than 128 byte) */ +const octetstring c_restart := '00044010000001000F0009000062F22400230042'O; + +/* test whether a message with 1-byte length determinant is parsed */ +testcase TC_1byte_len() runs on test_CT { + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, c_restart)); + f_sabp_exp(tr_SABP_Restart(?)); + setverdict(pass); +} + +/* test whether a message with 1-byte length determinant is parsed if each byte is received separately */ +testcase TC_1byte_len_bytewise() runs on test_CT { + f_init(); + tcp_send_segmented(c_restart, 1, 0.05); + f_sabp_exp(tr_SABP_Restart(?)); + setverdict(pass); +} + +/* send three concatenated RESTART in one segment */ +testcase TC_1byte_len_chained() runs on test_CT { + var octetstring chain := c_restart & c_restart & c_restart; + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, chain)); + f_sabp_exp(tr_SABP_Restart(?)); + f_sabp_exp(tr_SABP_Restart(?)); + f_sabp_exp(tr_SABP_Restart(?)); + setverdict(pass); +} + + +/* SABP write-replace with length determinant encoded over two bytes ('8093'O) */ +const octetstring c_wrepl := '00000080930000080006000211120007000240C0000F0010000113F0030282EC0613F0030282EC070001400100000D0002012A000900020000000400010100000056029F01B4D90D064297D9EC37E8FE96B3C9A0303BDD68341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D10012'O; + +/* test whether a message with 2-byte length determinant is parsed */ +testcase TC_2byte_len() runs on test_CT { + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, c_wrepl)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_send(ts_SABP_Reset({ { pLMNidentity := '09F107'O, lac := '0000'O, sac := '0000'O } })); + setverdict(pass); +} + +/* test whether a message with 2-byte length determinant is parsed if each byte is received separately */ +testcase TC_2byte_len_bytewise() runs on test_CT { + f_init(); + tcp_send_segmented(c_wrepl, 1, 0.05); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* send three concatenated WRITE-REPLACE in one segment */ +testcase TC_2byte_len_chained() runs on test_CT { + var octetstring chain := c_wrepl & c_wrepl & c_wrepl; + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, chain)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* send three concatenated WRITE-REPLACE in segments of 10 bytes */ +testcase TC_2byte_len_chained_bytewise() runs on test_CT { + var octetstring chain := c_wrepl & c_wrepl & c_wrepl; + f_init(); + tcp_send_segmented(chain, 10, 0.05); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* SABP write-replace with length determinant encoded over multiple chunks ('Cx'O case) */ +const octetstring c_chunked := '000000C1000007000600020002000700020002000F00C109C462F2241000004262F2242000000062F2242000000162F2242000000262F2242000000362F2242000000462F2242000000562F2242000000662F2242000000762F2242000000862F2242000000962F2242000000A62F2242000000B62F2242000000C62F2242000000D62F2242000000E62F2242000000F62F2242000001062F2242000001162F2242000001262F2242000001362F2242000001462F2242000001562F2242000001662F2242000001762F2242000001862F2242000001962F2242000001A62F2242000001B62F2242000001C62F2242000001D62F2242000001E62F2242000001F62F2242000002062F2242000002162F2242000002262F2242000002362F2242000002462F2242000002562F2242000002662F2242000002762F2242000002862F2242000002962F2242000002A62F2242000002B62F2242000002C62F2242000002D62F2242000002E62F2242000002F62F2242000003062F2242000003162F2242000003262F2242000003362F2242000003462F2242000003562F2242000003662F2242000003762F2242000003862F2242000003962F2242000003A62F2242000003B62F2242000003C62F2242000003D62F2242000003E62F2242000003F62F2242000004062F2242000004162F2242000004262F2242000004362F2242000004462F2242000004562F2242000004662F2242000004762F2242000004862F2242000004962F2242000004A62F2242000004B62F2242000004C62F2242000004D62F2242000004E62F2242000004F62F2242000005062F2242000005162F2242000005262F2242000005362F2242000005462F2242000005562F2242000005662F2242000005762F2242000005862F2242000005962F2242000005A62F2242000005B62F2242000005C62F2242000005D62F2242000005E62F2242000005F62F2242000006062F2242000006162F2242000006262F2242000006362F2242000006462F2242000006562F2242000006662F2242000006762F2242000006862F2242000006962F2242000006A62F2242000006B62F2242000006C62F2242000006D62F2242000006E62F2242000006F62F2242000007062F2242000007162F2242000007262F2242000007362F2242000007462F2242000007562F2242000007662F2242000007762F2242000007862F2242000007962F2242000007A62F2242000007B62F2242000007C62F2242000007D62F2242000007E62F2242000007F62F2242000008062F2242000008162F2242000008262F2242000008362F2242000008462F2242000008562F2242000008662F2242000008762F2242000008862F2242000008962F2242000008A62F2242000008B62F2242000008C62F2242000008D62F2242000008E62F2242000008F62F2242000009062F2242000009162F2242000009262F2242000009362F2242000009462F2242000009562F2242000009662F2242000009762F2242000009862F2242000009962F2242000009A62F2242000009B62F2242000009C62F2242000009D62F2242000009E62F2242000009F62F224200000A062F224200000A162F224200000A262F224200000A362F224200000A462F224200000A562F224200000A662F224200000A762F224200000A862F224200000A962F224200000AA62F224200000AB62F224200000AC62F224200000AD62F224200000AE62F224200000AF62F224200000B062F224200000B162F224200000B262F224200000B362F224200000B462F224200000B562F224200000B662F224200000B762F224200000B862F224200000B962F224200000BA62F224200000BB62F224200000BC62F224200000BD62F224200000BE62F224200000BF62F224200000C062F224200000C162F224200000C262F224200000C362F224200000C462F224200000C562F224200000C662F224200000C762F224200000C862F224200000C962F224200000CA62F224200000CB62F224200000CC62F224200000CD62F224200000CE62F224200000CF62F224200000D062F224200000D162F224200000D262F224200000D362F224200000D462F224200000D562F224200000D662F224200000D762F224200000D862F224200000D962F224200000DA62F224200000DB62F224200000DC62F224200000DD62F224200000DE62F224200000DF62F224200000E062F224200000E162F224200000E262F224200000E362F224200000E462F224200000E562F224200000E662F224200000E762F224200000E862F224200000E962F224200000EA62F224200000EB62F224200000EC62F224200000ED62F224200000EE62F224200000EF62F224200000F062F224200000F162F224200000F262F224200000F362F224200000F462F224200000F562F224200000F662F224200000F762F224200000F862F224200000F962F224200000FA62F224200000FB62F224200000FC62F224200000FD62F224200000FE62F224200000FF62F2242000010062F2242000010162F2242000010262F2242000010362F2242000010462F2242000010562F2242000010662F2242000010762F2242000010862F2242000010962F2242000010A62F2242000010B62F2242000010C62F2242000010D62F2242000010E62F2242000010F62F2242000011062F2242000011162F2242000011262F2242000011362F2242000011462F2242000011562F2242000011662F2242000011762F2242000011862F2242000011962F2242000011A62F2242000011B62F2242000011C62F2242000011D62F2242000011E62F2242000011F62F2242000012062F2242000012162F2242000012262F2242000012362F2242000012462F2242000012562F2242000012662F2242000012762F2242000012862F2242000012962F2242000012A62F2242000012B62F2242000012C62F2242000012D62F2242000012E62F2242000012F62F2242000013062F2242000013162F2242000013262F2242000013362F2242000013462F2242000013562F2242000013662F2242000013762F2242000013862F2242000013962F2242000013A62F2242000013B62F2242000013C62F2242000013D62F2242000013E62F2242000013F62F2242000014062F2242000014162F2242000014262F2242000014362F2242000014462F2242000014562F2242000014662F2242000014762F2242000014862F2242000014962F2242000014A62F2242000014B62F2242000014C62F2242000014D62F2242000014E62F2242000014F62F2242000015062F2242000015162F2242000015262F2242000015362F2242000015462F2242000015562F2242000015662F2242000015762F2242000015862F2242000015962F2242000015A62F2242000015B62F2242000015C62F2242000015D62F2242000015E62F2242000015F62F2242000016062F2242000016162F2242000016262F2242000016362F2242000016462F2242000016562F2242000016662F2242000016762F2242000016862F2242000016962F2242000016A62F2242000016B62F2242000016C62F2242000016D62F2242000016E62F2242000016F62F2242000017062F2242000017162F2242000017262F2242000017362F2242000017462F2242000017562F2242000017662F2242000017762F2242000017862F2242000017962F2242000017A62F2242000017B62F2242000017C62F2242000017D62F2242000017E62F2242000017F62F2242000018062F2242000018162F2242000018262F2242000018362F2242000018462F2242000018562F2242000018662F2242000018762F2242000018862F2242000018962F2242000018A62F2242000018B62F2242000018C62F2242000018D62F2242000018E62F2242000018F62F2242000019062F2242000019162F2242000019262F2242000019362F2242000019462F2242000019562F2242000019662F2242000019762F2242000019862F2242000019962F2242000019A62F2242000019B62F2242000019C62F2242000019D62F2242000019E62F2242000019F62F224200001A062F224200001A162F224200001A262F224200001A362F224200001A462F224200001A562F224200001A662F224200001A762F224200001A862F224200001A962F224200001AA62F224200001AB62F224200001AC62F224200001AD62F224200001AE62F224200001AF62F224200001B062F224200001B162F224200001B262F224200001B362F224200001B462F224200001B562F224200001B662F224200001B762F224200001B862F224200001B962F224200001BA62F224200001BB62F224200001BC62F224200001BD62F224200001BE62F224200001BF62F224200001C062F224200001C162F224200001C262F224200001C362F224200001C462F224200001C562F224200001C662F224200001C762F224200001C862F224200001C962F224200001CA62F224200001CB62F224200001CC62F224200001CD62F224200001CE62F224200001CF62F224200001D062F224200001D162F224200001D262F224200001D362F224200001D462F224200001D562F224200001D662F224200001D762F224200001D862F224200001D962F224200001DA62F224200001DB62F224200001DC62F224200001DD62F224200001DE62F224200001DF62F224200001E062F224200001E162F224200001E262F224200001E362F224200001E462F224200001E562F224200001E662F224200001E762F224200001E862F224200001E962F224200001EA62F224200001EB62F224200001EC62F224200001ED62F224200001EE62F224200001EF62F224200001F062F224200001F162F224200001F262F224200001F362F224200001F462F224200001F562F224200001F662F224200001F762F224200001F862F224200001F962F224200001FA62F224200001FB62F224200001FC62F224200001FD62F224200001FE62F224200001FF62F2242000020062F2242000020162F2242000020262F2242000020362F2242000020462F2242000020562F2242000020662F2242000020762F2242000020862F2242000020962F2242000020A62F2242000020B62F2242000020C62F2242000020D62F2242000020E62F2242000020F62F2242000021062F2242000021162F2242000021262F2242000021362F2242000021462F2242000021562F2242000021662F2242000021762F2242000021862F2242000021962F2242000021A62F2242000021B62F2242000021C62F2242000021D62F2242000021E62F2242000021F62F2242000022062F2242000022162F2242000022262F2242000022362F2242000022462F2242000022562F2242000022662F2242000022762F2242000022862F2242000022962F2242000022A62F2242000022B62F2242000022C62F2242000022D62F2242000022E62F2242000022F62F2242000023062F2242000023162F2242000023262F2242000023362F2242000023462F2242000023562F2242000023662F2242000023762F2242000023862F2242000023962F2242000023A62F2242000023B62F2242000023C62F2242000023D62F2242000023E62F2242000023F62F2242000024062F2242000024162F2242000024262F2242000024362F2242000024462F2242000024562F2242000024662F2242000024762F2242000024862F2242000024962F2242000024A62F2242000024B62F2242000024C62F2242000024D62F2242000024E62F2242000024F62F2242000025062F2242000025162F2242000025262F2242000025362F2242000025462F2242000025562F2242000025662F2242000025762F2242000025862F2242000025962F2242000025A62F2242000025B62F2242000025C62F2242000025D62F2242000025E62F2242000025F62F2242000026062F2242000026162F2242000026262F2242000026362F2242000026462F2242000026562F2242000026662F2242000026762F2242000026862F2242000026962F2242000026A62F2242000026B62F2242000026C62F2242000026D62F2242000026E62F2242000026F62F2242000027062F2242000027162F2242000027262F2242000027362F2242000027462F2242000027562F2242000027662F2242000027762F2242000027862F2242000027962F2242000027A62F2242000027B62F2242000027C62F2242000027D62F2242000027E62F2242000027F62F2242000028062F2242000028162F2242000028262F2242000028362F2242000028462F2242000028562F2242000028662F2242000028762F2242000028862F2242000028962F2242000028A62F2242000028B62F2242000028C62F2242000028D62F2242000028E62F2242000028F62F2242000029062F2242000029162F2242000029262F2242000029362F2242000029462F2242000029562F2242000029662F2242000029762F2242000029862F2242000029962F2242000029A62F2242000029B62F2242000029C62F2242000029D62F2242000029E62F2242000029F62F224200002A062F224200002A162F224200002A262F224200002A362F224200002A462F224200002A562F224200002A662F224200002A762F224200002A862F224200002A962F224200002AA62F224200002AB62F224200002AC62F224200002AD62F224200002AE62F224200002AF62F224200002B062F224200002B162F224200002B262F224200002B362F224200002B462F224200002B562F224200002B662F224200002B762F224200002B862F224200002B962F224200002BA62F224200002BB62F224200002BC62F224200002BD62F224200002BE62F224200002BF62F224200002C062F224200002C162F224200002C262F224200002C362F224200002C462F224200002C562F224200002C662F224200002C762F224200002C862F224200002C962F224200002CA62F224200002CB62F224200002CC62F224200002CD62F224200002CE62F224200002CF62F224200002D062F224200002D162F224200002D262F224200002D362F224200002D462F224200002D562F224200002D662F224200002D762F224200002D862F224200002D962F224200002DA62F224200002DB62F224200002DC62F224200002DD62F224200002DE62F224200002DF62F224200002E062F224200002E162F224200002E262F224200002E362F224200002E462F224200002E562F224200002E662F224200002E762F224200002E862F224200002E962F224200002EA62F224200002EB62F224200002EC62F224200002ED62F224200002EE62F224200002EF62F224200002F062F224200002F162F224200002F262F224200002F362F224200002F462F224200002F562F224200002F662F224200002F762F224200002F862F224200002F962F224200002FA62F224200002FB62F224200002FC62F224200002FD62F224200002FE62F224200002FF62F2242000030062F2242000030162F2242000030262F2242000030362F2242000030462F2242000030562F2242000030662F2242000030762F2242000030862F2242000030962F2242000030A62F2242000030B62F2242000030C62F2242000030D62F2242000030E62F2242000030F62F2242000031062F2242000031162F2242000031262F2242000031362F2242000031462F2242000031562F2242000031662F2242000031762F2242000031862F2242000031962F2242000031A62F2242000031B62F2242000031C62F2242000031D62F2242000031E62F2242000031F62F2242000032062F2242000032162F2242000032262F2242000032362F2242000032462F2242000032562F2242000032662F2242000032762F2242000032862F2242000032962F2242000032A62F2242000032B62F2242000032C62F2242000032D62F2242000032E62F2242000032F62F2242000033062F2242000033162F2242000033262F2242000033362F2242000033462F2242000033562F2242000033662F2242000033762F2242000033862F2242000033962F2242000033A62F2242000033B62F2242000033C62F2242000033D62F2242000033E62F2242000033F62F2242000034062F2242000034162F2242000034262F2242000034362F2242000034462F2242000034562F2242000034662F2242000034762F2242000034862F2242000034962F2242000034A62F2242000034B62F2242000034C62F2242000034D62F2242000034E62F2242000034F62F2242000035062F2242000035162F2242000035262F2242000035362F2242000035462F2242000035562F2242000035662F2242000035762F2242000035862F2242000035962F2242000035A62F2242000035B62F2242000035C62F2242000035D62F2242000035E62F2242000035F62F2242000036062F2242000036162F2242000036262F2242000036362F2242000036462F2242000036562F2242000036662F2242000036762F2242000036862F2242000036962F2242000036A62F2242000036B62F2242000036C62F2242000036D62F2242000036E62F2242000036F62F2242000037062F2242000037162F2242000037262F2242000037362F2242000037462F2242000037562F2242000037662F2242000037762F2242000037862F2242000037962F2242000037A62F2242000037B62F2242000037C62F2242000037D62F2242000037E62F2242000037F62F2242000038062F2242000038162F2242000038262F2242000038362F2242000038462F2242000038562F2242000038662F2242000038762F2242000038862F2242000038962F2242000038A62F2242000038B62F2242000038C62F2242000038D62F2242000038E62F2242000038F62F2242000039062F2242000039162F2242000039262F2242000039362F2242000039462F2242000039562F2242000039662F2242000039762F2242000039862F2242000039962F2242000039A62F2242000039B62F2242000039C62F2242000039D62F2242000039E62F2242000039F62F224200003A062F224200003A162F224200003A262F224200003A362F224200003A462F224200003A562F224200003A662F224200003A762F224200003A862F224200003A962F224200003AA62F224200003AB62F224200003AC62F224200003AD62F224200003AE62F224200003AF62F224200003B062F224200003B162F224200003B262F224200003B362F224200003B462F224200003B562F224200003B662F224200003B762F224200003B862F224200003B962F224200003BA62F224200003BB62F224200003BC62F224200003BD62F224200003BE62F224200003BF62F224200003C062F224200003C162F224200003C262F224200003C362F224200003C462F224200003C562F224200003C662F224200003C762F224200003C862F224200003C962F224200003CA62F224200003CB62F224200003CC62F224200003CD62F224200003CE62F224200003CF62F224200003D062F224200003D162F224200003D262F224200003D362F224200003D462F224200003D562F224200003D662F224200003D762F224200003D862F224200003D962F224200003DA62F224200003DB62F224200003DC62F224200003DD62F224200003DE62F224200003DF62F224200003E062F224200003E162F224200003E262F224200003E362F224200003E462F224200003E562F224200003E662F224200003E762F224200003E862F224200003E962F224200003EA62F224200003EB62F224200003EC62F224200003ED62F224200003EE62F224200003EF62F224200003F062F224200003F162F224200003F262F224200003F362F224200003F462F224200003F562F224200003F662F224200003F762F224200003F862F224200003F962F224200003FA62F224200003FB62F224200003FC62F224200003FD62F224200003FE62F224200003FF62F2242000040062F2242000040162F2242000040262F2242000040362F2242000040462F2242000040562F2242000040662F2242000040762F2242000040862F2242000040962F2242000040A62F2242000040B62F2242000040C62F2242000040D62F2242000040E62F2242000040F62F2242000041062F2242000041162F2242000041262F2242000041362F2242000041462F2242000041562F2242000041662F2242000041762F2242000041862F2242000041962F2242000041A62F2242000041B62F2242000041C62F2242000041D62F2242000041E62F2242000041F62F2242000042062F2242000042162F2242000042262F2242000042362F2242000042462F2242000042562F2242000042662F2242000042762F2242000042862F2242000042962F2242000042A62F2242000042B62F2242000042C62F2242000042D62F2242000042E62F2242000042F62F2242000043062F2242000043162F2242000043262F2242000043362F2242000043462F2242000043562F2242000043662F2242000043762F2242000043862F2242000043962F2242000043A62F2242000043B62F2242000043C62F2242000043D62F2242000043E62F2242000043F62F2242000044062F2242000044162F2242000044262F2242000044362F2242000044462F2242000044562F2242000044662F2242000044762F2242000044862F2242000044962F2242000044A62F2242000044B62F2242000044C62F2242000044D62F2242000044E62F2242000044F62F2242000045062F2242000045162F2242000045262F2242000045362F2242000045462F2242000045562F2242000045662F2242000045762F2242000045862F2242000045962F2242000045A62F2242000045B62F2242000045C62F2242000045D62F2242000045E62F2242000045F62F2242000046062F2242000046162F2242000046262F2242000046362F2242000046462F2242000046562F2242000046662F2242000046762F2242000046862F2242000046962F2242000046A62F2242000046B62F2242000046C62F2242000046D62F2242000046E62F2242000046F62F2242000047062F2242000047162F2242000047262F2242000047362F2242000047462F2242000047562F2242000047662F2242000047762F2242000047862F2242000047962F2242000047A62F2242000047B62F2242000047C62F2242000047D62F2242000047E62F2242000047F62F2242000048062F2242000048162F2242000048262F2242000048362F2242000048462F2242000048562F2242000048662F2242000048762F2242000048862F2242000048962F2242000048A62F2242000048B62F2242000048C62F2242000048D62F2242000048E62F2242000048F62F2242000049062F2242000049162F2242000049262F2242000049362F2242000049462F2242000049562F2242000049662F2242000049762F2242000049862F2242000049962F2242000049A62F2242000049B62F2242000049C62F2242000049D62F2242000049E62F2242000049F62F224200004A062F224200004A162F224200004A262F224200004A362F224200004A462F224200004A562F224200004A662F224200004A762F224200004A862F224200004A962F224200004AA62F224200004AB62F224200004AC62F224200004AD62F224200004AE62F224200004AF62F224200004B062F224200004B162F224200004B262F224200004B362F224200004B462F224200004B562F224200004B662F224200004B762F224200004B862F224200004B962F224200004BA62F224200004BB62F224200004BC62F224200004BD62F224200004BE62F224200004BF62F224200004C062F224200004C162F224200004C262F224200004C362F224200004C462F224200004C562F224200004C662F224200004C762F224200004C862F224200004C962F224200004CA62F224200004CB62F224200004CC62F224200004CD62F224200004CE62F224200004CF62F224200004D062F224200004D162F224200004D262F224200004D362F224200004D462F224200004D562F224200004D662F224200004D762F224200004D862F224200004D962F224200004DA62F224200004DB62F224200004DC62F224200004DD62F224200004DE62F224200004DF62F224200004E062F224200004E162F224200004E262F224200004E362F224200004E462F224200004E562F224200004E662F224200004E762F224200004E862F224200004E962F224200004EA62F224200004EB62F224200004EC62F224200004ED62F224200004EE62F224200004EF62F224200004F062F224200004F162F224200004F262F224200004F362F224200004F462F224200004F562F224200004F662F224200004F762F224200004F862F224200004F962F224200004FA62F224200004FB62F224200004FC62F224200004FD62F224200004FE62F224200004FF62F2242000050062F2242000050162F2242000050262F2242000050362F2242000050462F2242000050562F2242000050662F2242000050762F2242000050862F2242000050962F2242000050A62F2242000050B62F2242000050C62F2242000050D62F2242000050E62F2242000050F62F2242000051062F2242000051162F2242000051262F2242000051362F2242000051462F2242000051562F2242000051662F2242000051762F2242000051862F2242000051962F2242000051A62F2242000051B62F2242000051C62F2242000051D62F2242000051E62F2242000051F62F2242000052062F2242000052162F2242000052262F2242000052362F2242000052462F2242000052562F2242000052662F2242000052762F2242000052862F2242000052962F2242000052A62F2242000052B62F2242000052C62F2242000052D62F2242000052E62F2242000052F62F2242000053062F2242000053162F2242000053262F2242000053362F2242000053462F2242000053562F2242000053662F2242000053762F2242000053862F2242000053962F2242000053A62F2242000053B62F2242000053C62F2242000053D62F2242000053E62F2242000053F62F2242000054062F2242000054162F2242000054262F2242000054362F2242000054462F2242000054562F2242000054662F2242000054762F2242000054862F2242000054962F2242000054A62F2242000054B62F2242000054C62F2242000054D62F2242000054E62F2242000054F62F2242000055062F2242000055162F2242000055262F2242000055362F2242000055462F2242000055562F2242000055662F2242000055762F2242000055862F2242000055962F2242000055A62F2242000055B62F2242000055C62F2242000055D62F2242000055E62F2242000055F62F2242000056062F2242000056162F2242000056262F2242000056362F2242000056462F2242000056562F2242000056662F2242000056762F2242000056862F2242000056962F2242000056A62F2242000056B62F2242000056C62F2242000056D62F2242000056E62F2242000056F62F2242000057062F2242000057162F2242000057262F2242000057362F2242000057462F2242000057562F2242000057662F2242000057762F2242000057862F2242000057962F2242000057A62F2242000057B62F2242000057C62F2242000057D62F2242000057E62F2242000057F62F2242000058062F2242000058162F2242000058262F2242000058362F2242000058462F2242000058562F2242000058662F2242000058762F2242000058862F2242000058962F2242000058A62F2242000058B62F2242000058C62F2242000058D62F2242000058E62F2242000058F62F2242000059062F2242000059162F2242000059262F2242000059362F2242000059462F2242000059562F2242000059662F2242000059762F2242000059862F2242000059962F2242000059A62F2242000059B62F2242000059C62F2242000059D62F2242000059E62F2242000059F62F224200005A062F224200005A162F224200005A262F224200005A362F224200005A462F224200005A562F224200005A662F224200005A762F224200005A862F224200005A962F224200005AA62F224200005AB62F224200005AC62F224200005AD62F224200005AE62F224200005AF62F224200005B062F224200005B162F224200005B262F224200005B362F224200005B462F224200005B562F224200005B662F224200005B762F224200005B862F224200005B962F224200005BA62F224200005BB62F224200005BC62F224200005BD62F224200005BE62F224200005BF62F224200005C062F224200005C162F224200005C262F224200005C362F224200005C462F224200005C562F224200005C662F224200005C762F224200005C862F224200005C962F224200005CA62F224200005CB62F224200005CC62F224200005CD62F224200005CE62F224200005CF62F224200005D062F224200005D162F224200005D262F224200005D362F224200005D462F224200005D562F224200005D662F224200005D762F224200005D862F224200005D962F224200005DA62F224200005DB62F224200005DC62F224200005DD62F224200005DE62F224200005DF62F224200005E062F224200005E162F224200005E262F224200005E362F224200005E462F224200005E562F224200005E662F224200005E762F224200005E862F224200005E962F224200005EA62F224200005EB62F224200005EC62F224200005ED62F224200005EE62F224200005EF62F224200005F062F224200005F162F224200005F262F224200005F362F224200005F462F224200005F562F224200005F662F224200005F762F224200005F862F224200005F962F224200005FA62F224200005FB62F224200005FC62F224200005FD62F224200005FE62F224200005FF62F2242000060062F2242000060162F2242000060262F2242000060362F2242000060462F2242000060562F2242000060662F2242000060762F2242000060862F2242000060962F2242000060A62F2242000060B62F2242000060C62F2242000060D62F2242000060E62F2242000060F62F2242000061062F2242000061162F2242000061262F2242000061362F2242000061462F2242000061562F2242000061662F2242000061762F2242000061862F2242000061962F2242000061A62F2242000061B62F2242000061C62F2242000061D62F2242000061E62F2242000061F62F2242000062062F2242000062162F2242000062262F2242000062362F2242000062462F2242000062562F2242000062662F2242000062762F2242000062862F2242000062962F2242000062A62F2242000062B62F2242000062C62F2242000062D62F2242000062E62F2242000062F62F2242000063062F2242000063162F2242000063262F2242000063362F2242000063462F2242000063562F2242000063662F2242000063762F2242000063862F2242000063962F2242000063A62F2242000063B62F2242000063C62F2242000063D62F2242000063E62F2242000063F62F2242000064062F2242000064162F2242000064262F2242000064362F2242000064462F2242000064562F2242000064662F2242000064762F2242000064862F2242000064962F2242000064A62F2242000064B62F2242000064C62F2242000064D62F2242000064E62F2242000064F62F2242000065062F2242000065162F2242000065262F2242000065362F2242000065462F2242000065562F2242000065662F2242000065762F2242000065862F2242000065962F2242000065A62F2242000065B62F2242000065C62F2242000065D62F2242000065E62F2242000065F62F2242000066062F2242000066162F2242000066262F2242000066362F2242000066462F2242000066562F2242000066662F2242000066762F2242000066862F2242000066962F2242000066A62F2242000066B62F2242000066C62F2242000066D62F2242000066E62F2242000066F62F2242000067062F2242000067162F2242000067262F2242000067362F2242000067462F2242000067562F2242000067662F2242000067762F2242000067862F2242000067962F2242000067A62F2242000067B62F2242000067C62F2242000067D62F2242000067E62F2242000067F62F2242000068062F2242000068162F2242000068262F2242000068362F2242000068462F2242000068562F2242000068662F2242000068762F2242000068862F2242000068962F2242000068A62F2242000068B62F2242000068C62F2242000068D62F2242000068E62F2242000068F62F2242000069062F2242000069162F2242000069262F2242000069362F2242000069462F2242000069562F2242000069662F2242000069762F2242000069862F2242000069962F2242000069A62F2242000069B62F2242000069C62F2242000069D62F2242000069E62F2242000069F62F224200006A062F224200006A162F224200006A262F224200006A362F224200006A462F224200006A562F224200006A662F224200006A762F224200006A862F224200006A962F224200006AA62F224200006AB62F224200006AC62F224200006AD62F224200006AE62F224200006AF62F224200006B062F224200006B162F224200006B262F224200006B362F224200006B462F224200006B562F224200006B662F224200006B762F224200006B862F224200006B962F224200006BA62F224200006BB62F224200006BC62F224200006BD62F224200006BE62F224200006BF62F224200006C062F224200006C162F224200006C262F224200006C362F224200006C462F224200006C562F224200006C662F224200006C762F224200006C862F224200006C962F224200006CA62F224200006CB62F224200006CC62F224200006CD62F224200006CE62F224200006CF62F224200006D062F224200006D162F224200006D262F224200006D362F224200006D462F224200006D562F224200006D662F224200006D762F224200006D862F224200006D962F224200006DA62F224200006DB62F224200006DC62F224200006DD62F224200006DE62F224200006DF62F224200006E062F224200006E162F224200006E262F224200006E362F224200006E462F224200006E562F224200006E662F224200006E762F224200006E862F224200006E962F224200006EA62F224200006EB62F224200006EC62F224200006ED62F224200006EE62F224200006EF62F224200006F062F224200006F162F224200006F262F224200006F362F224200006F462F224200006F562F224200006F662F224200006F762F224200006F862F224200006F962F224200006FA62F224200006FB62F224200006FC62F224200006FD62F224200006FE62F224200006FF62F2242000070062F2242000070162F2242000070262F2242000070362F2242000070462F2242000070562F2242000070662F2242000070762F2242000070862F2242000070962F2242000070A62F2242000070B62F2242000070C62F2242000070D62F2242000070E62F2242000070F62F2242000071062F2242000071162F2242000071262F2242000071362F2242000071462F2242000071562F2242000071662F2242000071762F2242000071862F2242000071962F2242000071A62F2242000071B62F2242000071C62F2242000071D62F2242000071E62F2242000071F62F2242000072062F2242000072162F2242000072262F2242000072362F2242000072462F2242000072562F2242000072662F2242000072762F2242000072862F2242000072962F2242000072A62F2242000072B62F2242000072C62F2242000072D62F2242000072E62F2242000072F62F2242000073062F2242000073162F2242000073262F2242000073362F2242000073462F2242000073562F2242000073662F2242000073762F2242000073862F2242000073962F2242000073A62F2242000073B62F2242000073C62F2242000073D62F2242000073E62F2242000073F62F2242000074062F2242000074162F2242000074262F2242000074362F2242000074462F2242000074562F2242000074662F2242000074762F2242000074862F2242000074962F2242000074A62F2242000074B62F2242000074C62F2242000074D62F2242000074E62F2242000074F62F2242000075062F2242000075162F2242000075262F2242000075362F2242000075462F2242000075562F2242000075662F2242000075762F2242000075862F2242000075962F2242000075A62F2242000075B62F2242000075C62F2242000075D62F2242000075E62F2242000075F62F2242000076062F2242000076162F2242000076262F2242000076362F2242000076462F2242000076562F2242000076662F2242000076762F2242000076862F2242000076962F2242000076A62F2242000076B62F2242000076C62F2242000076D62F2242000076E62F2242000076F62F2242000077062F2242000077162F2242000077262F2242000077362F2242000077462F2242000077562F2242000077662F2242000077762F2242000077862F2242000077962F2242000077A62F2242000077B62F2242000077C62F2242000077D62F2242000077E62F2242000077F62F2242000078062F2242000078162F2242000078262F2242000078362F2242000078462F2242000078562F2242000078662F2242000078762F2242000078862F2242000078962F2242000078A62F2242000078B62F2242000078C62F2242000078D62F2242000078E62F2242000078F62F2242000079062F2242000079162F2242000079262F2242000079362F2242000079462F2242000079562F2242000079662F2242000079762F2242000079862F2242000079962F2242000079A62F2242000079B62F2242000079C62F2242000079D62F2242000079E62F2242000079F62F224200007A062F224200007A162F224200007A262F224200007A362F224200007A462F224200007A562F224200007A662F224200007A762F224200007A862F224200007A962F224200007AA62F224200007AB62F224200007AC62F224200007AD62F224200007AE62F224200007AF62F224200007B062F224200007B162F224200007B262F224200007B362F224200007B462F224200007B562F224200007B662F224200007B762F224200007B862F224200007B962F224200007BA62F224200007BB62F224200007BC62F224200007BD62F224200007BE62F224200007BF62F224200007C062F224200007C162F224200007C262F224200007C362F224200007C462F224200007C562F224200007C662F224200007C762F224200007C862F224200007C962F224200007CA62F224200007CB62F224200007CC62F224200007CD62F224200007CE62F224200007CF62F224200007D062F224200007D162F224200007D262F224200007D362F224200007D462F224200007D562F224200007D662F224200007D762F224200007D862F224200007D962F224200007DA62F224200007DB62F224200007DC62F224200007DD62F224200007DE62F224200007DF62F224200007E062F224200007E162F224200007E262F224200007E362F224200007E462F224200007E562F224200007E662F224200007E762F224200007E862F224200007E962F224200007EA62F224200007EB62F224200007EC62F224200007ED62F224200007EE62F224200007EF62F224200007F062F224200007F162F224200007F262F224200007F362F224200007F462F224200007F562F224200007F662F224200007F762F224200007F862F224200007F962F224200007FA62F224200007FB62F224200007FC62F224200007FD62F224200007FE62F224200007FF62F2242000080062F2242000080162F2242000080262F2242000080362F2242000080462F2242000080562F2242000080662F2242000080762F2242000080862F2242000080962F2242000080A62F2242000080B62F2242000080C62F2242000080D62F2242000080E62F2242000080F62F2242000081062F2242000081162F2242000081262F2242000081362F2242000081462F2242000081562F2242000081662F2242000081762F2242000081862F2242000081962F2242000081A62F2242000081B62F2242000081C62F2242000081D62F2242000081E62F2242000081F62F2242000082062F2242000082162F2242000082262F2242000082362F2242000082462F2242000082562F2242000082662F2242000082762F2242000082862F2242000082962F2242000082A62F2242000082B62F2242000082C62F2242000082D62F2242000082E62F2242000082F62F2242000083062F2242000083162F2242000083262F2242000083362F2242000083462F2242000083562F2242000083662F2242000083762F2242000083862F2242000083962F2242000083A62F2242000083B62F2242000083C62F2242000083D62F2242000083E62F2242000083F62F2242000084062F2242000084162F2242000084262F2242000084362F2242000084462F2242000084562F2242000084662F2242000084762F2242000084862F2242000084962F2242000084A62F2242000084B62F2242000084C62F2242000084D62F2242000084E62F2242000084F62F2242000085062F2242000085162F2242000085262F2242000085362F2242000085462F2242000085562F2242000085662F2242000085762F2242000085862F2242000085962F2242000085A62F2242000085B62F2242000085C62F2242000085D62F2242000085E62F2242000085F62F2242000086062F2242000086162F2242000086262F2242000086362F2242000086462F2242000086562F2242000086662F2242000086762F2242000086862F2242000086962F2242000086A62F2242000086B62F2242000086C62F2242000086D62F2242000086E62F2242000086F62F2242000087062F2242000087162F2242000087262F2242000087362F2242000087462F2242000087562F2242000087662F2242000087762F2242000087862F2242000087962F2242000087A62F2242000087B62F2242000087C62F2242000087D62F2242000087E62F2242000087F62F2242000088062F2242000088162F2242000088262F2242000088362F2242000088462F2242000088562F2242000088662F2242000088762F2242000088862F2242000088962F2242000088A62F2242000088B62F2242000088C62F2242000088D62F2242000088E62F2242000088F62F2242000089062F2242000089162F2242000089262F2242000089362F2242000089462F2242000089562F2242000089662F2242000089762F2242000089862F2242000089962F2242000089A62F2242000089B62F2242000089C62F2242000089D62F2242000089E62F2242000089F62F224200008A062F224200008A162F224200008A262F224200008A362F224200008A462F224200008A562F224200008A662F224200008A762F224200008A862F224200008A962F224200008AA62F224200008AB62F224200008AC62F224200008AD62F224200008AE62F224200008AF62F224200008B062F224200008B162F224200008B262F224200008B362F224200008B462F224200008B562F224200008B662F224200008B762F224200008B862F224200008B962F224200008BA62F224200008BB62F224200008BC62F224200008BD62F224200008BE62F224200008BF62F224200008C062F224200008C162F224200008C262F224200008C362F224200008C462F224200008C562F224200008C662F224200008C762F224200008C862F224200008C962F224200008CA62F224200008CB62F224200008CC62F224200008CD62F224200008CE62F224200008CF62F224200008D062F224200008D162F224200008D262F224200008D362F224200008D462F224200008D562F224200008D662F224200008D762F224200008D862F224200008D962F224200008DA62F224200008DB62F224200008DC62F224200008DD62F224200008DE62F224200008DF62F224200008E062F224200008E162F224200008E262F224200008E362F224200008E462F224200008E562F224200008E662F224200008E762F224200008E862F224200008E962F224200008EA62F224200008EB62F224200008EC62F224200008ED62F224200008EE62F224200008EF62F224200008F062F224200008F162F224200008F262F224200008F362F224200008F462F224200008F562F224200008F662F224200008F762F224200008F862F224200008F962F224200008FA62F224200008FB62F224200008FC62F224200008FD62F224200008FE62F224200008FF62F2242000090062F2242000090162F2242000090262F2242000090362F2242000090462F2242000090562F2242000090662F2242000090762F2242000090862F2242000090962F2242000090A62F2242000090B62F2242000090C62F2242000090D62F2242000090E62F2242000090F62F2242000091062F2242000091162F2242000091262F2242000091362F2242000091462F2242000091562F2242000091662F2242000091762F2242000091862F2242000091962F2242000091A62F2242000091B62F2242000091C62F2242000091D62F2242000091E62F2242000091F62F22420849200092062F2242000092162F2242000092262F28465242000092362F2242000092462F2242000092562F2242000092662F2242000092762F2242000092862F2242000092962F2242000092A62F2242000092B62F2242000092C62F2242000092D62F2242000092E62F2242000092F62F2242000093062F2242000093162F2242000093262F2242000093362F2242000093462F2242000093562F2242000093662F2242000093762F2242000093862F2242000093962F2242000093A62F2242000093B62F2242000093C62F2242000093D62F2242000093E62F2242000093F62F2242000094062F2242000094162F2242000094262F2242000094362F2242000094462F2242000094562F2242000094662F2242000094762F2242000094862F2242000094962F2242000094A62F2242000094B62F2242000094C62F2242000094D62F2242000094E62F2242000094F62F2242000095062F2242000095162F2242000095262F2242000095362F2242000095462F2242000095562F2242000095662F2242000095762F2242000095862F2242000095962F2242000095A62F2242000095B62F2242000095C62F2242000095D62F2242000095E62F2242000095F62F2242000096062F2242000096162F2242000096262F2242000096362F2242000096462F2242000096562F2242000096662F2242000096762F2242000096862F2242000096962F2242000096A62F2242000096B62F2242000096C62F2242000096D62F2242000096E62F2242000096F62F2242000097062F2242000097162F2242000097262F2242000097362F2242000097462F2242000097562F2242000097662F2242000097762F2242000097862F2242000097962F2242000097A62F2242000097B62F2242000097C62F2242000097D62F2242000097E62F2242000097F62F2242000098062F2242000098162F2242000098262F2242000098362F2242000098462F2242000098562F2242000098662F2242000098762F2242000098862F2242000098962F2242000098A62F2242000098B62F2242000098C62F2242000098D62F2242000098E62F2242000098F62F2242000099062F2242000099162F2242000099262F2242000099362F2242000099462F2242000099562F2242000099662F2242000099762F2242000099862F2242000099962F2242000099A62F2242000099B62F2242000099C62F2242000099D62F2242000099E62F2242000099F62F224200009A062F224200009A162F224200009A262F224200009A362F224200009A462F224200009A562F224200009A662F224200009A762F224200009A862F224200009A962F224200009AA62F224200009AB62F224200009AC62F224200009AD62F224200009AE62F224200009AF62F224200009B062F224200009B162F224200009B262F224200009B362F224200009B462F224200009B562F224200009B662F224200009B762F224200009B862F224200009B962F224200009BA62F224200009BB62F224200009BC62F224200009BD62F224200009BE62F224200009BF62F224200009C062F224200009C162F224200009C262F224200009C3000D0002001600090002002A00040001000000000300075A'O; + +/* test whether a message with chnked length determinant is parsed */ +testcase TC_chunked_len() runs on test_CT { + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, c_chunked)); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* test whether a message with chunked length determinant is parsed if each byte is received separately */ +testcase TC_chunked_len_bytewise() runs on test_CT { + f_init(); + tcp_send_segmented(c_chunked, 100, 0.05); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +control { + execute( TC_1byte_len() ); + execute( TC_1byte_len_bytewise() ); + execute( TC_1byte_len_chained() ); + execute( TC_2byte_len() ); + execute( TC_2byte_len_bytewise() ); + execute( TC_2byte_len_chained() ); + execute( TC_2byte_len_chained_bytewise() ); + execute( TC_chunked_len() ); + execute( TC_chunked_len_bytewise() ); +} + + +} diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh new file mode 100755 index 0000000..075be2f --- /dev/null +++ b/cbc/gen_links.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.SCTPasp/src +FILES="SCTPasp_PT.cc SCTPasp_PT.hh SCTPasp_PortType.ttcn SCTPasp_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src +FILES="BSSAP_Types.ttcn" +gen_links $DIR $FILES + +DIR=../library/sabp +FILES="SABP_CommonDataTypes.asn SABP_Constants.asn SABP_Containers.asn SABP_IEs.asn SABP_PDU_Contents.asn SABP_PDU_Descriptions.asn SABP_Types.ttcn SABP_EncDec.cc SABP_Templates.ttcn " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Abstract_Socket/src +FILES="Abstract_Socket.cc Abstract_Socket.hh " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.HTTPmsg/src +FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.JSON_v07_2006/src +FILES="JSON_EncDec.cc JSON_Types.ttcn " +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="HTTP_Adapter.ttcn " +FILES+="BSSMAP_Templates.ttcn " +FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " +FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " +FILES+="SABP_CodecPort.ttcn SABP_CodecPort_CtrlFunct.ttcn SABP_CodecPort_CtrlFunctDef.cc SABP_Adapter.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh new file mode 100755 index 0000000..0b145e9 --- /dev/null +++ b/cbc/regen_makefile.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc SCTPasp_PT.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc CBSP_CodecPort_CtrlFunctdef.cc SABP_EncDec.cc SABP_CodecPort_CtrlFunctDef.cc " +#FILES+="*.ttcnpp " +FILES+="*.asn" + +export CPPFLAGS_TTCN3="" + +../regen-makefile.sh CBC_Tests.ttcn $FILES + +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index 5ee1f33..5da2958 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -54,7 +54,7 @@ if (istemplatekind(val, "omit")) { ie := omit; } else if (istemplatekind(val, "*")) { - ie := tr_CBSP_IE({channel_ind := ?}) ifpresent; + ie := tr_CBSP_IE({channel_ind := ?}); //ifpresent; } else { ie := tr_CBSP_IE({channel_ind := val}); } @@ -542,14 +542,20 @@ ts_OldSerNo(old_ser_nr), ts_CbspCellList(cell_list), ts_CbspChannelInd(channel_ind)}); -template CBSP_PDU tr_CBSP_KILL(template uint16_t msg_id := ?, template uint16_t old_ser_nr := ?, - template BSSMAP_FIELD_CellIdentificationList cell_list := ?, - template uint8_t channel_ind := ?) := - tr_CBSP(CBSP_MSGT_KILL, { - tr_CbspMsgId(msg_id), - tr_OldSerNo(old_ser_nr), - tr_CbspCellList(cell_list), - tr_CbspChannelInd(channel_ind) }); +function tr_CBSP_KILL(template uint16_t msg_id := ?, template uint16_t old_ser_nr := ?, + template BSSMAP_FIELD_CellIdentificationList cell_list := ?, + template uint8_t channel_ind := ?) +return template (present) CBSP_PDU { + var template CBSP_IEs ies := { + tr_CbspMsgId(msg_id), + tr_OldSerNo(old_ser_nr), + tr_CbspCellList(cell_list) + }; + if (not istemplatekind(channel_ind, "omit")) { + ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind); + } + return tr_CBSP(CBSP_MSGT_KILL, ies); +} /* 8.1.3.5 KILL COMPLETE */ function ts_CBSP_KILL_COMPL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, diff --git a/library/CBSP_Types.ttcn b/library/CBSP_Types.ttcn index c4c6cf2..5ab3c98 100644 --- a/library/CBSP_Types.ttcn +++ b/library/CBSP_Types.ttcn @@ -378,5 +378,24 @@ external function dec_CBSP_PDU(in octetstring msg) return CBSP_PDU with { extension "prototype(convert) decode(RAW)" }; +/* convert from warning period encoding to seconds */ +function f_cbsp_period2s(uint8_t period) return integer +{ + if (period == 0) { + return -1; /* infinite */ + } else if (period <= 10) { + return period; + } else if (period <= 20) { + return 10 + (period - 10)*2; + } else if (period <= 38) { + return 30 + (period - 20)*5; + } else if (period <= 86) { + return 120 + (period - 38)*10; + } else if (period <= 186) { + return 600 + (period - 86)*30; + } else { + return 0; + } +} } with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/library/SABP_Adapter.ttcn b/library/SABP_Adapter.ttcn index e94e91c..046f597 100644 --- a/library/SABP_Adapter.ttcn +++ b/library/SABP_Adapter.ttcn @@ -20,7 +20,7 @@ import from SABP_CodecPort_CtrlFunct all; import from IPL4asp_Types all; import from IPL4asp_PortType all; -//import from Socket_API_Definitions all; +import from Socket_API_Definitions all; const integer SABP_HDR_LEN := 3; @@ -72,7 +72,7 @@ * If the callback function detects that the it will be impossible to determine the length of the message, * even receiving more octets, should return "-2". In this case the connection will be closed and the * length calculation error will be reported. */ -private function f_APER_getMsgLen(in octetstring stream, inout ro_integer args) return integer { +private function f_APER_getMsgLen(in octetstring stream, inout Socket_API_Definitions.ro_integer args) return integer { var integer stream_len := lengthof(stream); var integer hdr_len := args[0]; var octetstring stream_nohdr; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 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: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f Gerrit-Change-Number: 23022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:26:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:26:30 +0000 Subject: Change in osmo-bsc[master]: abis_nm: enrich debug messages with contextual info In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20148 ) Change subject: abis_nm: enrich debug messages with contextual info ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I68f64e6cae061a49733c4885ba383d2b9b4cfca9 Gerrit-Change-Number: 20148 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:26:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:28:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:28:05 +0000 Subject: Change in osmo-bts[master]: ta_control: fix Timing Advance control for SDCCH channels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22907 ) Change subject: ta_control: fix Timing Advance control for SDCCH channels ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b Gerrit-Change-Number: 22907 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:28:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:30:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:30:56 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/22942/3/Transceiver52M/osmo-trx.cpp File Transceiver52M/osmo-trx.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/22942/3/Transceiver52M/osmo-trx.cpp at 545 PS3, Line 545: ost << " LO freq. offset......... " << trx->cfg.offset << std::endl; So what's the difference between LO freq offse and Tune freq offset? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:30:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:33:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:33:01 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23013 ) Change subject: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 Gerrit-Change-Number: 23013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:33:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:37:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:37:07 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: add support for SGSN oriented RESET In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22945 ) Change subject: gprs_bssgp: add support for SGSN oriented RESET ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c at 134 PS2, Line 134: */ missing return info https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c at 143 PS2, Line 143: msgb_bvci(msg) = 0; /* Signalling */ BVCI_SIGNALLING https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c at 150 PS2, Line 150: bssgp_create_cell_id(bssgp_cid, ra_id, cell_id); I really wonder why do we have this kind of APIs storing into a buffer instead of having a packet struct (raid, which we already have a a struct for, plus CI). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:37:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:38:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:38:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 ) Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016/1/pcu/PCU_Tests_SNS.ttcn File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016/1/pcu/PCU_Tests_SNS.ttcn at 250 PS1, Line 250: /* do an SGSN oriented reset of signalling BVCI, then the SGSN tries to reset an unknown BVCI. */ >From the test description it's not cleat to me wheter it's an expected functionality or it's actually a bug. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:38:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:40:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:40:42 +0000 Subject: Change in docker-playground[master]: osmo-ggsn-master: add configure --enable-gtp-linux In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23004 ) Change subject: osmo-ggsn-master: add configure --enable-gtp-linux ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 Gerrit-Change-Number: 23004 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:40:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:40:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:40:46 +0000 Subject: Change in docker-playground[master]: cbc: Add osmo-cbc-master container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23023 ) Change subject: cbc: Add osmo-cbc-master container ...................................................................... cbc: Add osmo-cbc-master container Change-Id: I7f144899725cd0f049f860beced45e37b3242a93 --- A osmo-cbc-master/Dockerfile A osmo-cbc-master/Makefile A osmo-cbc-master/Release.key A osmo-cbc-master/osmo-cbc.cfg 4 files changed, 134 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/23023/1 diff --git a/osmo-cbc-master/Dockerfile b/osmo-cbc-master/Dockerfile new file mode 100644 index 0000000..c305ac4 --- /dev/null +++ b/osmo-cbc-master/Dockerfile @@ -0,0 +1,71 @@ +ARG USER +ARG DISTRO +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN case "$DISTRO" in \ + debian*) \ + apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \ + ;; \ + esac + +# we need to add this to invalidate the cache once the repository is updated. +# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM +ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + libosmocore-dev \ + libosmo-netif-dev \ + libulfius-dev \ + && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + "pkgconfig(libosmo-netif)" \ + "pkgconfig(libosmocore)" \ + "pkgconfig(libosmoctrl)" \ + "pkgconfig(libosmogsm)" \ + "pkgconfig(libosmovty)" \ + "pkgconfig(libulfius)" \ + ;; \ + esac + +WORKDIR /tmp + +ARG OSMO_CBC_BRANCH="master" + +RUN git clone git://git.osmocom.org/osmo-cbc.git +ADD http://git.osmocom.org/osmo-cbc/patch?h=$OSMO_CBC_BRANCH /tmp/commit-osmo-cbc + +RUN cd osmo-cbc && \ + git fetch && git checkout $OSMO_CBC_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_CBC_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure && \ + make "-j$(nproc)" install + +VOLUME /data + +COPY osmo-cbc.cfg /data/osmo-cbc.cfg + +WORKDIR /data +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-cbc -c /data/osmo-cbc.cfg >/data/osmo-cbc.log 2>&1"] + +#EXPOSE diff --git a/osmo-cbc-master/Makefile b/osmo-cbc-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-cbc-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-cbc-master/Release.key b/osmo-cbc-master/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-cbc-master/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-cbc-master/osmo-cbc.cfg b/osmo-cbc-master/osmo-cbc.cfg new file mode 100644 index 0000000..0d371c5 --- /dev/null +++ b/osmo-cbc-master/osmo-cbc.cfg @@ -0,0 +1,42 @@ +! +! OsmoCBC (0.1.0.5-e88e) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print extended-timestamp 1 + logging print level 1 + logging print file 1 last + logging level cbsp debug + logging level rest debug + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice + logging level lns notice + logging level lbssgp notice +! +line vty + no login + bind 0.0.0.0 +! +cbc + unknown-peers reject -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7f144899725cd0f049f860beced45e37b3242a93 Gerrit-Change-Number: 23023 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:41:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:41:31 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 ) Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... Patch Set 2: Code-Review+1 oh that's interesting, so traps do work if "-e" is passed after setting them? I didn't know that. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:41:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:41:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 09:41:56 +0000 Subject: Change in docker-playground[master]: jenkins-common: put fix_perms() in clean_up_common In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23003 ) Change subject: jenkins-common: put fix_perms() in clean_up_common ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 Gerrit-Change-Number: 23003 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 09:41:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 09:59:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 09:59:14 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 22 Feb 2021 09:59:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:02:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:02:54 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 3: (5 comments) https://gerrit.osmocom.org/c/docker-playground/+/23005/3/osmo-ggsn-latest/Dockerfile File osmo-ggsn-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/osmo-ggsn-latest/Dockerfile at 22 PS3, Line 22: RUN ln -s /bin/true /usr/local/bin/update-initramfs && \ Some description about this would be welcome https://gerrit.osmocom.org/c/docker-playground/+/23005/3/scripts/kernel-test/qemu-ifup.sh File scripts/kernel-test/qemu-ifup.sh: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/scripts/kernel-test/qemu-ifup.sh at 5 PS3, Line 5: echo "[host] qemu-ifup: $br, $1, $docker_if" maybe store $1 to some variable explaining the name instead of using $1 several times. https://gerrit.osmocom.org/c/docker-playground/+/23005/3/scripts/kernel-test/qemu-ifup.sh at 11 PS3, Line 11: ethtool -K $br gro off gso off tso off tx off rx off sg off >/dev/null 2>&1 I don't think we need the ethtool lines here and below. https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/initrd-ggsn.sh File ttcn3-ggsn-test/initrd-ggsn.sh: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/initrd-ggsn.sh at 18 PS3, Line 18: Not sure what do we win by creating a separate initrd instead of simply sharing the docker rootfs inside the qemu env (security?), but fine. https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/jenkins.sh File ttcn3-ggsn-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/jenkins.sh at 24 PS3, Line 24: cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ This line can be moved to the else condition below. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 10:02:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:04:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:04:04 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/23005/2/ttcn3-ggsn-test/kernel-config File ttcn3-ggsn-test/kernel-config: https://gerrit.osmocom.org/c/docker-playground/+/23005/2/ttcn3-ggsn-test/kernel-config at 5 PS2, Line 5: CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" > it might be best to only store those few things we need to enable compared to a defconfig. [?] Agree with laforge, I'd prefer using config fragments with the relevant configs to enable. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 10:04:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:04:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:04:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cbc: Initial set of CBC tess for osmo-cbc In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 to look at the new patch set (#2). Change subject: cbc: Initial set of CBC tess for osmo-cbc ...................................................................... cbc: Initial set of CBC tess for osmo-cbc osmo-cbc is the Osmocom cell broadcast centre. So far, there was no TTCN-3 test suite. Let's change that. Change-Id: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f --- M Makefile A cbc/CBC_Tests.cfg A cbc/CBC_Tests.default A cbc/CBC_Tests.ttcn A cbc/ECBE_Types.ttcn A cbc/SABP_Selftest.ttcn A cbc/gen_links.sh A cbc/regen_makefile.sh M library/CBSP_Templates.ttcn M library/CBSP_Types.ttcn M library/SABP_Adapter.ttcn 11 files changed, 929 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/23022/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 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: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f Gerrit-Change-Number: 23022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:05:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:05:09 +0000 Subject: Change in libosmocore[master]: CBSP: fix encoding/decoding of keep-alive repetition period In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23017 ) Change subject: CBSP: fix encoding/decoding of keep-alive repetition period ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04baa6b6b99b092fa0512b3b6138a363c7f3a13d Gerrit-Change-Number: 23017 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:05:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:05:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:05:54 +0000 Subject: Change in libosmocore[master]: CBSP: Fix encoding of warning period In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23018 ) Change subject: CBSP: Fix encoding of warning period ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf3cae48a6ab45550d7bbd937bb49a0e1a4e8aed Gerrit-Change-Number: 23018 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:05:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:06:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:06:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: factor-out HTTP_Adapter.ttcn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 ) Change subject: remsim: factor-out HTTP_Adapter.ttcn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 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: I87a728272d47649e4faa628fad44d6f8673c8169 Gerrit-Change-Number: 23019 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:06:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:07:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:07:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 ) Change subject: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 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: I5c7575c0b58c3606d25d8f8cfccd47cfb7a8c400 Gerrit-Change-Number: 23021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:07:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:07:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:07:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: Make timeout configurable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 ) Change subject: HTTP_Adapter: Make timeout configurable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 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: Icdcba367dc12c0f20a733572da250d7db22c03ee Gerrit-Change-Number: 23020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:11:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:11:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cbc: Initial set of CBC tess for osmo-cbc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 ) Change subject: cbc: Initial set of CBC tess for osmo-cbc ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022/2/cbc/CBC_Tests.default File cbc/CBC_Tests.default: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022/2/cbc/CBC_Tests.default at 10 PS2, Line 10: // Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoCBC"; why is this commented? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 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: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f Gerrit-Change-Number: 23022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:11:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:25:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 10:25:39 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/openbsc/+/22990 to look at the new patch set (#2). Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Related: OS#5034 --- M openbsc/tests/db/db_test.c M openbsc/tests/smpp/smpp_test.c M openbsc/tests/subscr/bsc_subscr_test.c M openbsc/tests/subscr/subscr_test.c 4 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/90/22990/2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:38:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:38:12 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22990 ) Change subject: tests: Explicitly drop category from log ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 10:38:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:38:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:38:18 +0000 Subject: Change in openbsc[master]: gitignore: Ignore configure~ file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/22991 ) Change subject: gitignore: Ignore configure~ file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie2ec89307ca941e52cb898ce045e423c44f32658 Gerrit-Change-Number: 22991 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 10:38:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:38:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:38:22 +0000 Subject: Change in openbsc[master]: tests: Explicitly drop category from log In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/22990 ) Change subject: tests: Explicitly drop category from log ...................................................................... tests: Explicitly drop category from log Let's disable category here since we don't care about its formatting here. In any case, every test relying on logging output validation should always explicitly state the config to avoid issues in the future if default values change. Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Related: OS#5034 --- M openbsc/tests/db/db_test.c M openbsc/tests/smpp/smpp_test.c M openbsc/tests/subscr/bsc_subscr_test.c M openbsc/tests/subscr/subscr_test.c 4 files changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index 3d44930..5742b43 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -207,6 +207,8 @@ osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); dummy_net.subscr_group = &dummy_sgrp; dummy_sgrp.net = &dummy_net; diff --git a/openbsc/tests/smpp/smpp_test.c b/openbsc/tests/smpp/smpp_test.c index 62fa9d2..e1e9a8b 100644 --- a/openbsc/tests/smpp/smpp_test.c +++ b/openbsc/tests/smpp/smpp_test.c @@ -67,6 +67,8 @@ osmo_init_logging(&log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); test_coding_scheme(); return EXIT_SUCCESS; diff --git a/openbsc/tests/subscr/bsc_subscr_test.c b/openbsc/tests/subscr/bsc_subscr_test.c index 60d687d..20ce07d 100644 --- a/openbsc/tests/subscr/bsc_subscr_test.c +++ b/openbsc/tests/subscr/bsc_subscr_test.c @@ -118,6 +118,7 @@ log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); log_set_category_filter(osmo_stderr_target, DREF, 1, LOGL_DEBUG); bsc_subscribers = talloc_zero(NULL, struct llist_head); diff --git a/openbsc/tests/subscr/subscr_test.c b/openbsc/tests/subscr/subscr_test.c index 2a5d0e1..78fa7bb 100644 --- a/openbsc/tests/subscr/subscr_test.c +++ b/openbsc/tests/subscr/subscr_test.c @@ -106,6 +106,8 @@ printf("Testing subscriber core code.\n"); osmo_init_logging(&log_info); log_set_print_filename(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); dummy_net.subscr_group = &dummy_sgrp; dummy_sgrp.net = &dummy_net; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2697ec547468019a544b66daf9dbb58aa8d9772b Gerrit-Change-Number: 22990 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:38:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:38:23 +0000 Subject: Change in openbsc[master]: gitignore: Ignore configure~ file In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/22991 ) Change subject: gitignore: Ignore configure~ file ...................................................................... gitignore: Ignore configure~ file Change-Id: Ie2ec89307ca941e52cb898ce045e423c44f32658 --- M openbsc/.gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbsc/.gitignore b/openbsc/.gitignore index a1695c6..e99632d 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -38,6 +38,7 @@ libtool ltmain.sh m4/*.m4 +configure~ # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ie2ec89307ca941e52cb898ce045e423c44f32658 Gerrit-Change-Number: 22991 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:38:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:38:24 +0000 Subject: Change in openbsc[master]: tests: Replace deprecated API log_set_print_filename In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/22992 ) Change subject: tests: Replace deprecated API log_set_print_filename ...................................................................... tests: Replace deprecated API log_set_print_filename Change-Id: I2bd75313daab58704625245af2dd39d88ee42872 --- M openbsc/tests/db/db_test.c M openbsc/tests/smpp/smpp_test.c M openbsc/tests/subscr/bsc_subscr_test.c M openbsc/tests/subscr/subscr_test.c 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c index 5742b43..ad41729 100644 --- a/openbsc/tests/db/db_test.c +++ b/openbsc/tests/db/db_test.c @@ -205,7 +205,7 @@ { printf("Testing subscriber database code.\n"); osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/openbsc/tests/smpp/smpp_test.c b/openbsc/tests/smpp/smpp_test.c index e1e9a8b..99c2683 100644 --- a/openbsc/tests/smpp/smpp_test.c +++ b/openbsc/tests/smpp/smpp_test.c @@ -66,7 +66,7 @@ { osmo_init_logging(&log_info); log_set_use_color(osmo_stderr_target, 0); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); diff --git a/openbsc/tests/subscr/bsc_subscr_test.c b/openbsc/tests/subscr/bsc_subscr_test.c index 20ce07d..cbe635e 100644 --- a/openbsc/tests/subscr/bsc_subscr_test.c +++ b/openbsc/tests/subscr/bsc_subscr_test.c @@ -114,7 +114,7 @@ { printf("Testing BSC subscriber core code.\n"); osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); diff --git a/openbsc/tests/subscr/subscr_test.c b/openbsc/tests/subscr/subscr_test.c index 78fa7bb..947c2c3 100644 --- a/openbsc/tests/subscr/subscr_test.c +++ b/openbsc/tests/subscr/subscr_test.c @@ -105,7 +105,7 @@ { printf("Testing subscriber core code.\n"); osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/22992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2bd75313daab58704625245af2dd39d88ee42872 Gerrit-Change-Number: 22992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:39:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:39:10 +0000 Subject: Change in libosmocore[master]: support for stats static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22958 ) Change subject: support for stats static userspace probes via systemtap ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7208c45f6d051505dd2435305c67b4d26c0b1dd2 Gerrit-Change-Number: 22958 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 10:39:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:39:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:39:17 +0000 Subject: Change in libosmocore[master]: CBSP: fix encoding/decoding of keep-alive repetition period In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23017 ) Change subject: CBSP: fix encoding/decoding of keep-alive repetition period ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04baa6b6b99b092fa0512b3b6138a363c7f3a13d Gerrit-Change-Number: 23017 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:39:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:39:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:39:25 +0000 Subject: Change in libosmocore[master]: CBSP: Fix encoding of warning period In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23018 ) Change subject: CBSP: Fix encoding of warning period ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf3cae48a6ab45550d7bbd937bb49a0e1a4e8aed Gerrit-Change-Number: 23018 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:39:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:39:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:39:26 +0000 Subject: Change in libosmocore[master]: support for stats static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22958 ) Change subject: support for stats static userspace probes via systemtap ...................................................................... support for stats static userspace probes via systemtap We currently only have probes for the logging sub-system. This patch adds two tracepoints for tracing the performance impact of statistics reporting: stat_start and stat_done. They can be used to trace the amount of time a libosmocore-using application spends in reporting/exporting statistics. This includes both the CPU time for encoding the statistics, as well as the system calls for sending them. Change-Id: I7208c45f6d051505dd2435305c67b4d26c0b1dd2 Related: OS#4311 Related: SYS#4877 --- M src/probes.d M src/stats.c M tapset/libosmocore.stp 3 files changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/probes.d b/src/probes.d index c16eb1e..e4150f0 100644 --- a/src/probes.d +++ b/src/probes.d @@ -1,4 +1,6 @@ provider libosmocore { probe log_start(); probe log_done(); + probe stats_start(); + probe stats_done(); }; diff --git a/src/stats.c b/src/stats.c index c91a978..a0834d2 100644 --- a/src/stats.c +++ b/src/stats.c @@ -90,6 +90,17 @@ #include #include +#ifdef HAVE_SYSTEMTAP +/* include the generated probes header and put markers in code */ +#include "probes.h" +#define TRACE(probe) probe +#define TRACE_ENABLED(probe) probe ## _ENABLED() +#else +/* Wrap the probe to allow it to be removed when no systemtap available */ +#define TRACE(probe) +#define TRACE_ENABLED(probe) (0) +#endif /* HAVE_SYSTEMTAP */ + #define STATS_DEFAULT_INTERVAL 5 /* secs */ #define STATS_DEFAULT_BUFLEN 256 @@ -781,6 +792,7 @@ int osmo_stats_report() { /* per group actions */ + TRACE(LIBOSMOCORE_STATS_START()); osmo_counters_for_each(handle_counter, NULL); rate_ctr_for_each_group(rate_ctr_group_handler, NULL); osmo_stat_item_for_each_group(osmo_stat_item_group_handler, NULL); @@ -788,6 +800,7 @@ /* global actions */ osmo_stat_item_discard_all(¤t_stat_item_index); flush_all_reporters(); + TRACE(LIBOSMOCORE_STATS_DONE()); return 0; } diff --git a/tapset/libosmocore.stp b/tapset/libosmocore.stp index 0ec3c42..a3e8f21 100644 --- a/tapset/libosmocore.stp +++ b/tapset/libosmocore.stp @@ -16,3 +16,14 @@ { probestr = sprintf("%s", $$name); } + +probe libosmocore_stats_start = process("libosmocore").mark("statsd_start") +{ + count = $arg1; + probestr = sprintf("%s(count=%d), $$name, count); +} + +probe libosmocore_stats_done = process("libosmocore").mark("statsd_done") +{ + probestr = sprintf("%s", $$name); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7208c45f6d051505dd2435305c67b4d26c0b1dd2 Gerrit-Change-Number: 22958 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:39:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:39:27 +0000 Subject: Change in libosmocore[master]: CBSP: fix encoding/decoding of keep-alive repetition period In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23017 ) Change subject: CBSP: fix encoding/decoding of keep-alive repetition period ...................................................................... CBSP: fix encoding/decoding of keep-alive repetition period Even though the value is only between 0..120s, they didn't encode it 1:1 in the uint8_t, but 3GPP chose to use the same encoding as for the warning period (which has a much larger range). Let's fix this in our implementation. Before this patch, osmo-cbc wanted to send 30s keep-alive repetition period, but a spec-compliant receiver actually decoded this as 80s. Change-Id: I04baa6b6b99b092fa0512b3b6138a363c7f3a13d --- M src/gsm/cbsp.c 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index 2c7a7b7..fa599c5 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -352,7 +352,12 @@ /* 8.1.3.18a KEEP ALIVE */ static int cbsp_enc_keep_alive(struct msgb *msg, const struct osmo_cbsp_keep_alive *in) { - msgb_tv_put(msg, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, in->repetition_period); + int rperiod = encode_wperiod(in->repetition_period); + if (in->repetition_period > 120) + return -EINVAL; + if (rperiod < 0) + return -EINVAL; + msgb_tv_put(msg, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, rperiod); return 0; } @@ -1083,12 +1088,14 @@ static int cbsp_dec_keep_alive(struct osmo_cbsp_keep_alive *out, const struct tlv_parsed *tp, struct msgb *in, void *ctx) { + uint8_t rperiod; if (!TLVP_PRES_LEN(tp, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, 1)) { osmo_cbsp_errstr = "missing/short mandatory IE"; return -EINVAL; } - out->repetition_period = *TLVP_VAL(tp, CBSP_IEI_KEEP_ALIVE_REP_PERIOD); + rperiod = *TLVP_VAL(tp, CBSP_IEI_KEEP_ALIVE_REP_PERIOD); + out->repetition_period = decode_wperiod(rperiod); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I04baa6b6b99b092fa0512b3b6138a363c7f3a13d Gerrit-Change-Number: 23017 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:39:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:39:27 +0000 Subject: Change in libosmocore[master]: CBSP: Fix encoding of warning period In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23018 ) Change subject: CBSP: Fix encoding of warning period ...................................................................... CBSP: Fix encoding of warning period The warning period encoding was wrong, resulting in way too short warning periods being encoded than intended/specified by the caller. Change-Id: Idf3cae48a6ab45550d7bbd937bb49a0e1a4e8aed --- M src/gsm/cbsp.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index fa599c5..353f53f 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -130,13 +130,13 @@ if (secs <= 10) return secs; if (secs <= 30) - return (secs-10)/2; + return 10 + (secs-10)/2; if (secs <= 120) - return (secs-30)/5; + return 30 + (secs-30)/5; if (secs <= 600) - return (secs-120)/10; + return 120 + (secs-120)/10; if (secs <= 60*60) - return (secs-600)/30; + return 600 + (secs-600)/30; osmo_cbsp_errstr = "warning period out of range"; return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf3cae48a6ab45550d7bbd937bb49a0e1a4e8aed Gerrit-Change-Number: 23018 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:40:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:40:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cbc: Initial set of CBC tess for osmo-cbc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 ) Change subject: cbc: Initial set of CBC tess for osmo-cbc ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022/2/cbc/CBC_Tests.default File cbc/CBC_Tests.default: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022/2/cbc/CBC_Tests.default at 10 PS2, Line 10: // Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoCBC"; > why is this commented? because we're not yet using the VTY interface from the tests. But specifying a module parameter that doesn't exist (or onme for a non-existing module) leads to some kind of error, AFAIR. So it's here waiting to be used once we get to actually including the VTY interface from the tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 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: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f Gerrit-Change-Number: 23022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:40:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: Make timeout configurable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 ) Change subject: HTTP_Adapter: Make timeout configurable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 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: Icdcba367dc12c0f20a733572da250d7db22c03ee Gerrit-Change-Number: 23020 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:41:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: factor-out HTTP_Adapter.ttcn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 ) Change subject: remsim: factor-out HTTP_Adapter.ttcn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 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: I87a728272d47649e4faa628fad44d6f8673c8169 Gerrit-Change-Number: 23019 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:41:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 ) Change subject: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 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: I5c7575c0b58c3606d25d8f8cfccd47cfb7a8c400 Gerrit-Change-Number: 23021 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:41:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cbc: Initial set of CBC tess for osmo-cbc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 ) Change subject: cbc: Initial set of CBC tess for osmo-cbc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 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: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f Gerrit-Change-Number: 23022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 10:41:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: factor-out HTTP_Adapter.ttcn In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 ) Change subject: remsim: factor-out HTTP_Adapter.ttcn ...................................................................... remsim: factor-out HTTP_Adapter.ttcn There are other test suites (like osmo-cbc) which can reuse some of the HTTP utility code that was developed within the remsim test suite Change-Id: I87a728272d47649e4faa628fad44d6f8673c8169 --- A library/HTTP_Adapter.ttcn M remsim/RemsimServer_Tests.ttcn M remsim/gen_links.sh 3 files changed, 103 insertions(+), 82 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn new file mode 100644 index 0000000..a9d0d83 --- /dev/null +++ b/library/HTTP_Adapter.ttcn @@ -0,0 +1,101 @@ +module HTTP_Adapter { + +/* HTTP Adapter component, originally part of Integration Tests for osmo-remsim-server + * (C) 2019 by Harald Welte + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This test suite tests osmo-remsim-server by attaching to the external interfaces + * such as RSPRO for simulated clients + bankds and RSRES (REST backend interface). + */ + +import from HTTPmsg_Types all; +import from HTTPmsg_PortType all; + +type component http_CT { + port HTTPmsg_PT HTTP; + var charstring g_http_host; + var integer g_http_port; +}; + +function f_http_init(charstring host, integer http_port) runs on http_CT { + map(self:HTTP, system:HTTP); + g_http_host := host; + g_http_port := http_port; +} + +template (value) Connect ts_HTTP_Connect(template (value) charstring hostname, + template (value) integer http_port := 80, + template (value) boolean use_ssl := false) := { + hostname := hostname, + portnumber := http_port, + use_ssl := use_ssl +} +template (value) Close ts_HTTP_Close := { client_id := omit }; + +template (value) HeaderLines ts_HTTP_Header(charstring body) := { + { header_name := "Content-Type", header_value := "application/json" }, + { header_name := "Content-Length", header_value := int2str(lengthof(body)) } +} + +template (value) HTTPMessage ts_HTTP_Req(charstring url, + charstring method := "GET", + charstring body := "", + integer v_maj := 1, integer v_min := 1) := { + request := { + client_id := omit, + method := method, + uri := url, + version_major := v_maj, + version_minor := v_min, + header := ts_HTTP_Header(body), + body := body + } +} + +template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := { + response := { + client_id := ?, + version_major := ?, + version_minor := ?, + statuscode := sts, + statustext := ?, + header := ?, + body := ? + } +}; + +template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); + +/* run a HTTP request and return the response */ +function f_http_transact(charstring url, charstring method := "GET", + charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx) +runs on http_CT return HTTPMessage { + var HTTPMessage resp; + timer T := 2.0; + + HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); + //HTTP.receive(Connect_result:?); + HTTP.send(ts_HTTP_Req(url, method, body)); + T.start; + alt { + [] HTTP.receive(exp) -> value resp { + setverdict(pass); + } + [] HTTP.receive(tr_HTTP_Resp) -> value resp { + setverdict(fail, "Unexpected HTTP response ", resp); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for HTTP response"); + self.stop; + } + } + HTTP.send(ts_HTTP_Close); + return resp; +} + +} diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index 1ca5ce9..fd7a1a4 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -24,90 +24,9 @@ import from HTTPmsg_Types all; import from HTTPmsg_PortType all; +import from HTTP_Adapter all; import from JSON_Types all; -type component http_CT { - port HTTPmsg_PT HTTP; - var charstring g_http_host; - var integer g_http_port; -}; - -function f_http_init(charstring host, integer http_port) runs on http_CT { - map(self:HTTP, system:HTTP); - g_http_host := host; - g_http_port := http_port; -} - -template (value) Connect ts_HTTP_Connect(template (value) charstring hostname, - template (value) integer http_port := 80, - template (value) boolean use_ssl := false) := { - hostname := hostname, - portnumber := http_port, - use_ssl := use_ssl -} -template (value) Close ts_HTTP_Close := { client_id := omit }; - -template (value) HeaderLines ts_HTTP_Header(charstring body) := { - { header_name := "Content-Type", header_value := "application/json" }, - { header_name := "Content-Length", header_value := int2str(lengthof(body)) } -} - -template (value) HTTPMessage ts_HTTP_Req(charstring url, - charstring method := "GET", - charstring body := "", - integer v_maj := 1, integer v_min := 1) := { - request := { - client_id := omit, - method := method, - uri := url, - version_major := v_maj, - version_minor := v_min, - header := ts_HTTP_Header(body), - body := body - } -} - -template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := { - response := { - client_id := ?, - version_major := ?, - version_minor := ?, - statuscode := sts, - statustext := ?, - header := ?, - body := ? - } -}; - -template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); - -/* run a HTTP request and return the response */ -function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx) -runs on http_CT return HTTPMessage { - var HTTPMessage resp; - timer T := 2.0; - - HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); - //HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body)); - T.start; - alt { - [] HTTP.receive(exp) -> value resp { - setverdict(pass); - } - [] HTTP.receive(tr_HTTP_Resp) -> value resp { - setverdict(fail, "Unexpected HTTP response ", resp); - } - [] T.timeout { - setverdict(fail, "Timeout waiting for HTTP response"); - self.stop; - } - } - HTTP.send(ts_HTTP_Close); - return resp; -} - /* run a HTTP GET on specified URL expecting json in RSRES format as response */ function f_rsres_get(charstring url, template integer exp_sts := 200) runs on http_CT return JsRoot { diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index 995abfb..b25375b 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -42,6 +42,7 @@ FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn " #RSL_Types.ttcn RSL_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="HTTP_Adapter.ttcn " FILES+="VPCD_Types.ttcn VPCD_CodecPort.ttcn VPCD_CodecPort_CtrlFunct.ttcn VPCD_CodecPort_CtrlFunctDef.cc VPCD_Adapter.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23019 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: I87a728272d47649e4faa628fad44d6f8673c8169 Gerrit-Change-Number: 23019 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: Make timeout configurable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 ) Change subject: HTTP_Adapter: Make timeout configurable ...................................................................... HTTP_Adapter: Make timeout configurable Change-Id: Icdcba367dc12c0f20a733572da250d7db22c03ee --- M library/HTTP_Adapter.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index a9d0d83..03de1f3 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -73,10 +73,11 @@ /* run a HTTP request and return the response */ function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx) + charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, + float tout := 2.0) runs on http_CT return HTTPMessage { var HTTPMessage resp; - timer T := 2.0; + timer T := tout; HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); //HTTP.receive(Connect_result:?); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23020 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: Icdcba367dc12c0f20a733572da250d7db22c03ee Gerrit-Change-Number: 23020 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 ) Change subject: HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() ...................................................................... HTTP_Adapter: split into f_http_tx_request() / f_http_rx_response() There are some use cases in which we don't want a blocking wait for the full HTTP request to complete. Let's split it up in two parts, and make the existing f_http_transact() a wrapper around them. Also, enable the generation of the Connect_result primitive to detect connection failures. Change-Id: I5c7575c0b58c3606d25d8f8cfccd47cfb7a8c400 --- M library/HTTP_Adapter.ttcn M remsim/REMSIM_Tests.default 2 files changed, 18 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index 03de1f3..a957fdd 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -71,17 +71,17 @@ template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); -/* run a HTTP request and return the response */ -function f_http_transact(charstring url, charstring method := "GET", - charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, - float tout := 2.0) +function f_http_tx_request(charstring url, charstring method := "GET", charstring body := "") +runs on http_CT { + HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); + HTTP.receive(Connect_result:?); + HTTP.send(ts_HTTP_Req(url, method, body)); +} + +function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0) runs on http_CT return HTTPMessage { var HTTPMessage resp; timer T := tout; - - HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port)); - //HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body)); T.start; alt { [] HTTP.receive(exp) -> value resp { @@ -99,4 +99,13 @@ return resp; } +/* run a HTTP request and return the response */ +function f_http_transact(charstring url, charstring method := "GET", + charstring body := "", template HTTPMessage exp := tr_HTTP_Resp2xx, + float tout := 2.0) +runs on http_CT return HTTPMessage { + f_http_tx_request(url, method, body); + return f_http_rx_response(exp, tout); +} + } diff --git a/remsim/REMSIM_Tests.default b/remsim/REMSIM_Tests.default index 7a41555..3059a8d 100644 --- a/remsim/REMSIM_Tests.default +++ b/remsim/REMSIM_Tests.default @@ -1,3 +1,3 @@ [TESTPORT_PARAMETERS] system.HTTP.http_debugging := "yes" -system.HTTP.use_notification_ASPs := "no" +system.HTTP.use_notification_ASPs := "yes" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23021 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: I5c7575c0b58c3606d25d8f8cfccd47cfb7a8c400 Gerrit-Change-Number: 23021 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 10:41:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 10:41:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cbc: Initial set of CBC tess for osmo-cbc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 ) Change subject: cbc: Initial set of CBC tess for osmo-cbc ...................................................................... cbc: Initial set of CBC tess for osmo-cbc osmo-cbc is the Osmocom cell broadcast centre. So far, there was no TTCN-3 test suite. Let's change that. Change-Id: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f --- M Makefile A cbc/CBC_Tests.cfg A cbc/CBC_Tests.default A cbc/CBC_Tests.ttcn A cbc/ECBE_Types.ttcn A cbc/SABP_Selftest.ttcn A cbc/gen_links.sh A cbc/regen_makefile.sh M library/CBSP_Templates.ttcn M library/CBSP_Types.ttcn M library/SABP_Adapter.ttcn 11 files changed, 929 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Makefile b/Makefile index 2510e28..319cb87 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS=bsc bsc-nat bts ccid fr fr-net gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ +SUBDIRS=bsc bsc-nat bts cbc ccid fr fr-net gbproxy ggsn_tests hlr mgw mme msc pcu pgw remsim \ sccp selftest sgsn simtrace sip stp sysinfo smlc NPROC=$(shell nproc 2>/dev/null) diff --git a/cbc/CBC_Tests.cfg b/cbc/CBC_Tests.cfg new file mode 100644 index 0000000..7c2a3ac --- /dev/null +++ b/cbc/CBC_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./CBC_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +CBC_Tests.control diff --git a/cbc/CBC_Tests.default b/cbc/CBC_Tests.default new file mode 100644 index 0000000..48fe83d --- /dev/null +++ b/cbc/CBC_Tests.default @@ -0,0 +1,12 @@ +[LOGGING] +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; + +[TESTPORT_PARAMETERS] +*.CBCVTY.PROMPT1 := "OsmoCBC> " +*.TCP.noDelay := "yes" // turn off nagle +*.HTTP.use_notification_ASPs := "yes" + +[MODULE_PARAMETERS] +// Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoCBC"; + +[EXECUTE] diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn new file mode 100644 index 0000000..36fa55c --- /dev/null +++ b/cbc/CBC_Tests.ttcn @@ -0,0 +1,467 @@ +module CBC_Tests { + +import from Osmocom_Types all; + +import from BSSAP_Types all; +import from BSSMAP_Templates all; +import from CBSP_Types all; +import from CBSP_Templates all; +import from CBSP_Adapter all; +import from CBSP_CodecPort all; +import from Socket_API_Definitions all; + +import from HTTP_Adapter all; +import from HTTPmsg_Types all; +import from ECBE_Types all; + +modulepar { + charstring mp_cbc_host := "127.0.0.1"; + integer mp_cbc_port := 48049; + integer mp_ecbe_port := 12345; +}; + +type component test_CT extends CBSP_Adapter_CT, http_CT { +}; + +/********************************************************************************* + * ECBE (REST) interface + *********************************************************************************/ + +function f_ecbe_tx_post_cbs(EcbeCbcMessage cbc) +runs on http_CT { + var charstring body := oct2char(enc_EcbeCbcMessage(cbc)); + log("TX POST CBS: ", body); + var HTTPMessage http_resp; + f_http_tx_request(url := "/api/ecbe/v1/message", method := "POST", body := body); +} + +function f_ecbe_rx_resp(template integer exp_sts := (200..299)) +runs on http_CT return HTTPResponse { + var HTTPMessage http_resp := f_http_rx_response(tr_HTTP_Resp(exp_sts), tout := 20.0); + return http_resp.response; +} + +/* run a HTTP POST to add a new CBC message */ +function f_ecbe_post_cbs(EcbeCbcMessage cbc, template integer exp_sts := 201) +runs on http_CT return HTTPResponse { + f_ecbe_tx_post_cbs(cbc); + return f_ecbe_rx_resp(exp_sts) +} + +function f_ecbe_tx_delete_cbs(integer msg_id) +runs on http_CT { + f_http_tx_request("/api/ecbe/v1/message/" & int2str(msg_id), method := "DELETE"); +} + +/* run a HTTP GET on specified URL expecting json in RSRES format as response */ +function f_ecbe_delete_cbs(integer msg_id, template integer exp_sts := 200) +runs on http_CT return HTTPResponse { + f_ecbe_tx_delete_cbs(msg_id); + return f_ecbe_rx_resp(exp_sts); +} + + +altstep as_cbsp_reset(integer idx) runs on CBSP_Adapter_CT { + var CBSP_RecvFrom rf; + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESET)) -> value rf { + var CBSP_IE ie; + f_cbsp_find_ie(rf.msg, CBSP_IEI_CELL_LIST, ie); + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], + ts_CBSP_RESET_COMPL(ie.body.cell_list.cell_id))); + } +} + +private function f_cbs2ecbe_category(CBSP_Category cat_in) return EcbeCategory +{ + select (cat_in) { + case (CBSP_CATEG_HIGH_PRIO) { return high_priority; } + case (CBSP_CATEG_BACKGROUND) { return background; } + case (CBSP_CATEG_NORMAL) { return normal; } + case else { mtc.stop } + } +} + +private function f_cbs2ecbe_page(CBS_MessageContent inp) return EcbePage +{ + return hex2str(oct2hex(inp.payload)); +} + +/* convert from CBS_Message to EcbeCbcMessage */ +function f_cbs2ecbe(CBS_Message inp, charstring cbe_name) return EcbeCbcMessage +{ + var EcbeCbcMessage ret := { + cbe_name := cbe_name, + category := f_cbs2ecbe_category(inp.category), + repetition_period := inp.rep_period, + num_of_bcast := inp.num_bcast_req, + scope := { scope_plmn := {} }, + smscb_message := { + serial_nr := { + serial_nr_encoded := inp.ser_nr + }, + message_id := inp.msg_id, + payload := { + payload_encoded := { + dcs := inp.dcs, + pages := { } /* appended below */ + } + } + } + }; + for (var integer i := 0; i < lengthof(inp.content); i := i+1) { + ret.smscb_message.payload.payload_encoded.pages := + ret.smscb_message.payload.payload_encoded.pages & { f_cbs2ecbe_page(inp.content[i]) }; + } + return ret; +} + +/********************************************************************************* + * CBSP interface + *********************************************************************************/ + +/* receive + acknowledge KEEP-ALIVE */ +altstep as_cbsp_keepalive_ack(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_KEEP_ALIVE)) { + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], ts_CBSP_KEEP_ALIVE_COMPL)); + } +} + +/* receive + ignore RESTART */ +altstep as_cbsp_restart(integer idx) runs on CBSP_Adapter_CT { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], tr_CBSP_RESTART)); +} + +private function f_init(boolean raw := false) runs on test_CT { + f_http_init(mp_cbc_host, mp_ecbe_port); + CBSP_Adapter.f_connect(mp_cbc_host, mp_cbc_port, "", -1); + + if (not raw) { + var BSSMAP_FIELD_CellIdentificationList cell_list := { + cIl_allInBSS := ''O + }; + activate(as_cbsp_keepalive_ack(0)); + activate(as_cbsp_restart(0)); + f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_CBS, CBSP_RI_DATA_LOST)); + f_cbsp_send(ts_CBSP_RESTART(cell_list, CBSP_BC_MSGT_EMERG, CBSP_RI_DATA_LOST)); + as_cbsp_reset(0); + } +} + +/* test whether or not we receive a valid KEEP-ALIVE from the CBC */ +testcase TC_rx_keepalive() runs on test_CT { + var CBSP_PDU rx; + var CBSP_IE ie; + + f_init(); + rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); + f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); + + setverdict(pass); +} + +/* test whether CBC terminates connection if KEEP-ALIVE is not answered by BSC */ +testcase TC_rx_keepalive_timeout() runs on test_CT { + var CBSP_PDU rx; + var CBSP_IE ie; + var integer ka_rep_per_s; + + f_init(); + rx := f_cbsp_exp(tr_CBSP_KEEP_ALIVE(?)); + f_cbsp_find_ie(rx, CBSP_IEI_KEEP_ALIVE_REP_PERIOD, ie); + + /* sleep for longer than the keep-alive period */ + ka_rep_per_s := f_cbsp_period2s(ie.body.keep_alive_rep_period); + f_sleep(int2float(ka_rep_per_s + 5)); + + /* expect the CBSP connection to be closed */ + CBSP[0].receive(PortEvent:{connClosed:=?}) + + setverdict(pass); +} + +type record CBS_Message { + uint16_t msg_id, + uint16_t ser_nr, + uint16_t old_ser_nr optional, + BSSMAP_FIELD_CellIdentificationList cell_list, + uint8_t channel_ind, + CBSP_Category category, + uint16_t rep_period, + uint16_t num_bcast_req, + uint8_t dcs, + CBS_MessageContents content +}; +type record CBS_MessageContent { + octetstring payload, + uint8_t user_len +}; +type record of CBS_MessageContent CBS_MessageContents; + +/* handle a CBSP-WRITE-REPLACE and respond to it with COMPLETE or FAILURE depending on arguments */ +private function f_cbsp_write(CBS_Message msg, integer idx := 0, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_cell_list := omit, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit) +runs on test_CT { + var template CBSP_IEs content_ies := {}; + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + for (var integer i := 0; i < lengthof(msg.content); i := i+1) { + //content_ies[i] := tr_CbspMsgContent(msg.content[i].payload, msg.content[i].user_len); + content_ies[i] := tr_CbspMsgContent(?, ?); + } + rx_templ := tr_CBSP_WRITE_CBS(msg.msg_id, msg.ser_nr, msg.cell_list, msg.channel_ind, + msg.category, msg.rep_period, msg.num_bcast_req, msg.dcs, + content_ies); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + var template (value) BSSMAP_FIELD_CellIdentificationList tx_list; + if (istemplatekind(tx_cell_list, "omit")) { + /* use the "expected list" when confirming the write-replace */ + tx_list := msg.cell_list; + } else { + /* use an user-provided different list of cells */ + tx_list := valueof(tx_cell_list); + } + if (istemplatekind(tx_compl_list, "omit")) { + tx := ts_CBSP_WRITE_CBS_COMPL(msg.msg_id, msg.ser_nr, tx_list, msg.channel_ind); + } else { + tx := ts_CBSP_REPLACE_CBS_COMPL(msg.msg_id, msg.ser_nr, msg.old_ser_nr, + valueof(tx_compl_list), tx_list, + msg.channel_ind); + } + } else { + tx := ts_CBSP_WRITE_CBS_FAIL(msg.msg_id, msg.ser_nr, valueof(tx_fail_list), + omit, tx_cell_list, msg.channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +/* handle a CBSP-KILL and respond to it with COMPLETE or FAILURE depending on arguments */ +private function f_cbsp_handle_kill(integer idx, uint16_t msg_id, uint16_t ser_nr, + template BSSMAP_FIELD_CellIdentificationList exp_list, + template (omit) BSSMAP_FIELD_CellIdentificationList tx_list, + template (omit) CBSP_FailureListItems tx_fail_list := omit, + template (omit) CBSP_IE_NumBcastComplList tx_compl_list := omit, + template (omit) uint8_t channel_ind := omit) +runs on test_CT { + var template (present) CBSP_PDU rx_templ; + var CBSP_RecvFrom rf; + + rx_templ := tr_CBSP_KILL(msg_id, ser_nr, exp_list, channel_ind); + alt { + [] CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], rx_templ)) -> value rf { + var template (value) CBSP_PDU tx; + if (istemplatekind(tx_fail_list, "omit")) { + tx := ts_CBSP_KILL_COMPL(msg_id, ser_nr, tx_compl_list, tx_list, channel_ind); + } else { + tx := ts_CBSP_KILL_FAIL(msg_id, ser_nr, valueof(tx_fail_list), tx_compl_list, + tx_list, channel_ind); + } + CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], tx)); + } + [] as_cbsp_keepalive_ack(idx) { repeat; } + [] CBSP[idx].receive { + setverdict(fail, "Received unexpected CBSP in index ", idx); + } + } +} + +private const BSSMAP_FIELD_CellIdentificationList cil_BSS := { + cIl_allInBSS := ''O +}; + +testcase TC_write_replace() runs on test_CT { + f_init(); + var CBS_Message msg := { + msg_id := 42, + ser_nr := 16752, + old_ser_nr := omit, + cell_list := cil_BSS, + channel_ind := 0, + category := CBSP_CATEG_NORMAL, + rep_period := 5, + num_bcast_req := 3, + dcs := 1, + content := { + { '00'O, 1 } + } + }; + f_cbsp_write(msg); + f_sleep(100.0); +} + +testcase TC_selftest() runs on test_CT { + const octetstring c_load_q := '0700000d0400080000f110012345671200'O; + const octetstring c_load_q_compl := '0800000f0a000a0000f1100123456700001200'O; + const octetstring c_reset := '1000000b0400080000f11001234567'O; + const octetstring c_reset_compl := '1100000b0400080000f11001234567'O; + const octetstring c_msg_sts_q := '0a0000130e022b0200000400080000f110012345671200'O; + const octetstring c_msg_sts_q_fail := '0c0000140e022b0200000900090000f11001234567021200'O; + const octetstring c_kill := '040000110e00000200000400080000f11001234567'O; + const octetstring c_kill_fail := '060000120e00000200000900090000f1100123456702'O; + const octetstring c_write_repl := '010000c70e022b0300300400080000f110012345671200050006000407000613020c400107f4f29c9e769f5de337b90c921d1b8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d100'O; + const octetstring c_write_repl_compl := '020000130e022b0300300400080000f110012345671200'O; + const octetstring c_write_repl_fail := '030000140e022b0300300900090000f110012345670d1200'O; + const octetstring c_msg_s_q := '0a0000130e022b0200900400080000f110012345671200'O; + const octetstring c_msg_s_q_compl := '0b0000160e022b02009008000b0000f110012345670008001200'O; + const octetstring c_kill_compl := '050000160e022b02008008000b0000f110012345670006001200'O; + + log(dec_CBSP_PDU(c_load_q)); + log(dec_CBSP_PDU(c_load_q_compl)); + log(dec_CBSP_PDU(c_reset)); + log(dec_CBSP_PDU(c_reset_compl)); + log(dec_CBSP_PDU(c_msg_sts_q)); + log(dec_CBSP_PDU(c_msg_sts_q_fail)); + log(dec_CBSP_PDU(c_kill)); + log(dec_CBSP_PDU(c_kill_fail)); + log(dec_CBSP_PDU(c_write_repl)); + log(dec_CBSP_PDU(c_write_repl_compl)); + log(dec_CBSP_PDU(c_write_repl_fail)); + log(dec_CBSP_PDU(c_msg_s_q)); + log(dec_CBSP_PDU(c_msg_s_q_compl)); + log(dec_CBSP_PDU(c_kill_compl)); +} + +import from SABP_Types all; +import from SABP_Templates all; +import from SABP_IEs all; +import from SABP_PDU_Descriptions all; + +testcase TC_selftest_sabp() runs on test_CT { + const octetstring c_write := '00000080930000080006000211120007000240c0000f0010000113f0030282ec0613f0030282ec070001400100000d0002012a000900020000000400010100000056029f01b4d90d064297d9ec37e8fe96b3c9a0303bdd68341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d10012'O; + + log(dec_SABP_PDU(c_write)); + log(enc_SABP_PDU(dec_SABP_PDU(c_write))); + + var template (value) Service_Areas_List sa_list := { + ts_SabpSai('62F224'O, '0023'O, '0042'O) + }; + var template (value) SABP_PDU tx; + + tx := ts_SABP_Write(int2bit(1, 16), int2bit(1, 16), sa_list, 23, 42, '00000000'B, '01011010'B); + log("Write: ", enc_SABP_PDU(valueof(tx))) + + var Service_Areas_List sa_list2 := { valueof(ts_SabpSai('62F224'O, '1000'O, '0042'O)) }; + for (var integer i := 0; i < 2500; i := i+1) { + sa_list2 := sa_list2 & {valueof(ts_SabpSai('62F224'O, '2000'O, int2oct(i,2))) }; + } + tx := ts_SABP_Write(int2bit(2, 16), int2bit(2, 16), sa_list2, 23, 42, '00000000'B, '01011010'B); + log("Write: ", enc_SABP_PDU(valueof(tx))) + + tx := ts_SABP_Restart(sa_list); + log("Restart: ", enc_SABP_PDU(valueof(tx))); +} + +/********************************************************************************* + * ECBE interface (verifying expected procedures on CBSP) + *********************************************************************************/ + +function f_create_and_delete(CBS_Message msg, + template (omit) BSSMAP_FIELD_CellIdentificationList cell_list_success) +runs on test_CT { + var EcbeCbcMessage ecbe := f_cbs2ecbe(msg, "TTCN-3"); + f_ecbe_tx_post_cbs(ecbe); + f_cbsp_write(msg, 0, cell_list_success); + f_ecbe_rx_resp(201); + + f_sleep(2.0); + + f_ecbe_tx_delete_cbs(msg.msg_id); + /* FIXME: cbc segfaults if we terminate here (if we don't wait for Connect_result? */ + f_cbsp_handle_kill(0, msg.msg_id, msg.ser_nr, cell_list_success, cell_list_success); + f_ecbe_rx_resp(200); +} + +private template (value) CBS_Message t_CBSmsg(uint16_t msg_id, uint16_t ser_nr) := { + msg_id := msg_id, + ser_nr := ser_nr, + old_ser_nr := omit, + cell_list := cil_BSS, + channel_ind := 0, + category := CBSP_CATEG_NORMAL, + rep_period := 5, + num_bcast_req := 3, + dcs := 1, + content := { + { '00'O, 1 } + } +}; + +/* specify a variety of different Cell Identifier formats to extend test coverage */ +testcase TC_ecbe_create_delete_cgi() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(43, 16752); + + cell_list_success := ts_BSSMAP_CIL_CGI({ + ts_BSSMAP_CI_CGI('901'H, '70'H, 23, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(44, 16752); + cell_list_success := ts_BSSMAP_CIL_LAC_CI({ + ts_BSSMAP_CI_LAC_CI(10001, 50001), + ts_BSSMAP_CI_LAC_CI(10002, 50002), + ts_BSSMAP_CI_LAC_CI(10003, 50003) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_lac() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(45, 16752); + cell_list_success := ts_BSSMAP_CIL_LAC({ + ts_BSSMAP_CI_LAC(10001), + ts_BSSMAP_CI_LAC(10002), + ts_BSSMAP_CI_LAC(10003) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_ci() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(46, 16752); + cell_list_success := ts_BSSMAP_CIL_CI({ + ts_BSSMAP_CI_CI(50001), + ts_BSSMAP_CI_CI(50002), + ts_BSSMAP_CI_CI(50003) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} +testcase TC_ecbe_create_delete_lai() runs on test_CT { + f_init(); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(47, 16752); + cell_list_success := ts_BSSMAP_CIL_LAI({ + ts_BSSMAP_CI_LAI('901'H, '70'H, 25), + ts_BSSMAP_CI_LAI('901'H, '70'H, 26), + ts_BSSMAP_CI_LAI('901'H, '70'H, 27) + }); + f_create_and_delete(valueof(msg), cell_list_success); +} + +control { + execute( TC_rx_keepalive() ); + execute( TC_rx_keepalive_timeout() ); + execute( TC_ecbe_create_delete_cgi() ); + execute( TC_ecbe_create_delete_lac_ci() ); + execute( TC_ecbe_create_delete_lac() ); + execute( TC_ecbe_create_delete_ci() ); + execute( TC_ecbe_create_delete_lai() ); +} + +} diff --git a/cbc/ECBE_Types.ttcn b/cbc/ECBE_Types.ttcn new file mode 100644 index 0000000..7c66fb9 --- /dev/null +++ b/cbc/ECBE_Types.ttcn @@ -0,0 +1,147 @@ +module ECBE_Types { + +/* Type definitions for the ECBE (External Cell Broadcast Entity) protocol of OsmoCBC */ +/* (C) 2021 by Harald Welte + * All rights reserved. + */ + +/*********************************************************************** + * smscb.schema.json + ***********************************************************************/ + +type charstring EcbeLanguageCode length(2); + +type integer EcbeMessageId (0..65535); + +type enumerated EcbeGeographicScope { + cell_wide_immediate, + plmn_wide, + lac_sac_tac_wide, + cell_wide +}; + +type integer EcbeMessageCode (0..1023); + +type integer EcbeUpdateNumber (0..15); + +type integer EcbeSerialNrEncoded (0..65535); + +type record EcbeSerialNrDecoded { + EcbeGeographicScope geo_scope, + EcbeMessageCode msg_code, + EcbeUpdateNumber update_nr +}; + +type union EcbeSerialNr { + EcbeSerialNrEncoded serial_nr_encoded, + EcbeSerialNrDecoded serial_nr_decoded +}; + +type integer EcbeDcsEncoded (0..255); + +type enumerated EcbeCharacterSet { + gsm, + eight_bit, + ucs2 +}; + +type integer EcbeDcsClass (0..3); + +type record EcbePayloadDecoded { + EcbeCharacterSet character_set optional, + EcbeLanguageCode Language optional, + EcbeDcsClass dcs_class optional, + charstring data_utf8 +}; + +type charstring EcbePage; +type record of EcbePage EcbePages; + +type record EcbePayloadEncoded { + EcbeDcsEncoded dcs, + EcbePages pages +}; + +type integer EcbeWarningTypeEncoded (0..127); + +type enumerated EcbeWarningTypeDecoded { + earthquake, + tsunami, + earthquake_and_tsunami, + test, + other, + rfu +}; + +type union EcbeWarningType { + EcbeWarningTypeEncoded warning_type_encoded, + EcbeWarningTypeDecoded warning_type_decoded +}; + +type record EcbePayloadEtws { + EcbeWarningType warning_type, + boolean emergency_user_alert optional, + boolean popup_on_display optional, + charstring warning_sec_info optional +}; + +type union EcbePayload { + EcbePayloadEncoded payload_encoded, + EcbePayloadDecoded payload_decoded, + EcbePayloadEtws payload_etws +}; + +type record EcbeSmscbMessage { + EcbeSerialNr serial_nr, + EcbeMessageId message_id, + EcbePayload payload +}; + +external function enc_EcbeSmscbMessage(in EcbeSmscbMessage inp) return octetstring + with { extension "prototype(convert) encode(JSON)" } +external function dec_EcbeSmscbMessage(in octetstring inp) return EcbeSmscbMessage + with { extension "prototype(convert) decode(JSON)" } + +/*********************************************************************** + * cbc.schema.json + ***********************************************************************/ + +type enumerated EcbeCategory { + normal, + high_priority, + background +}; + +type integer EcbeRepetitionPeriod (1..4095); + +type enumerated EcbeChannelIndicator { + basic, + extended +}; + +type integer EcbeWarningPeriodSec (0..3600); + +type integer EcbeNumberOfBroadcasts (0..65535); + +type record EcbeScopePlmn { +}; + +type union EcbeScope { + EcbeScopePlmn scope_plmn +}; + +type record EcbeCbcMessage { + charstring cbe_name optional, + EcbeCategory category optional, + EcbeRepetitionPeriod repetition_period optional, + EcbeNumberOfBroadcasts num_of_bcast optional, + EcbeScope scope, + EcbeSmscbMessage smscb_message +}; + +external function enc_EcbeCbcMessage(in EcbeCbcMessage inp) return octetstring + with { extension "prototype(convert) encode(JSON)" } +external function dec_EcbeCbcMessage(in octetstring inp) return EcbeCbcMessage + with { extension "prototype(convert) decode(JSON)" } + +} with { encode "JSON" } diff --git a/cbc/SABP_Selftest.ttcn b/cbc/SABP_Selftest.ttcn new file mode 100644 index 0000000..1f6ecb5 --- /dev/null +++ b/cbc/SABP_Selftest.ttcn @@ -0,0 +1,180 @@ +module SABP_Selftest { + +/* This is testing the SABP code, specifically re-creating the SABP messages from within + * the TCP stream using SABP_Adapter.f_APER_getMsgLen() for the various possible APER + * length determinant cases */ + +import from Osmocom_Types all; + +import from SABP_Adapter all; +import from SABP_Templates all; +import from IPL4asp_Types all; +import from IPL4asp_PortType all; + +modulepar { + charstring mp_bind_ip := "127.0.0.1"; + integer mp_bind_port := 12345; +} + +type component test_CT extends SABP_Adapter_CT { + port IPL4asp_PT TCP; + var integer g_tcp_conn_id; + timer Tguard := 10.0; +} + +template (value) ASP_Send ts_AS(integer conn_id, octetstring msg) := { + connId := conn_id, + proto := omit, + msg := msg +} + +private altstep as_Tguard() runs on test_CT { + [] Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +private function f_init() runs on test_CT { + var IPL4asp_Types.Result res; + var ASP_Event asp_evt; + + activate(as_Tguard()); + Tguard.start; + + f_bind(mp_bind_ip, mp_bind_port, 0); + + map(self:TCP, system:TCP); + res := f_IPL4_connect(TCP, mp_bind_ip, mp_bind_port, "", -1, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to SABP TCP port"); + mtc.stop; + } + g_tcp_conn_id := res.connId; + + SABP[0].receive(ASP_Event:{connOpened:=?}) -> value asp_evt { + g_sabp_conn_id[0] := asp_evt.connOpened.connId; + } +} + +/* send a given input octetstring 'stream' in chunks of 'chunk_size', spaced at 'delay' intervals */ +private function tcp_send_segmented(octetstring stream, integer chunk_size := 1, float delay := 0.05) +runs on test_CT { + var integer i; + + for (i := 0; i < lengthof(stream); i := i+chunk_size) { + var integer size := chunk_size; + if (lengthof(stream) - i < chunk_size) { + size := lengthof(stream) - i; + } + TCP.send(ts_AS(g_tcp_conn_id, substr(stream, i, size))); + f_sleep(delay); + } +} + +/* a simple SABP-RESTART message with single-byte length dteerminant (shorter than 128 byte) */ +const octetstring c_restart := '00044010000001000F0009000062F22400230042'O; + +/* test whether a message with 1-byte length determinant is parsed */ +testcase TC_1byte_len() runs on test_CT { + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, c_restart)); + f_sabp_exp(tr_SABP_Restart(?)); + setverdict(pass); +} + +/* test whether a message with 1-byte length determinant is parsed if each byte is received separately */ +testcase TC_1byte_len_bytewise() runs on test_CT { + f_init(); + tcp_send_segmented(c_restart, 1, 0.05); + f_sabp_exp(tr_SABP_Restart(?)); + setverdict(pass); +} + +/* send three concatenated RESTART in one segment */ +testcase TC_1byte_len_chained() runs on test_CT { + var octetstring chain := c_restart & c_restart & c_restart; + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, chain)); + f_sabp_exp(tr_SABP_Restart(?)); + f_sabp_exp(tr_SABP_Restart(?)); + f_sabp_exp(tr_SABP_Restart(?)); + setverdict(pass); +} + + +/* SABP write-replace with length determinant encoded over two bytes ('8093'O) */ +const octetstring c_wrepl := '00000080930000080006000211120007000240C0000F0010000113F0030282EC0613F0030282EC070001400100000D0002012A000900020000000400010100000056029F01B4D90D064297D9EC37E8FE96B3C9A0303BDD68341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D168341A8D46A3D10012'O; + +/* test whether a message with 2-byte length determinant is parsed */ +testcase TC_2byte_len() runs on test_CT { + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, c_wrepl)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_send(ts_SABP_Reset({ { pLMNidentity := '09F107'O, lac := '0000'O, sac := '0000'O } })); + setverdict(pass); +} + +/* test whether a message with 2-byte length determinant is parsed if each byte is received separately */ +testcase TC_2byte_len_bytewise() runs on test_CT { + f_init(); + tcp_send_segmented(c_wrepl, 1, 0.05); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* send three concatenated WRITE-REPLACE in one segment */ +testcase TC_2byte_len_chained() runs on test_CT { + var octetstring chain := c_wrepl & c_wrepl & c_wrepl; + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, chain)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* send three concatenated WRITE-REPLACE in segments of 10 bytes */ +testcase TC_2byte_len_chained_bytewise() runs on test_CT { + var octetstring chain := c_wrepl & c_wrepl & c_wrepl; + f_init(); + tcp_send_segmented(chain, 10, 0.05); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* SABP write-replace with length determinant encoded over multiple chunks ('Cx'O case) */ +const octetstring c_chunked := '000000C1000007000600020002000700020002000F00C109C462F2241000004262F2242000000062F2242000000162F2242000000262F2242000000362F2242000000462F2242000000562F2242000000662F2242000000762F2242000000862F2242000000962F2242000000A62F2242000000B62F2242000000C62F2242000000D62F2242000000E62F2242000000F62F2242000001062F2242000001162F2242000001262F2242000001362F2242000001462F2242000001562F2242000001662F2242000001762F2242000001862F2242000001962F2242000001A62F2242000001B62F2242000001C62F2242000001D62F2242000001E62F2242000001F62F2242000002062F2242000002162F2242000002262F2242000002362F2242000002462F2242000002562F2242000002662F2242000002762F2242000002862F2242000002962F2242000002A62F2242000002B62F2242000002C62F2242000002D62F2242000002E62F2242000002F62F2242000003062F2242000003162F2242000003262F2242000003362F2242000003462F2242000003562F2242000003662F2242000003762F2242000003862F2242000003962F2242000003A62F2242000003B62F2242000003C62F2242000003D62F2242000003E62F2242000003F62F2242000004062F2242000004162F2242000004262F2242000004362F2242000004462F2242000004562F2242000004662F2242000004762F2242000004862F2242000004962F2242000004A62F2242000004B62F2242000004C62F2242000004D62F2242000004E62F2242000004F62F2242000005062F2242000005162F2242000005262F2242000005362F2242000005462F2242000005562F2242000005662F2242000005762F2242000005862F2242000005962F2242000005A62F2242000005B62F2242000005C62F2242000005D62F2242000005E62F2242000005F62F2242000006062F2242000006162F2242000006262F2242000006362F2242000006462F2242000006562F2242000006662F2242000006762F2242000006862F2242000006962F2242000006A62F2242000006B62F2242000006C62F2242000006D62F2242000006E62F2242000006F62F2242000007062F2242000007162F2242000007262F2242000007362F2242000007462F2242000007562F2242000007662F2242000007762F2242000007862F2242000007962F2242000007A62F2242000007B62F2242000007C62F2242000007D62F2242000007E62F2242000007F62F2242000008062F2242000008162F2242000008262F2242000008362F2242000008462F2242000008562F2242000008662F2242000008762F2242000008862F2242000008962F2242000008A62F2242000008B62F2242000008C62F2242000008D62F2242000008E62F2242000008F62F2242000009062F2242000009162F2242000009262F2242000009362F2242000009462F2242000009562F2242000009662F2242000009762F2242000009862F2242000009962F2242000009A62F2242000009B62F2242000009C62F2242000009D62F2242000009E62F2242000009F62F224200000A062F224200000A162F224200000A262F224200000A362F224200000A462F224200000A562F224200000A662F224200000A762F224200000A862F224200000A962F224200000AA62F224200000AB62F224200000AC62F224200000AD62F224200000AE62F224200000AF62F224200000B062F224200000B162F224200000B262F224200000B362F224200000B462F224200000B562F224200000B662F224200000B762F224200000B862F224200000B962F224200000BA62F224200000BB62F224200000BC62F224200000BD62F224200000BE62F224200000BF62F224200000C062F224200000C162F224200000C262F224200000C362F224200000C462F224200000C562F224200000C662F224200000C762F224200000C862F224200000C962F224200000CA62F224200000CB62F224200000CC62F224200000CD62F224200000CE62F224200000CF62F224200000D062F224200000D162F224200000D262F224200000D362F224200000D462F224200000D562F224200000D662F224200000D762F224200000D862F224200000D962F224200000DA62F224200000DB62F224200000DC62F224200000DD62F224200000DE62F224200000DF62F224200000E062F224200000E162F224200000E262F224200000E362F224200000E462F224200000E562F224200000E662F224200000E762F224200000E862F224200000E962F224200000EA62F224200000EB62F224200000EC62F224200000ED62F224200000EE62F224200000EF62F224200000F062F224200000F162F224200000F262F224200000F362F224200000F462F224200000F562F224200000F662F224200000F762F224200000F862F224200000F962F224200000FA62F224200000FB62F224200000FC62F224200000FD62F224200000FE62F224200000FF62F2242000010062F2242000010162F2242000010262F2242000010362F2242000010462F2242000010562F2242000010662F2242000010762F2242000010862F2242000010962F2242000010A62F2242000010B62F2242000010C62F2242000010D62F2242000010E62F2242000010F62F2242000011062F2242000011162F2242000011262F2242000011362F2242000011462F2242000011562F2242000011662F2242000011762F2242000011862F2242000011962F2242000011A62F2242000011B62F2242000011C62F2242000011D62F2242000011E62F2242000011F62F2242000012062F2242000012162F2242000012262F2242000012362F2242000012462F2242000012562F2242000012662F2242000012762F2242000012862F2242000012962F2242000012A62F2242000012B62F2242000012C62F2242000012D62F2242000012E62F2242000012F62F2242000013062F2242000013162F2242000013262F2242000013362F2242000013462F2242000013562F2242000013662F2242000013762F2242000013862F2242000013962F2242000013A62F2242000013B62F2242000013C62F2242000013D62F2242000013E62F2242000013F62F2242000014062F2242000014162F2242000014262F2242000014362F2242000014462F2242000014562F2242000014662F2242000014762F2242000014862F2242000014962F2242000014A62F2242000014B62F2242000014C62F2242000014D62F2242000014E62F2242000014F62F2242000015062F2242000015162F2242000015262F2242000015362F2242000015462F2242000015562F2242000015662F2242000015762F2242000015862F2242000015962F2242000015A62F2242000015B62F2242000015C62F2242000015D62F2242000015E62F2242000015F62F2242000016062F2242000016162F2242000016262F2242000016362F2242000016462F2242000016562F2242000016662F2242000016762F2242000016862F2242000016962F2242000016A62F2242000016B62F2242000016C62F2242000016D62F2242000016E62F2242000016F62F2242000017062F2242000017162F2242000017262F2242000017362F2242000017462F2242000017562F2242000017662F2242000017762F2242000017862F2242000017962F2242000017A62F2242000017B62F2242000017C62F2242000017D62F2242000017E62F2242000017F62F2242000018062F2242000018162F2242000018262F2242000018362F2242000018462F2242000018562F2242000018662F2242000018762F2242000018862F2242000018962F2242000018A62F2242000018B62F2242000018C62F2242000018D62F2242000018E62F2242000018F62F2242000019062F2242000019162F2242000019262F2242000019362F2242000019462F2242000019562F2242000019662F2242000019762F2242000019862F2242000019962F2242000019A62F2242000019B62F2242000019C62F2242000019D62F2242000019E62F2242000019F62F224200001A062F224200001A162F224200001A262F224200001A362F224200001A462F224200001A562F224200001A662F224200001A762F224200001A862F224200001A962F224200001AA62F224200001AB62F224200001AC62F224200001AD62F224200001AE62F224200001AF62F224200001B062F224200001B162F224200001B262F224200001B362F224200001B462F224200001B562F224200001B662F224200001B762F224200001B862F224200001B962F224200001BA62F224200001BB62F224200001BC62F224200001BD62F224200001BE62F224200001BF62F224200001C062F224200001C162F224200001C262F224200001C362F224200001C462F224200001C562F224200001C662F224200001C762F224200001C862F224200001C962F224200001CA62F224200001CB62F224200001CC62F224200001CD62F224200001CE62F224200001CF62F224200001D062F224200001D162F224200001D262F224200001D362F224200001D462F224200001D562F224200001D662F224200001D762F224200001D862F224200001D962F224200001DA62F224200001DB62F224200001DC62F224200001DD62F224200001DE62F224200001DF62F224200001E062F224200001E162F224200001E262F224200001E362F224200001E462F224200001E562F224200001E662F224200001E762F224200001E862F224200001E962F224200001EA62F224200001EB62F224200001EC62F224200001ED62F224200001EE62F224200001EF62F224200001F062F224200001F162F224200001F262F224200001F362F224200001F462F224200001F562F224200001F662F224200001F762F224200001F862F224200001F962F224200001FA62F224200001FB62F224200001FC62F224200001FD62F224200001FE62F224200001FF62F2242000020062F2242000020162F2242000020262F2242000020362F2242000020462F2242000020562F2242000020662F2242000020762F2242000020862F2242000020962F2242000020A62F2242000020B62F2242000020C62F2242000020D62F2242000020E62F2242000020F62F2242000021062F2242000021162F2242000021262F2242000021362F2242000021462F2242000021562F2242000021662F2242000021762F2242000021862F2242000021962F2242000021A62F2242000021B62F2242000021C62F2242000021D62F2242000021E62F2242000021F62F2242000022062F2242000022162F2242000022262F2242000022362F2242000022462F2242000022562F2242000022662F2242000022762F2242000022862F2242000022962F2242000022A62F2242000022B62F2242000022C62F2242000022D62F2242000022E62F2242000022F62F2242000023062F2242000023162F2242000023262F2242000023362F2242000023462F2242000023562F2242000023662F2242000023762F2242000023862F2242000023962F2242000023A62F2242000023B62F2242000023C62F2242000023D62F2242000023E62F2242000023F62F2242000024062F2242000024162F2242000024262F2242000024362F2242000024462F2242000024562F2242000024662F2242000024762F2242000024862F2242000024962F2242000024A62F2242000024B62F2242000024C62F2242000024D62F2242000024E62F2242000024F62F2242000025062F2242000025162F2242000025262F2242000025362F2242000025462F2242000025562F2242000025662F2242000025762F2242000025862F2242000025962F2242000025A62F2242000025B62F2242000025C62F2242000025D62F2242000025E62F2242000025F62F2242000026062F2242000026162F2242000026262F2242000026362F2242000026462F2242000026562F2242000026662F2242000026762F2242000026862F2242000026962F2242000026A62F2242000026B62F2242000026C62F2242000026D62F2242000026E62F2242000026F62F2242000027062F2242000027162F2242000027262F2242000027362F2242000027462F2242000027562F2242000027662F2242000027762F2242000027862F2242000027962F2242000027A62F2242000027B62F2242000027C62F2242000027D62F2242000027E62F2242000027F62F2242000028062F2242000028162F2242000028262F2242000028362F2242000028462F2242000028562F2242000028662F2242000028762F2242000028862F2242000028962F2242000028A62F2242000028B62F2242000028C62F2242000028D62F2242000028E62F2242000028F62F2242000029062F2242000029162F2242000029262F2242000029362F2242000029462F2242000029562F2242000029662F2242000029762F2242000029862F2242000029962F2242000029A62F2242000029B62F2242000029C62F2242000029D62F2242000029E62F2242000029F62F224200002A062F224200002A162F224200002A262F224200002A362F224200002A462F224200002A562F224200002A662F224200002A762F224200002A862F224200002A962F224200002AA62F224200002AB62F224200002AC62F224200002AD62F224200002AE62F224200002AF62F224200002B062F224200002B162F224200002B262F224200002B362F224200002B462F224200002B562F224200002B662F224200002B762F224200002B862F224200002B962F224200002BA62F224200002BB62F224200002BC62F224200002BD62F224200002BE62F224200002BF62F224200002C062F224200002C162F224200002C262F224200002C362F224200002C462F224200002C562F224200002C662F224200002C762F224200002C862F224200002C962F224200002CA62F224200002CB62F224200002CC62F224200002CD62F224200002CE62F224200002CF62F224200002D062F224200002D162F224200002D262F224200002D362F224200002D462F224200002D562F224200002D662F224200002D762F224200002D862F224200002D962F224200002DA62F224200002DB62F224200002DC62F224200002DD62F224200002DE62F224200002DF62F224200002E062F224200002E162F224200002E262F224200002E362F224200002E462F224200002E562F224200002E662F224200002E762F224200002E862F224200002E962F224200002EA62F224200002EB62F224200002EC62F224200002ED62F224200002EE62F224200002EF62F224200002F062F224200002F162F224200002F262F224200002F362F224200002F462F224200002F562F224200002F662F224200002F762F224200002F862F224200002F962F224200002FA62F224200002FB62F224200002FC62F224200002FD62F224200002FE62F224200002FF62F2242000030062F2242000030162F2242000030262F2242000030362F2242000030462F2242000030562F2242000030662F2242000030762F2242000030862F2242000030962F2242000030A62F2242000030B62F2242000030C62F2242000030D62F2242000030E62F2242000030F62F2242000031062F2242000031162F2242000031262F2242000031362F2242000031462F2242000031562F2242000031662F2242000031762F2242000031862F2242000031962F2242000031A62F2242000031B62F2242000031C62F2242000031D62F2242000031E62F2242000031F62F2242000032062F2242000032162F2242000032262F2242000032362F2242000032462F2242000032562F2242000032662F2242000032762F2242000032862F2242000032962F2242000032A62F2242000032B62F2242000032C62F2242000032D62F2242000032E62F2242000032F62F2242000033062F2242000033162F2242000033262F2242000033362F2242000033462F2242000033562F2242000033662F2242000033762F2242000033862F2242000033962F2242000033A62F2242000033B62F2242000033C62F2242000033D62F2242000033E62F2242000033F62F2242000034062F2242000034162F2242000034262F2242000034362F2242000034462F2242000034562F2242000034662F2242000034762F2242000034862F2242000034962F2242000034A62F2242000034B62F2242000034C62F2242000034D62F2242000034E62F2242000034F62F2242000035062F2242000035162F2242000035262F2242000035362F2242000035462F2242000035562F2242000035662F2242000035762F2242000035862F2242000035962F2242000035A62F2242000035B62F2242000035C62F2242000035D62F2242000035E62F2242000035F62F2242000036062F2242000036162F2242000036262F2242000036362F2242000036462F2242000036562F2242000036662F2242000036762F2242000036862F2242000036962F2242000036A62F2242000036B62F2242000036C62F2242000036D62F2242000036E62F2242000036F62F2242000037062F2242000037162F2242000037262F2242000037362F2242000037462F2242000037562F2242000037662F2242000037762F2242000037862F2242000037962F2242000037A62F2242000037B62F2242000037C62F2242000037D62F2242000037E62F2242000037F62F2242000038062F2242000038162F2242000038262F2242000038362F2242000038462F2242000038562F2242000038662F2242000038762F2242000038862F2242000038962F2242000038A62F2242000038B62F2242000038C62F2242000038D62F2242000038E62F2242000038F62F2242000039062F2242000039162F2242000039262F2242000039362F2242000039462F2242000039562F2242000039662F2242000039762F2242000039862F2242000039962F2242000039A62F2242000039B62F2242000039C62F2242000039D62F2242000039E62F2242000039F62F224200003A062F224200003A162F224200003A262F224200003A362F224200003A462F224200003A562F224200003A662F224200003A762F224200003A862F224200003A962F224200003AA62F224200003AB62F224200003AC62F224200003AD62F224200003AE62F224200003AF62F224200003B062F224200003B162F224200003B262F224200003B362F224200003B462F224200003B562F224200003B662F224200003B762F224200003B862F224200003B962F224200003BA62F224200003BB62F224200003BC62F224200003BD62F224200003BE62F224200003BF62F224200003C062F224200003C162F224200003C262F224200003C362F224200003C462F224200003C562F224200003C662F224200003C762F224200003C862F224200003C962F224200003CA62F224200003CB62F224200003CC62F224200003CD62F224200003CE62F224200003CF62F224200003D062F224200003D162F224200003D262F224200003D362F224200003D462F224200003D562F224200003D662F224200003D762F224200003D862F224200003D962F224200003DA62F224200003DB62F224200003DC62F224200003DD62F224200003DE62F224200003DF62F224200003E062F224200003E162F224200003E262F224200003E362F224200003E462F224200003E562F224200003E662F224200003E762F224200003E862F224200003E962F224200003EA62F224200003EB62F224200003EC62F224200003ED62F224200003EE62F224200003EF62F224200003F062F224200003F162F224200003F262F224200003F362F224200003F462F224200003F562F224200003F662F224200003F762F224200003F862F224200003F962F224200003FA62F224200003FB62F224200003FC62F224200003FD62F224200003FE62F224200003FF62F2242000040062F2242000040162F2242000040262F2242000040362F2242000040462F2242000040562F2242000040662F2242000040762F2242000040862F2242000040962F2242000040A62F2242000040B62F2242000040C62F2242000040D62F2242000040E62F2242000040F62F2242000041062F2242000041162F2242000041262F2242000041362F2242000041462F2242000041562F2242000041662F2242000041762F2242000041862F2242000041962F2242000041A62F2242000041B62F2242000041C62F2242000041D62F2242000041E62F2242000041F62F2242000042062F2242000042162F2242000042262F2242000042362F2242000042462F2242000042562F2242000042662F2242000042762F2242000042862F2242000042962F2242000042A62F2242000042B62F2242000042C62F2242000042D62F2242000042E62F2242000042F62F2242000043062F2242000043162F2242000043262F2242000043362F2242000043462F2242000043562F2242000043662F2242000043762F2242000043862F2242000043962F2242000043A62F2242000043B62F2242000043C62F2242000043D62F2242000043E62F2242000043F62F2242000044062F2242000044162F2242000044262F2242000044362F2242000044462F2242000044562F2242000044662F2242000044762F2242000044862F2242000044962F2242000044A62F2242000044B62F2242000044C62F2242000044D62F2242000044E62F2242000044F62F2242000045062F2242000045162F2242000045262F2242000045362F2242000045462F2242000045562F2242000045662F2242000045762F2242000045862F2242000045962F2242000045A62F2242000045B62F2242000045C62F2242000045D62F2242000045E62F2242000045F62F2242000046062F2242000046162F2242000046262F2242000046362F2242000046462F2242000046562F2242000046662F2242000046762F2242000046862F2242000046962F2242000046A62F2242000046B62F2242000046C62F2242000046D62F2242000046E62F2242000046F62F2242000047062F2242000047162F2242000047262F2242000047362F2242000047462F2242000047562F2242000047662F2242000047762F2242000047862F2242000047962F2242000047A62F2242000047B62F2242000047C62F2242000047D62F2242000047E62F2242000047F62F2242000048062F2242000048162F2242000048262F2242000048362F2242000048462F2242000048562F2242000048662F2242000048762F2242000048862F2242000048962F2242000048A62F2242000048B62F2242000048C62F2242000048D62F2242000048E62F2242000048F62F2242000049062F2242000049162F2242000049262F2242000049362F2242000049462F2242000049562F2242000049662F2242000049762F2242000049862F2242000049962F2242000049A62F2242000049B62F2242000049C62F2242000049D62F2242000049E62F2242000049F62F224200004A062F224200004A162F224200004A262F224200004A362F224200004A462F224200004A562F224200004A662F224200004A762F224200004A862F224200004A962F224200004AA62F224200004AB62F224200004AC62F224200004AD62F224200004AE62F224200004AF62F224200004B062F224200004B162F224200004B262F224200004B362F224200004B462F224200004B562F224200004B662F224200004B762F224200004B862F224200004B962F224200004BA62F224200004BB62F224200004BC62F224200004BD62F224200004BE62F224200004BF62F224200004C062F224200004C162F224200004C262F224200004C362F224200004C462F224200004C562F224200004C662F224200004C762F224200004C862F224200004C962F224200004CA62F224200004CB62F224200004CC62F224200004CD62F224200004CE62F224200004CF62F224200004D062F224200004D162F224200004D262F224200004D362F224200004D462F224200004D562F224200004D662F224200004D762F224200004D862F224200004D962F224200004DA62F224200004DB62F224200004DC62F224200004DD62F224200004DE62F224200004DF62F224200004E062F224200004E162F224200004E262F224200004E362F224200004E462F224200004E562F224200004E662F224200004E762F224200004E862F224200004E962F224200004EA62F224200004EB62F224200004EC62F224200004ED62F224200004EE62F224200004EF62F224200004F062F224200004F162F224200004F262F224200004F362F224200004F462F224200004F562F224200004F662F224200004F762F224200004F862F224200004F962F224200004FA62F224200004FB62F224200004FC62F224200004FD62F224200004FE62F224200004FF62F2242000050062F2242000050162F2242000050262F2242000050362F2242000050462F2242000050562F2242000050662F2242000050762F2242000050862F2242000050962F2242000050A62F2242000050B62F2242000050C62F2242000050D62F2242000050E62F2242000050F62F2242000051062F2242000051162F2242000051262F2242000051362F2242000051462F2242000051562F2242000051662F2242000051762F2242000051862F2242000051962F2242000051A62F2242000051B62F2242000051C62F2242000051D62F2242000051E62F2242000051F62F2242000052062F2242000052162F2242000052262F2242000052362F2242000052462F2242000052562F2242000052662F2242000052762F2242000052862F2242000052962F2242000052A62F2242000052B62F2242000052C62F2242000052D62F2242000052E62F2242000052F62F2242000053062F2242000053162F2242000053262F2242000053362F2242000053462F2242000053562F2242000053662F2242000053762F2242000053862F2242000053962F2242000053A62F2242000053B62F2242000053C62F2242000053D62F2242000053E62F2242000053F62F2242000054062F2242000054162F2242000054262F2242000054362F2242000054462F2242000054562F2242000054662F2242000054762F2242000054862F2242000054962F2242000054A62F2242000054B62F2242000054C62F2242000054D62F2242000054E62F2242000054F62F2242000055062F2242000055162F2242000055262F2242000055362F2242000055462F2242000055562F2242000055662F2242000055762F2242000055862F2242000055962F2242000055A62F2242000055B62F2242000055C62F2242000055D62F2242000055E62F2242000055F62F2242000056062F2242000056162F2242000056262F2242000056362F2242000056462F2242000056562F2242000056662F2242000056762F2242000056862F2242000056962F2242000056A62F2242000056B62F2242000056C62F2242000056D62F2242000056E62F2242000056F62F2242000057062F2242000057162F2242000057262F2242000057362F2242000057462F2242000057562F2242000057662F2242000057762F2242000057862F2242000057962F2242000057A62F2242000057B62F2242000057C62F2242000057D62F2242000057E62F2242000057F62F2242000058062F2242000058162F2242000058262F2242000058362F2242000058462F2242000058562F2242000058662F2242000058762F2242000058862F2242000058962F2242000058A62F2242000058B62F2242000058C62F2242000058D62F2242000058E62F2242000058F62F2242000059062F2242000059162F2242000059262F2242000059362F2242000059462F2242000059562F2242000059662F2242000059762F2242000059862F2242000059962F2242000059A62F2242000059B62F2242000059C62F2242000059D62F2242000059E62F2242000059F62F224200005A062F224200005A162F224200005A262F224200005A362F224200005A462F224200005A562F224200005A662F224200005A762F224200005A862F224200005A962F224200005AA62F224200005AB62F224200005AC62F224200005AD62F224200005AE62F224200005AF62F224200005B062F224200005B162F224200005B262F224200005B362F224200005B462F224200005B562F224200005B662F224200005B762F224200005B862F224200005B962F224200005BA62F224200005BB62F224200005BC62F224200005BD62F224200005BE62F224200005BF62F224200005C062F224200005C162F224200005C262F224200005C362F224200005C462F224200005C562F224200005C662F224200005C762F224200005C862F224200005C962F224200005CA62F224200005CB62F224200005CC62F224200005CD62F224200005CE62F224200005CF62F224200005D062F224200005D162F224200005D262F224200005D362F224200005D462F224200005D562F224200005D662F224200005D762F224200005D862F224200005D962F224200005DA62F224200005DB62F224200005DC62F224200005DD62F224200005DE62F224200005DF62F224200005E062F224200005E162F224200005E262F224200005E362F224200005E462F224200005E562F224200005E662F224200005E762F224200005E862F224200005E962F224200005EA62F224200005EB62F224200005EC62F224200005ED62F224200005EE62F224200005EF62F224200005F062F224200005F162F224200005F262F224200005F362F224200005F462F224200005F562F224200005F662F224200005F762F224200005F862F224200005F962F224200005FA62F224200005FB62F224200005FC62F224200005FD62F224200005FE62F224200005FF62F2242000060062F2242000060162F2242000060262F2242000060362F2242000060462F2242000060562F2242000060662F2242000060762F2242000060862F2242000060962F2242000060A62F2242000060B62F2242000060C62F2242000060D62F2242000060E62F2242000060F62F2242000061062F2242000061162F2242000061262F2242000061362F2242000061462F2242000061562F2242000061662F2242000061762F2242000061862F2242000061962F2242000061A62F2242000061B62F2242000061C62F2242000061D62F2242000061E62F2242000061F62F2242000062062F2242000062162F2242000062262F2242000062362F2242000062462F2242000062562F2242000062662F2242000062762F2242000062862F2242000062962F2242000062A62F2242000062B62F2242000062C62F2242000062D62F2242000062E62F2242000062F62F2242000063062F2242000063162F2242000063262F2242000063362F2242000063462F2242000063562F2242000063662F2242000063762F2242000063862F2242000063962F2242000063A62F2242000063B62F2242000063C62F2242000063D62F2242000063E62F2242000063F62F2242000064062F2242000064162F2242000064262F2242000064362F2242000064462F2242000064562F2242000064662F2242000064762F2242000064862F2242000064962F2242000064A62F2242000064B62F2242000064C62F2242000064D62F2242000064E62F2242000064F62F2242000065062F2242000065162F2242000065262F2242000065362F2242000065462F2242000065562F2242000065662F2242000065762F2242000065862F2242000065962F2242000065A62F2242000065B62F2242000065C62F2242000065D62F2242000065E62F2242000065F62F2242000066062F2242000066162F2242000066262F2242000066362F2242000066462F2242000066562F2242000066662F2242000066762F2242000066862F2242000066962F2242000066A62F2242000066B62F2242000066C62F2242000066D62F2242000066E62F2242000066F62F2242000067062F2242000067162F2242000067262F2242000067362F2242000067462F2242000067562F2242000067662F2242000067762F2242000067862F2242000067962F2242000067A62F2242000067B62F2242000067C62F2242000067D62F2242000067E62F2242000067F62F2242000068062F2242000068162F2242000068262F2242000068362F2242000068462F2242000068562F2242000068662F2242000068762F2242000068862F2242000068962F2242000068A62F2242000068B62F2242000068C62F2242000068D62F2242000068E62F2242000068F62F2242000069062F2242000069162F2242000069262F2242000069362F2242000069462F2242000069562F2242000069662F2242000069762F2242000069862F2242000069962F2242000069A62F2242000069B62F2242000069C62F2242000069D62F2242000069E62F2242000069F62F224200006A062F224200006A162F224200006A262F224200006A362F224200006A462F224200006A562F224200006A662F224200006A762F224200006A862F224200006A962F224200006AA62F224200006AB62F224200006AC62F224200006AD62F224200006AE62F224200006AF62F224200006B062F224200006B162F224200006B262F224200006B362F224200006B462F224200006B562F224200006B662F224200006B762F224200006B862F224200006B962F224200006BA62F224200006BB62F224200006BC62F224200006BD62F224200006BE62F224200006BF62F224200006C062F224200006C162F224200006C262F224200006C362F224200006C462F224200006C562F224200006C662F224200006C762F224200006C862F224200006C962F224200006CA62F224200006CB62F224200006CC62F224200006CD62F224200006CE62F224200006CF62F224200006D062F224200006D162F224200006D262F224200006D362F224200006D462F224200006D562F224200006D662F224200006D762F224200006D862F224200006D962F224200006DA62F224200006DB62F224200006DC62F224200006DD62F224200006DE62F224200006DF62F224200006E062F224200006E162F224200006E262F224200006E362F224200006E462F224200006E562F224200006E662F224200006E762F224200006E862F224200006E962F224200006EA62F224200006EB62F224200006EC62F224200006ED62F224200006EE62F224200006EF62F224200006F062F224200006F162F224200006F262F224200006F362F224200006F462F224200006F562F224200006F662F224200006F762F224200006F862F224200006F962F224200006FA62F224200006FB62F224200006FC62F224200006FD62F224200006FE62F224200006FF62F2242000070062F2242000070162F2242000070262F2242000070362F2242000070462F2242000070562F2242000070662F2242000070762F2242000070862F2242000070962F2242000070A62F2242000070B62F2242000070C62F2242000070D62F2242000070E62F2242000070F62F2242000071062F2242000071162F2242000071262F2242000071362F2242000071462F2242000071562F2242000071662F2242000071762F2242000071862F2242000071962F2242000071A62F2242000071B62F2242000071C62F2242000071D62F2242000071E62F2242000071F62F2242000072062F2242000072162F2242000072262F2242000072362F2242000072462F2242000072562F2242000072662F2242000072762F2242000072862F2242000072962F2242000072A62F2242000072B62F2242000072C62F2242000072D62F2242000072E62F2242000072F62F2242000073062F2242000073162F2242000073262F2242000073362F2242000073462F2242000073562F2242000073662F2242000073762F2242000073862F2242000073962F2242000073A62F2242000073B62F2242000073C62F2242000073D62F2242000073E62F2242000073F62F2242000074062F2242000074162F2242000074262F2242000074362F2242000074462F2242000074562F2242000074662F2242000074762F2242000074862F2242000074962F2242000074A62F2242000074B62F2242000074C62F2242000074D62F2242000074E62F2242000074F62F2242000075062F2242000075162F2242000075262F2242000075362F2242000075462F2242000075562F2242000075662F2242000075762F2242000075862F2242000075962F2242000075A62F2242000075B62F2242000075C62F2242000075D62F2242000075E62F2242000075F62F2242000076062F2242000076162F2242000076262F2242000076362F2242000076462F2242000076562F2242000076662F2242000076762F2242000076862F2242000076962F2242000076A62F2242000076B62F2242000076C62F2242000076D62F2242000076E62F2242000076F62F2242000077062F2242000077162F2242000077262F2242000077362F2242000077462F2242000077562F2242000077662F2242000077762F2242000077862F2242000077962F2242000077A62F2242000077B62F2242000077C62F2242000077D62F2242000077E62F2242000077F62F2242000078062F2242000078162F2242000078262F2242000078362F2242000078462F2242000078562F2242000078662F2242000078762F2242000078862F2242000078962F2242000078A62F2242000078B62F2242000078C62F2242000078D62F2242000078E62F2242000078F62F2242000079062F2242000079162F2242000079262F2242000079362F2242000079462F2242000079562F2242000079662F2242000079762F2242000079862F2242000079962F2242000079A62F2242000079B62F2242000079C62F2242000079D62F2242000079E62F2242000079F62F224200007A062F224200007A162F224200007A262F224200007A362F224200007A462F224200007A562F224200007A662F224200007A762F224200007A862F224200007A962F224200007AA62F224200007AB62F224200007AC62F224200007AD62F224200007AE62F224200007AF62F224200007B062F224200007B162F224200007B262F224200007B362F224200007B462F224200007B562F224200007B662F224200007B762F224200007B862F224200007B962F224200007BA62F224200007BB62F224200007BC62F224200007BD62F224200007BE62F224200007BF62F224200007C062F224200007C162F224200007C262F224200007C362F224200007C462F224200007C562F224200007C662F224200007C762F224200007C862F224200007C962F224200007CA62F224200007CB62F224200007CC62F224200007CD62F224200007CE62F224200007CF62F224200007D062F224200007D162F224200007D262F224200007D362F224200007D462F224200007D562F224200007D662F224200007D762F224200007D862F224200007D962F224200007DA62F224200007DB62F224200007DC62F224200007DD62F224200007DE62F224200007DF62F224200007E062F224200007E162F224200007E262F224200007E362F224200007E462F224200007E562F224200007E662F224200007E762F224200007E862F224200007E962F224200007EA62F224200007EB62F224200007EC62F224200007ED62F224200007EE62F224200007EF62F224200007F062F224200007F162F224200007F262F224200007F362F224200007F462F224200007F562F224200007F662F224200007F762F224200007F862F224200007F962F224200007FA62F224200007FB62F224200007FC62F224200007FD62F224200007FE62F224200007FF62F2242000080062F2242000080162F2242000080262F2242000080362F2242000080462F2242000080562F2242000080662F2242000080762F2242000080862F2242000080962F2242000080A62F2242000080B62F2242000080C62F2242000080D62F2242000080E62F2242000080F62F2242000081062F2242000081162F2242000081262F2242000081362F2242000081462F2242000081562F2242000081662F2242000081762F2242000081862F2242000081962F2242000081A62F2242000081B62F2242000081C62F2242000081D62F2242000081E62F2242000081F62F2242000082062F2242000082162F2242000082262F2242000082362F2242000082462F2242000082562F2242000082662F2242000082762F2242000082862F2242000082962F2242000082A62F2242000082B62F2242000082C62F2242000082D62F2242000082E62F2242000082F62F2242000083062F2242000083162F2242000083262F2242000083362F2242000083462F2242000083562F2242000083662F2242000083762F2242000083862F2242000083962F2242000083A62F2242000083B62F2242000083C62F2242000083D62F2242000083E62F2242000083F62F2242000084062F2242000084162F2242000084262F2242000084362F2242000084462F2242000084562F2242000084662F2242000084762F2242000084862F2242000084962F2242000084A62F2242000084B62F2242000084C62F2242000084D62F2242000084E62F2242000084F62F2242000085062F2242000085162F2242000085262F2242000085362F2242000085462F2242000085562F2242000085662F2242000085762F2242000085862F2242000085962F2242000085A62F2242000085B62F2242000085C62F2242000085D62F2242000085E62F2242000085F62F2242000086062F2242000086162F2242000086262F2242000086362F2242000086462F2242000086562F2242000086662F2242000086762F2242000086862F2242000086962F2242000086A62F2242000086B62F2242000086C62F2242000086D62F2242000086E62F2242000086F62F2242000087062F2242000087162F2242000087262F2242000087362F2242000087462F2242000087562F2242000087662F2242000087762F2242000087862F2242000087962F2242000087A62F2242000087B62F2242000087C62F2242000087D62F2242000087E62F2242000087F62F2242000088062F2242000088162F2242000088262F2242000088362F2242000088462F2242000088562F2242000088662F2242000088762F2242000088862F2242000088962F2242000088A62F2242000088B62F2242000088C62F2242000088D62F2242000088E62F2242000088F62F2242000089062F2242000089162F2242000089262F2242000089362F2242000089462F2242000089562F2242000089662F2242000089762F2242000089862F2242000089962F2242000089A62F2242000089B62F2242000089C62F2242000089D62F2242000089E62F2242000089F62F224200008A062F224200008A162F224200008A262F224200008A362F224200008A462F224200008A562F224200008A662F224200008A762F224200008A862F224200008A962F224200008AA62F224200008AB62F224200008AC62F224200008AD62F224200008AE62F224200008AF62F224200008B062F224200008B162F224200008B262F224200008B362F224200008B462F224200008B562F224200008B662F224200008B762F224200008B862F224200008B962F224200008BA62F224200008BB62F224200008BC62F224200008BD62F224200008BE62F224200008BF62F224200008C062F224200008C162F224200008C262F224200008C362F224200008C462F224200008C562F224200008C662F224200008C762F224200008C862F224200008C962F224200008CA62F224200008CB62F224200008CC62F224200008CD62F224200008CE62F224200008CF62F224200008D062F224200008D162F224200008D262F224200008D362F224200008D462F224200008D562F224200008D662F224200008D762F224200008D862F224200008D962F224200008DA62F224200008DB62F224200008DC62F224200008DD62F224200008DE62F224200008DF62F224200008E062F224200008E162F224200008E262F224200008E362F224200008E462F224200008E562F224200008E662F224200008E762F224200008E862F224200008E962F224200008EA62F224200008EB62F224200008EC62F224200008ED62F224200008EE62F224200008EF62F224200008F062F224200008F162F224200008F262F224200008F362F224200008F462F224200008F562F224200008F662F224200008F762F224200008F862F224200008F962F224200008FA62F224200008FB62F224200008FC62F224200008FD62F224200008FE62F224200008FF62F2242000090062F2242000090162F2242000090262F2242000090362F2242000090462F2242000090562F2242000090662F2242000090762F2242000090862F2242000090962F2242000090A62F2242000090B62F2242000090C62F2242000090D62F2242000090E62F2242000090F62F2242000091062F2242000091162F2242000091262F2242000091362F2242000091462F2242000091562F2242000091662F2242000091762F2242000091862F2242000091962F2242000091A62F2242000091B62F2242000091C62F2242000091D62F2242000091E62F2242000091F62F22420849200092062F2242000092162F2242000092262F28465242000092362F2242000092462F2242000092562F2242000092662F2242000092762F2242000092862F2242000092962F2242000092A62F2242000092B62F2242000092C62F2242000092D62F2242000092E62F2242000092F62F2242000093062F2242000093162F2242000093262F2242000093362F2242000093462F2242000093562F2242000093662F2242000093762F2242000093862F2242000093962F2242000093A62F2242000093B62F2242000093C62F2242000093D62F2242000093E62F2242000093F62F2242000094062F2242000094162F2242000094262F2242000094362F2242000094462F2242000094562F2242000094662F2242000094762F2242000094862F2242000094962F2242000094A62F2242000094B62F2242000094C62F2242000094D62F2242000094E62F2242000094F62F2242000095062F2242000095162F2242000095262F2242000095362F2242000095462F2242000095562F2242000095662F2242000095762F2242000095862F2242000095962F2242000095A62F2242000095B62F2242000095C62F2242000095D62F2242000095E62F2242000095F62F2242000096062F2242000096162F2242000096262F2242000096362F2242000096462F2242000096562F2242000096662F2242000096762F2242000096862F2242000096962F2242000096A62F2242000096B62F2242000096C62F2242000096D62F2242000096E62F2242000096F62F2242000097062F2242000097162F2242000097262F2242000097362F2242000097462F2242000097562F2242000097662F2242000097762F2242000097862F2242000097962F2242000097A62F2242000097B62F2242000097C62F2242000097D62F2242000097E62F2242000097F62F2242000098062F2242000098162F2242000098262F2242000098362F2242000098462F2242000098562F2242000098662F2242000098762F2242000098862F2242000098962F2242000098A62F2242000098B62F2242000098C62F2242000098D62F2242000098E62F2242000098F62F2242000099062F2242000099162F2242000099262F2242000099362F2242000099462F2242000099562F2242000099662F2242000099762F2242000099862F2242000099962F2242000099A62F2242000099B62F2242000099C62F2242000099D62F2242000099E62F2242000099F62F224200009A062F224200009A162F224200009A262F224200009A362F224200009A462F224200009A562F224200009A662F224200009A762F224200009A862F224200009A962F224200009AA62F224200009AB62F224200009AC62F224200009AD62F224200009AE62F224200009AF62F224200009B062F224200009B162F224200009B262F224200009B362F224200009B462F224200009B562F224200009B662F224200009B762F224200009B862F224200009B962F224200009BA62F224200009BB62F224200009BC62F224200009BD62F224200009BE62F224200009BF62F224200009C062F224200009C162F224200009C262F224200009C3000D0002001600090002002A00040001000000000300075A'O; + +/* test whether a message with chnked length determinant is parsed */ +testcase TC_chunked_len() runs on test_CT { + f_init(); + TCP.send(ts_AS(g_tcp_conn_id, c_chunked)); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +/* test whether a message with chunked length determinant is parsed if each byte is received separately */ +testcase TC_chunked_len_bytewise() runs on test_CT { + f_init(); + tcp_send_segmented(c_chunked, 100, 0.05); + f_sabp_exp(tr_SABP_Write(?, ?)); + setverdict(pass); +} + +control { + execute( TC_1byte_len() ); + execute( TC_1byte_len_bytewise() ); + execute( TC_1byte_len_chained() ); + execute( TC_2byte_len() ); + execute( TC_2byte_len_bytewise() ); + execute( TC_2byte_len_chained() ); + execute( TC_2byte_len_chained_bytewise() ); + execute( TC_chunked_len() ); + execute( TC_chunked_len_bytewise() ); +} + + +} diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh new file mode 100755 index 0000000..075be2f --- /dev/null +++ b/cbc/gen_links.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.SCTPasp/src +FILES="SCTPasp_PT.cc SCTPasp_PT.hh SCTPasp_PortType.ttcn SCTPasp_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src +FILES="BSSAP_Types.ttcn" +gen_links $DIR $FILES + +DIR=../library/sabp +FILES="SABP_CommonDataTypes.asn SABP_Constants.asn SABP_Containers.asn SABP_IEs.asn SABP_PDU_Contents.asn SABP_PDU_Descriptions.asn SABP_Types.ttcn SABP_EncDec.cc SABP_Templates.ttcn " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Abstract_Socket/src +FILES="Abstract_Socket.cc Abstract_Socket.hh " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.HTTPmsg/src +FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.JSON_v07_2006/src +FILES="JSON_EncDec.cc JSON_Types.ttcn " +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="HTTP_Adapter.ttcn " +FILES+="BSSMAP_Templates.ttcn " +FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " +FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " +FILES+="SABP_CodecPort.ttcn SABP_CodecPort_CtrlFunct.ttcn SABP_CodecPort_CtrlFunctDef.cc SABP_Adapter.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh new file mode 100755 index 0000000..0dabc7d --- /dev/null +++ b/cbc/regen_makefile.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc SCTPasp_PT.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc CBSP_CodecPort_CtrlFunctdef.cc SABP_EncDec.cc SABP_CodecPort_CtrlFunctDef.cc " +#FILES+="*.ttcnpp " +FILES+="*.asn" + +export CPPFLAGS_TTCN3="" + +../regen-makefile.sh CBC_Tests.ttcn $FILES + +sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index 5ee1f33..5da2958 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -54,7 +54,7 @@ if (istemplatekind(val, "omit")) { ie := omit; } else if (istemplatekind(val, "*")) { - ie := tr_CBSP_IE({channel_ind := ?}) ifpresent; + ie := tr_CBSP_IE({channel_ind := ?}); //ifpresent; } else { ie := tr_CBSP_IE({channel_ind := val}); } @@ -542,14 +542,20 @@ ts_OldSerNo(old_ser_nr), ts_CbspCellList(cell_list), ts_CbspChannelInd(channel_ind)}); -template CBSP_PDU tr_CBSP_KILL(template uint16_t msg_id := ?, template uint16_t old_ser_nr := ?, - template BSSMAP_FIELD_CellIdentificationList cell_list := ?, - template uint8_t channel_ind := ?) := - tr_CBSP(CBSP_MSGT_KILL, { - tr_CbspMsgId(msg_id), - tr_OldSerNo(old_ser_nr), - tr_CbspCellList(cell_list), - tr_CbspChannelInd(channel_ind) }); +function tr_CBSP_KILL(template uint16_t msg_id := ?, template uint16_t old_ser_nr := ?, + template BSSMAP_FIELD_CellIdentificationList cell_list := ?, + template uint8_t channel_ind := ?) +return template (present) CBSP_PDU { + var template CBSP_IEs ies := { + tr_CbspMsgId(msg_id), + tr_OldSerNo(old_ser_nr), + tr_CbspCellList(cell_list) + }; + if (not istemplatekind(channel_ind, "omit")) { + ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind); + } + return tr_CBSP(CBSP_MSGT_KILL, ies); +} /* 8.1.3.5 KILL COMPLETE */ function ts_CBSP_KILL_COMPL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, diff --git a/library/CBSP_Types.ttcn b/library/CBSP_Types.ttcn index c4c6cf2..5ab3c98 100644 --- a/library/CBSP_Types.ttcn +++ b/library/CBSP_Types.ttcn @@ -378,5 +378,24 @@ external function dec_CBSP_PDU(in octetstring msg) return CBSP_PDU with { extension "prototype(convert) decode(RAW)" }; +/* convert from warning period encoding to seconds */ +function f_cbsp_period2s(uint8_t period) return integer +{ + if (period == 0) { + return -1; /* infinite */ + } else if (period <= 10) { + return period; + } else if (period <= 20) { + return 10 + (period - 10)*2; + } else if (period <= 38) { + return 30 + (period - 20)*5; + } else if (period <= 86) { + return 120 + (period - 38)*10; + } else if (period <= 186) { + return 600 + (period - 86)*30; + } else { + return 0; + } +} } with { encode "RAW"; variant "FIELDORDER(msb)" } diff --git a/library/SABP_Adapter.ttcn b/library/SABP_Adapter.ttcn index e94e91c..046f597 100644 --- a/library/SABP_Adapter.ttcn +++ b/library/SABP_Adapter.ttcn @@ -20,7 +20,7 @@ import from SABP_CodecPort_CtrlFunct all; import from IPL4asp_Types all; import from IPL4asp_PortType all; -//import from Socket_API_Definitions all; +import from Socket_API_Definitions all; const integer SABP_HDR_LEN := 3; @@ -72,7 +72,7 @@ * If the callback function detects that the it will be impossible to determine the length of the message, * even receiving more octets, should return "-2". In this case the connection will be closed and the * length calculation error will be reported. */ -private function f_APER_getMsgLen(in octetstring stream, inout ro_integer args) return integer { +private function f_APER_getMsgLen(in octetstring stream, inout Socket_API_Definitions.ro_integer args) return integer { var integer stream_len := lengthof(stream); var integer hdr_len := args[0]; var octetstring stream_nohdr; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23022 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: I38286e8a3dd0f39bd25f631dcbb3ff4f8d4c221f Gerrit-Change-Number: 23022 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:06:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 12:06:59 +0000 Subject: Change in osmo-bsc[master]: CBSP: document rate counters and their mapping to basic/extended CBCH References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23024 ) Change subject: CBSP: document rate counters and their mapping to basic/extended CBCH ...................................................................... CBSP: document rate counters and their mapping to basic/extended CBCH Change-Id: Id298d547a90bb5d8e40f2cd300b7e1303bb43fdc --- M doc/manuals/chapters/smscb.adoc 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/23024/1 diff --git a/doc/manuals/chapters/smscb.adoc b/doc/manuals/chapters/smscb.adoc index 011aec4..6ac5370 100644 --- a/doc/manuals/chapters/smscb.adoc +++ b/doc/manuals/chapters/smscb.adoc @@ -102,3 +102,29 @@ ---- For more details on the available configuration commands, please check the OsmoBSC VTY Reference. + +=== Counters + +OsmoBSC has two Cell Broadcast related rate counter groups for each BTS: + +* the basic CBCH ("cell broadcast channel 0") +* the extended CBCH ("cell broadcast channel 1") + +See below example for a situation where no CBS messages were received yet from the CBC, +and hence only NULL messages have been sent on both basic and extended CBCH: + +.Example: CBCH related rate counters on a BTS that didn't receive any CBS messages +---- +cell broadcast channel 1: + cbch:rcvd_queued: 0 (0/s 0/m 0/h 0/d) Received + queued CBCH messages (Abis) + cbch:rcvd_dropped: 0 (0/s 0/m 0/h 0/d) Received + dropped CBCH messages (Abis) + cbch:sent_single: 0 (0/s 0/m 0/h 0/d) Sent single CBCH messages (Um) + cbch:sent_default: 0 (0/s 0/m 0/h 0/d) Sent default CBCH messages (Um) + cbch:sent_null: 31366 (0/s 45/m 2677/h 30588/d) Sent NULL CBCH messages (Um) +cell broadcast channel 0: + cbch:rcvd_queued: 0 (0/s 0/m 0/h 0/d) Received + queued CBCH messages (Abis) + cbch:rcvd_dropped: 0 (0/s 0/m 0/h 0/d) Received + dropped CBCH messages (Abis) + cbch:sent_single: 0 (0/s 0/m 0/h 0/d) Sent single CBCH messages (Um) + cbch:sent_default: 0 (0/s 0/m 0/h 0/d) Sent default CBCH messages (Um) + cbch:sent_null: 31366 (1/s 46/m 2676/h 30588/d) Sent NULL CBCH messages (Um) +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id298d547a90bb5d8e40f2cd300b7e1303bb43fdc Gerrit-Change-Number: 23024 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:24:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 12:24:57 +0000 Subject: Change in osmo-bsc[master]: abis_nm: enrich debug messages with contextual info In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20148 ) Change subject: abis_nm: enrich debug messages with contextual info ...................................................................... abis_nm: enrich debug messages with contextual info Change-Id: I68f64e6cae061a49733c4885ba383d2b9b4cfca9 --- M src/osmo-bsc/abis_nm.c 1 file changed, 44 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 9db49b7..b377c4a 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -56,6 +56,12 @@ #define OM_HEADROOM_SIZE 128 #define IPACC_SEGMENT_SIZE 245 +#define LOGPMO(mo, ss, lvl, fmt, args ...) \ + LOGP(ss, lvl, "OC=%s(%02x) INST=(%02x,%02x,%02x): " fmt, \ + get_value_string(abis_nm_obj_class_names, (mo)->obj_class), \ + (mo)->obj_class, (mo)->obj_inst.bts_nr, (mo)->obj_inst.trx_nr, \ + (mo)->obj_inst.ts_nr, ## args) + int abis_nm_tlv_parse(struct tlv_parsed *tp, struct gsm_bts *bts, const uint8_t *buf, int len) { if (!bts->model) @@ -313,7 +319,7 @@ enum abis_nm_pcause_type pcause = p_val[0]; enum abis_mm_event_causes cause = osmo_load16be(p_val + 1); - LOGP(DNM, LOGL_ERROR, "BTS %u: Failure Event Report: ", bts->nr); + LOGPMO(&bts->mo, DNM, LOGL_ERROR, "Failure Event Report: "); if (type) LOGPC(DNM, LOGL_ERROR, "Type=%s, ", type); if (severity) @@ -343,10 +349,10 @@ switch (cause) { case OSMO_EVT_PCU_VERS: if (text) { - LOGP(DNM, LOGL_NOTICE, "BTS %u reported connected PCU version %s\n", bts->nr, text); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Reported connected PCU version %s\n", text); osmo_strlcpy(bts->pcu_version, text, sizeof(bts->pcu_version)); } else { - LOGP(DNM, LOGL_ERROR, "BTS %u reported PCU disconnection.\n", bts->nr); + LOGPMO(&bts->mo, DNM, LOGL_ERROR, "Reported PCU disconnection.\n"); bts->pcu_version[0] = '\0'; } break; @@ -523,10 +529,10 @@ { switch (id) { case BTS_TYPE_VARIANT: - LOGP(DNM, LOGL_NOTICE, "BTS%u reported variant: %s\n", bts->nr, val); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Reported variant: %s\n", val); break; case BTS_SUB_MODEL: - LOGP(DNM, LOGL_NOTICE, "BTS%u reported submodel: %s\n", bts->nr, val); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Reported submodel: %s\n", val); break; default: return false; @@ -574,27 +580,25 @@ /* log potential BTS feature vector overflow */ if (len > sizeof(bts->_features_data)) { - LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: feature vector is truncated " - "(from %u to %zu bytes)\n", bts->nr, len, sizeof(bts->_features_data)); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature vector is truncated " + "(from %u to %zu bytes)\n", len, sizeof(bts->_features_data)); len = sizeof(bts->_features_data); } /* check that max. expected BTS attribute is above given feature vector length */ if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) { - LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: reported unexpectedly long (%u bytes) " - "feature vector - most likely it was compiled against newer BSC headers. " - "Consider upgrading your BSC to later version.\n", - bts->nr, len); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: reported unexpectedly long (%u bytes) " + "feature vector - most likely it was compiled against newer BSC headers. " + "Consider upgrading your BSC to later version.\n", len); } memcpy(bts->_features_data, TLVP_VAL(tp, NM_ATT_MANUF_ID), len); for (i = 0; i < _NUM_BTS_FEAT; i++) { if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) { - LOGP(DNM, LOGL_NOTICE, "BTS%u feature '%s' reported via OML does not match statically " - "set feature: %u != %u. Please fix.\n", bts->nr, - get_value_string(osmo_bts_features_descs, i), - osmo_bts_has_feature(&bts->features, i), osmo_bts_has_feature(&bts->model->features, i)); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Feature '%s' reported via OML does not match statically " + "set feature: %u != %u. Please fix.\n", get_value_string(osmo_bts_features_descs, i), + osmo_bts_has_feature(&bts->features, i), osmo_bts_has_feature(&bts->model->features, i)); } } } @@ -1028,17 +1032,17 @@ { int rc; struct e1inp_sign_link *sign_link = mb->dst; - int bts_type = sign_link->trx->bts->type; + struct gsm_bts *bts = sign_link->trx->bts; - switch (bts_type) { + switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: case GSM_BTS_TYPE_OSMOBTS: rc = abis_nm_rx_ipacc(mb); - abis_nm_queue_send_next(sign_link->trx->bts); + abis_nm_queue_send_next(bts); break; default: - LOGP(DNM, LOGL_ERROR, "don't know how to parse OML for this " - "BTS type (%s)\n", btstype2str(bts_type)); + LOGPMO(&bts->mo, DNM, LOGL_ERROR, "don't know how to parse OML for this " + "BTS type (%s)\n", btstype2str(bts->type)); rc = 0; break; } @@ -1183,7 +1187,7 @@ msgb_tlv_put(msg, NM_ATT_FILE_VERSION, sw->file_version_len, sw->file_version); } else { - LOGP(DNM, LOGL_ERROR, "Please implement this for the BTS.\n"); + LOGPMO(&sw->bts->mo, DNM, LOGL_ERROR, "Please implement this for the BTS.\n"); } } @@ -1281,7 +1285,7 @@ break; } default: - LOGP(DNM, LOGL_ERROR, "sw_load_segment needs implementation for the BTS.\n"); + LOGPMO(&sw->bts->mo, DNM, LOGL_ERROR, "sw_load_segment needs implementation for the BTS.\n"); /* FIXME: Other BTS types */ return -1; } @@ -1338,18 +1342,19 @@ static int parse_sdp_header(struct abis_nm_sw *sw) { + const struct gsm_abis_mo *mo = &sw->bts->mo; struct sdp_firmware firmware_header; int rc; struct stat stat; rc = read(sw->fd, &firmware_header, sizeof(firmware_header)); if (rc != sizeof(firmware_header)) { - LOGP(DNM, LOGL_ERROR, "Could not read SDP file header.\n"); + LOGPMO(mo, DNM, LOGL_ERROR, "Could not read SDP file header.\n"); return -1; } if (strncmp(firmware_header.magic, " SDP", 4) != 0) { - LOGP(DNM, LOGL_ERROR, "The magic number1 is wrong.\n"); + LOGPMO(mo, DNM, LOGL_ERROR, "The magic number1 is wrong.\n"); return -1; } @@ -1357,28 +1362,27 @@ firmware_header.more_magic[1] != 0x02 || firmware_header.more_magic[2] != 0x00 || firmware_header.more_magic[3] != 0x00) { - LOGP(DNM, LOGL_ERROR, "The more magic number is wrong.\n"); + LOGPMO(mo, DNM, LOGL_ERROR, "The more magic number is wrong.\n"); return -1; } if (fstat(sw->fd, &stat) == -1) { - LOGP(DNM, LOGL_ERROR, "Could not stat the file.\n"); + LOGPMO(mo, DNM, LOGL_ERROR, "Could not stat the file.\n"); return -1; } if (ntohl(firmware_header.file_length) != stat.st_size) { - LOGP(DNM, LOGL_ERROR, "The filesizes do not match.\n"); + LOGPMO(mo, DNM, LOGL_ERROR, "The filesizes do not match.\n"); return -1; } /* go back to the start as we checked the whole filesize.. */ lseek(sw->fd, 0l, SEEK_SET); - LOGP(DNM, LOGL_NOTICE, "The ipaccess SDP header is not fully understood." - " There might be checksums in the file that are not" - " verified and incomplete firmware might be flashed." - " There is absolutely no WARRANTY that flashing will" - " work.\n"); + LOGPMO(mo, DNM, LOGL_NOTICE, "The ipaccess SDP header is not fully understood. " + "There might be checksums in the file that are not verified and incomplete " + "firmware might be flashed. There is absolutely no WARRANTY that " + "flashing will work.\n"); return 0; } @@ -1620,7 +1624,7 @@ struct abis_nm_sw *sw = &g_sw; int rc; - DEBUGP(DNM, "Software Load (BTS %u, File \"%s\")\n", bts->nr, fname); + LOGPMO(&bts->mo, DNM, LOGL_DEBUG, "Software Load (file \"%s\")\n", fname); if (sw->state != SW_STATE_NONE) return -EBUSY; @@ -1643,7 +1647,7 @@ break; case GSM_BTS_TYPE_UNKNOWN: default: - LOGP(DNM, LOGL_ERROR, "Software Load not properly implemented.\n"); + LOGPMO(&bts->mo, DNM, LOGL_ERROR, "Software Load not properly implemented.\n"); return -1; break; } @@ -1688,7 +1692,7 @@ struct abis_nm_sw *sw = &g_sw; int rc; - DEBUGP(DNM, "Activating Software (BTS %u, File \"%s\")\n", bts->nr, fname); + LOGPMO(&bts->mo, DNM, LOGL_DEBUG, "Activating Software (file \"%s\")\n", fname); if (sw->state != SW_STATE_NONE) return -EBUSY; @@ -1785,9 +1789,8 @@ ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch)); fill_nm_channel(ch, e1_port, e1_timeslot, e1_subslot); - DEBUGP(DNM, "CONNECT TERR TRAF Um=%s E1=(%u,%u,%u)\n", - gsm_ts_name(ts), - e1_port, e1_timeslot, e1_subslot); + LOGPMO(&ts->mo, DNM, LOGL_DEBUG, "CONNECT TERR TRAF E1=(%u,%u,%u)\n", + e1_port, e1_timeslot, e1_subslot); return abis_nm_sendmsg(bts, msg); } @@ -1809,8 +1812,8 @@ struct msgb *msg; if (bts->type != GSM_BTS_TYPE_OSMOBTS && bts->type != GSM_BTS_TYPE_NANOBTS) { - LOGP(DNM, LOGL_NOTICE, "Getting attributes from BTS%d type %s is not supported.\n", - bts->nr, btstype2str(bts->type)); + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Getting attributes from BTS " + "type %s is not supported.\n", btstype2str(bts->type)); return -EINVAL; } @@ -1832,7 +1835,7 @@ struct msgb *msg = nm_msgb_alloc(); uint8_t *cur; - LOG_BTS(bts, DNM, LOGL_DEBUG, "Set BTS Attr\n"); + LOGPMO(&bts->mo, DNM, LOGL_DEBUG, "Set BTS Attr\n"); oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, attr_len, NM_MT_SET_BTS_ATTR, NM_OC_BTS, bts->bts_nr, 0xff, 0xff); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I68f64e6cae061a49733c4885ba383d2b9b4cfca9 Gerrit-Change-Number: 20148 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:26:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 12:26:19 +0000 Subject: Change in osmo-bts[master]: ta_control: fix Timing Advance control for SDCCH channels In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22907 ) Change subject: ta_control: fix Timing Advance control for SDCCH channels ...................................................................... ta_control: fix Timing Advance control for SDCCH channels The check in lchan_ms_ta_ctrl() breaks Timing Advance control on SDCCH channels, because 'num_ul_meas' wraps and never reaches 4. Neither this check makes any sense for other channel types, because lchan_ms_ta_ctrl() is always called in the end of the measurement period. Let's drop it. Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b Fixes: If7ddf74db3abc9b9872abe620a0aeebe3327e70a Related: OS#5024 --- M src/common/ta_control.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/ta_control.c b/src/common/ta_control.c index 5a3cbf5..ccb60e2 100644 --- a/src/common/ta_control.c +++ b/src/common/ta_control.c @@ -33,11 +33,6 @@ { int16_t toa256 = lchan->meas.ms_toa256; - /* Do not perform any computation when the amount of measurement - * results is too little. */ - if (lchan->meas.num_ul_meas < 4) - return; - if (toa256 < -TOA256_9OPERCENT && lchan->rqd_ta > TA_MIN) { LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "TOA is too early (%d), now lowering TA from %d to %d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0b86d49ec00b38d0f309c56b2519e5d487f0b65b Gerrit-Change-Number: 22907 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:29:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 12:29:10 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/22801/2/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/22801/2/src/pcu_l1_if.cpp at 344 PS2, Line 344: LOGP(DPCU, LOGL_ERROR, "Error decoding SI13\n"); > This looks like a different logical change, put this in an own commit? [?] That's definetly related to the patch, since it's where we get the new value from. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 12:29:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:29:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 12:29:13 +0000 Subject: Change in osmo-pcu[master]: Use ALPHA value received in SI13 from PCUIF In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22801 ) Change subject: Use ALPHA value received in SI13 from PCUIF ...................................................................... Use ALPHA value received in SI13 from PCUIF The old VTY command is marked as deprecated and still overrides the use in case it's used. Related: SYS#5358 Depends: libosmocore.git Change-Id I74fb0a3afc1ac4aadbfc609b882d929401f790eb Depends: osmo-bsc.git Change-Id I8b97ea11bad5fe05f2f634945b5703ee9abde81d Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 --- M doc/examples/osmo-pcu.cfg M doc/manuals/chapters/configuration.adoc M src/bts.cpp M src/bts.h M src/gprs_pcu.c M src/gprs_pcu.h M src/pcu_l1_if.cpp M src/pcu_vty.c M src/tbf.cpp M tests/emu/pcu_emu.cpp 10 files changed, 43 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-pcu.cfg b/doc/examples/osmo-pcu.cfg index b88e6e7..4a3842d 100644 --- a/doc/examples/osmo-pcu.cfg +++ b/doc/examples/osmo-pcu.cfg @@ -2,5 +2,4 @@ flow-control-interval 10 cs 2 alloc-algorithm dynamic - alpha 0 gamma 0 diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 01e4d65..d031ce6 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -15,14 +15,12 @@ flow-control-interval 10 <1> cs 2 <2> alloc-algorithm dynamic <3> - alpha 0 <4> gamma 0 ---- <1> send a BSSGP flow-control PDU every 10 seconds <2> start a TBF with the initial coding scheme 2 <3> dynamically chose between single-slot or multi-slot TBF allocations depending on system load -<4> disable MS power control loop However, there are plenty of tuning parameters for people interested to optimize PCU throughput or latency according to their requirements. @@ -212,13 +210,15 @@ You can set those parameters at the `pcu` VTY config node as follows: -`alpha <0-10>`:: - Alpha parameter for MS power control in units of 0.1. - Make sure to set the alpha value at System Information 13 (in - the BSC), too! `gamma <0-62>`:: Set the gamma parameter for MS power control in units of dB. +Parameter `ALPHA` is set on the BSC VTY configuration file on a per-BTS basis, +and forwarded by OsmoPCU to the MS through the SI13 received from the former +over PCUIF. OsmoPCU VTY command `alpha <0-10>` overrides the value received over +PCUIF to keep backward compatibility with existing config files, but it is +currently deprecated and its use is discouraged; one should configure it per-BTS +in OsmoBSC VTY instead. === Configuring Network Assisted Cell Change (NACC) diff --git a/src/bts.cpp b/src/bts.cpp index fb7de64..11aef3f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -918,7 +918,7 @@ plen = Encoding::write_immediate_assignment( &bts->trx[trx_no].pdch[ts_no], tbf, bv, false, rip->ra, Fn, ta, usf, false, sb_fn, - bts->pcu->vty.alpha, bts->pcu->vty.gamma, -1, + bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, rip->burst_type); bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); } @@ -999,7 +999,7 @@ tbf, immediate_assignment, true, 125, (tbf->pdch[ts_no]->last_rts_fn + 21216) % GSM_MAX_FN, tbf->ta(), 7, poll, tbf->poll_fn, - bts->pcu->vty.alpha, bts->pcu->vty.gamma, -1, + bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, GSM_L1_BURST_TYPE_ACCESS_0); if (plen >= 0) { bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF); @@ -1292,3 +1292,14 @@ { return bts_ms_store(bts)->ms_list(); } + +uint8_t bts_get_ms_pwr_alpha(const struct gprs_rlcmac_bts *bts) +{ + if (bts->pcu->vty.force_alpha != (uint8_t)-1) + return bts->pcu->vty.force_alpha; + if (bts->si13_is_set) + return bts->si31_ro_decoded.pwr_ctrl_pars.alpha; + /* default if no SI13 is received yet: closed loop control, TS 44.060 + * B.2 Closed loop control */ + return 0; +} diff --git a/src/bts.h b/src/bts.h index e67668c..90367ac 100644 --- a/src/bts.h +++ b/src/bts.h @@ -35,6 +35,7 @@ #include #include #include +#include #include #include "mslot_class.h" #include "gsm_rlcmac.h" @@ -224,6 +225,7 @@ uint8_t si3[GSM_MACBLOCK_LEN]; bool si3_is_set; uint8_t si13[GSM_MACBLOCK_LEN]; + struct osmo_gsm48_si13_info si31_ro_decoded; bool si13_is_set; /* State for dynamic algorithm selection */ @@ -346,6 +348,7 @@ void bts_set_max_mcs_ul(struct gprs_rlcmac_bts *bts, uint8_t mcs_ul); bool bts_cs_dl_is_supported(const struct gprs_rlcmac_bts *bts, enum CodingScheme cs); const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts); +uint8_t bts_get_ms_pwr_alpha(const struct gprs_rlcmac_bts *bts); #ifdef __cplusplus } #endif diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index 554007e..52e9825 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -65,7 +65,7 @@ pcu->vty.max_cs_dl = MAX_GPRS_CS; pcu->vty.max_mcs_ul = MAX_EDGE_MCS; pcu->vty.max_mcs_dl = MAX_EDGE_MCS; - pcu->vty.alpha = 0; /* a = 0.0 */ + pcu->vty.force_alpha = (uint8_t)-1; /* don't force by default, use BTS SI13 provided value */ pcu->vty.dl_tbf_preemptive_retransmission = true; /* By default resegmentation is supported in DL can also be configured * through VTY */ diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h index 9f75fb8..76e3937 100644 --- a/src/gprs_pcu.h +++ b/src/gprs_pcu.h @@ -90,7 +90,7 @@ uint8_t max_cs_dl, max_cs_ul; uint8_t max_mcs_dl, max_mcs_ul; uint8_t force_two_phase; - uint8_t alpha, gamma; + uint8_t force_alpha, gamma; bool dl_tbf_preemptive_retransmission; enum egprs_arq_type dl_arq_type; /* EGPRS_ARQ1 to support resegmentation in DL, EGPRS_ARQ2 for no reseg */ bool cs_adj_enabled; /* whether cs_adj_{upper,lower}_limit are used to adjust DL CS */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index b6d6786..7753557 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include } @@ -291,6 +292,7 @@ static int pcu_rx_data_ind_bcch(struct gprs_rlcmac_bts *bts, uint8_t *data, uint8_t len) { + const uint8_t *si_ro; switch (len) { case 0: /* Due to historical reasons also accept a completely empty message as @@ -337,6 +339,9 @@ case GSM48_MT_RR_SYSINFO_13: memcpy(bts->si13, data, GSM_MACBLOCK_LEN); bts->si13_is_set = true; + si_ro = ((struct gsm48_system_information_type_13*)data)->rest_octets; + if (osmo_gsm48_rest_octets_si13_decode(&bts->si31_ro_decoded, si_ro) < 0) + LOGP(DPCU, LOGL_ERROR, "Error decoding SI13\n"); break; default: LOGP(DL1IF, LOGL_ERROR, diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 92ff8eb..c2de92c 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -230,7 +230,8 @@ vty_out(vty, " alloc-algorithm dynamic%s", VTY_NEWLINE); if (the_pcu->vty.force_two_phase) vty_out(vty, " two-phase-access%s", VTY_NEWLINE); - vty_out(vty, " alpha %d%s", the_pcu->vty.alpha, VTY_NEWLINE); + if (the_pcu->vty.force_alpha != (uint8_t)-1) + vty_out(vty, " alpha %u%s", the_pcu->vty.force_alpha, VTY_NEWLINE); vty_out(vty, " gamma %d%s", the_pcu->vty.gamma * 2, VTY_NEWLINE); if (!the_pcu->vty.dl_tbf_preemptive_retransmission) vty_out(vty, " no dl-tbf-preemptive-retransmission%s", VTY_NEWLINE); @@ -735,13 +736,19 @@ DEFUN_ATTR(cfg_pcu_alpha, cfg_pcu_alpha_cmd, - "alpha <0-10>", + "alpha (si13|<0-10>)", "Alpha parameter for MS power control in units of 0.1 (see TS 05.08) " "NOTE: Be sure to set Alpha value at System information 13 too.\n" - "Alpha in units of 0.1\n", - CMD_ATTR_IMMEDIATE) + "Use value received from BSC in System Intormation 13 (default)\n" + "Force Alpha in units of 0.1\n", + CMD_ATTR_IMMEDIATE | CMD_ATTR_DEPRECATED) { - the_pcu->vty.alpha = atoi(argv[0]); + vty_out(vty, "%% 'alpha <0-10>' is now deprecated: use osmo-bsc's 'gprs power-control alpha <0-10>' instead%s", + VTY_NEWLINE); + if (strcmp(argv[0], "si13") == 0) + the_pcu->vty.force_alpha = (uint8_t) -1; + else + the_pcu->vty.force_alpha = atoi(argv[0]); return CMD_SUCCESS; } diff --git a/src/tbf.cpp b/src/tbf.cpp index 7caa2ce..1885927 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -930,7 +930,7 @@ Encoding::write_packet_downlink_assignment(mac_control_block, old_tfi_is_valid, m_tfi, (direction == GPRS_RLCMAC_DL_TBF), new_dl_tbf, poll_ass_dl, rrbp, - the_pcu->vty.alpha, the_pcu->vty.gamma, -1, 0, + bts_get_ms_pwr_alpha(new_dl_tbf->bts), the_pcu->vty.gamma, -1, 0, is_egprs_enabled()); LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++\n"); rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block); @@ -1033,7 +1033,7 @@ mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t); Encoding::write_packet_uplink_assignment(mac_control_block, m_tfi, (direction == GPRS_RLCMAC_DL_TBF), tlli(), - is_tlli_valid(), new_tbf, 1, rrbp, the_pcu->vty.alpha, + is_tlli_valid(), new_tbf, 1, rrbp, bts_get_ms_pwr_alpha(new_tbf->bts), the_pcu->vty.gamma, -1, is_egprs_enabled()); LOGP(DTBF, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Uplink Assignment +++++++++++++++++++++++++\n"); diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index 082f8ea..7c9baa9 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -77,7 +77,6 @@ if (!pcu->alloc_algorithm) pcu->alloc_algorithm = alloc_algorithm_b; pcu->vty.fc_interval = 100; - pcu->vty.alpha = 0; /* a = 0.0 */ } static void bvci_unblocked(struct gprs_bssgp_pcu *pcu) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I46f2a955b157a409055fca7fb917dc4f75482426 Gerrit-Change-Number: 22801 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 12:31:18 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/22942/3/Transceiver52M/osmo-trx.cpp File Transceiver52M/osmo-trx.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/22942/3/Transceiver52M/osmo-trx.cpp at 545 PS3, Line 545: ost << " LO freq. offset......... " << trx->cfg.offset << std::endl; > So what's the difference between LO freq offse and Tune freq offset? See Harald's explanation in the ticket (#note-33). I don't think I can explain better. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 12:31:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 12:35:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 12:35:52 +0000 Subject: Change in osmo-bsc[master]: CBSP: document rate counters and their mapping to basic/extended CBCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23024 ) Change subject: CBSP: document rate counters and their mapping to basic/extended CBCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id298d547a90bb5d8e40f2cd300b7e1303bb43fdc Gerrit-Change-Number: 23024 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 22 Feb 2021 12:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:44:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:44:02 +0000 Subject: Change in docker-playground[master]: cbc: New ttcn3-cbc-test container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23025 ) Change subject: cbc: New ttcn3-cbc-test container ...................................................................... cbc: New ttcn3-cbc-test container Change-Id: I4386aeee8ba6d7aec7f879bad28208b7f27a45d9 --- A ttcn3-cbc-test/CBC_Tests.cfg A ttcn3-cbc-test/Dockerfile A ttcn3-cbc-test/Makefile A ttcn3-cbc-test/jenkins.sh A ttcn3-cbc-test/osmo-cbc.cfg 5 files changed, 129 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/25/23025/1 diff --git a/ttcn3-cbc-test/CBC_Tests.cfg b/ttcn3-cbc-test/CBC_Tests.cfg new file mode 100644 index 0000000..23607e2 --- /dev/null +++ b/ttcn3-cbc-test/CBC_Tests.cfg @@ -0,0 +1,17 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/cbc/CBC_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +CBC_Tests.mp_cbc_host := "172.18.27.20"; + +[MAIN_CONTROLLER] + +[EXECUTE] +CBC_Tests.control diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile new file mode 100644 index 0000000..8eba25f --- /dev/null +++ b/ttcn3-cbc-test/Dockerfile @@ -0,0 +1,13 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-stretch-titan +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" cbc + +VOLUME /data + +COPY CBC_Tests.cfg /data/CBC_Tests.cfg + +CMD ttcn3-docker-run cbc CBC_Tests diff --git a/ttcn3-cbc-test/Makefile b/ttcn3-cbc-test/Makefile new file mode 100644 index 0000000..34897fd --- /dev/null +++ b/ttcn3-cbc-test/Makefile @@ -0,0 +1,3 @@ +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202 + +include ../make/Makefile diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh new file mode 100755 index 0000000..40311fd --- /dev/null +++ b/ttcn3-cbc-test/jenkins.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-cbc-$IMAGE_SUFFIX" \ + "ttcn3-cbc-test" + +mkdir $VOL_BASE_DIR/cbc-tester +cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ + +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + +mkdir $VOL_BASE_DIR/cbc +cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ + +SUBNET=27 +network_create $SUBNET + +echo Starting container with CBC +docker run --rm \ + $(docker_network_params $SUBNET 20) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/cbc:/data \ + --name ${BUILD_TAG}-cbc -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-cbc-$IMAGE_SUFFIX + +echo Starting container with CBC testsuite +docker run --rm \ + $(docker_network_params $SUBNET 100) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/cbc-tester:/data \ + --name ${BUILD_TAG}-ttcn3-cbc-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-cbc-test + +echo Stopping containers +docker container kill ${BUILD_TAG}-cbc + +network_remove +collect_logs diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg new file mode 100644 index 0000000..3b6610e --- /dev/null +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -0,0 +1,52 @@ +! +! OsmoCBC (0.1.0.5-e88e) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print extended-timestamp 1 + logging print level 1 + logging print file 1 last + logging level cbsp debug + logging level rest debug + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice + logging level lns notice + logging level lbssgp notice +! +line vty + no login + bind 0.0.0.0 +! +cbc + unknown-peers reject + peer ttcn3 + protocol cbsp + remote-port 9999 + remote-ip 172.18.27.100 + cbsp + local-ip 172.18.27.20 + local-port 48049 + ecbe + local-ip 172.18.27.20 + local-port 12345 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4386aeee8ba6d7aec7f879bad28208b7f27a45d9 Gerrit-Change-Number: 23025 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:44:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:44:16 +0000 Subject: Change in docker-playground[master]: cbc: Add osmo-cbc-master container In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23023 ) Change subject: cbc: Add osmo-cbc-master container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7f144899725cd0f049f860beced45e37b3242a93 Gerrit-Change-Number: 23023 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 13:44:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:44:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:44:20 +0000 Subject: Change in docker-playground[master]: cbc: New ttcn3-cbc-test container In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23025 ) Change subject: cbc: New ttcn3-cbc-test container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4386aeee8ba6d7aec7f879bad28208b7f27a45d9 Gerrit-Change-Number: 23025 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 13:44:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:44:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:44:21 +0000 Subject: Change in docker-playground[master]: cbc: Add osmo-cbc-master container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23023 ) Change subject: cbc: Add osmo-cbc-master container ...................................................................... cbc: Add osmo-cbc-master container Change-Id: I7f144899725cd0f049f860beced45e37b3242a93 --- A osmo-cbc-master/Dockerfile A osmo-cbc-master/Makefile A osmo-cbc-master/Release.key A osmo-cbc-master/osmo-cbc.cfg 4 files changed, 134 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-cbc-master/Dockerfile b/osmo-cbc-master/Dockerfile new file mode 100644 index 0000000..c305ac4 --- /dev/null +++ b/osmo-cbc-master/Dockerfile @@ -0,0 +1,71 @@ +ARG USER +ARG DISTRO +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN case "$DISTRO" in \ + debian*) \ + apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \ + ;; \ + esac + +# we need to add this to invalidate the cache once the repository is updated. +# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM +ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml +RUN case "$DISTRO" in \ + debian*) \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + libosmocore-dev \ + libosmo-netif-dev \ + libulfius-dev \ + && \ + apt-get clean \ + ;; \ + centos*) \ + dnf install -y \ + "pkgconfig(libosmo-netif)" \ + "pkgconfig(libosmocore)" \ + "pkgconfig(libosmoctrl)" \ + "pkgconfig(libosmogsm)" \ + "pkgconfig(libosmovty)" \ + "pkgconfig(libulfius)" \ + ;; \ + esac + +WORKDIR /tmp + +ARG OSMO_CBC_BRANCH="master" + +RUN git clone git://git.osmocom.org/osmo-cbc.git +ADD http://git.osmocom.org/osmo-cbc/patch?h=$OSMO_CBC_BRANCH /tmp/commit-osmo-cbc + +RUN cd osmo-cbc && \ + git fetch && git checkout $OSMO_CBC_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_CBC_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure && \ + make "-j$(nproc)" install + +VOLUME /data + +COPY osmo-cbc.cfg /data/osmo-cbc.cfg + +WORKDIR /data +CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-cbc -c /data/osmo-cbc.cfg >/data/osmo-cbc.log 2>&1"] + +#EXPOSE diff --git a/osmo-cbc-master/Makefile b/osmo-cbc-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-cbc-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-cbc-master/Release.key b/osmo-cbc-master/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-cbc-master/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-cbc-master/osmo-cbc.cfg b/osmo-cbc-master/osmo-cbc.cfg new file mode 100644 index 0000000..0d371c5 --- /dev/null +++ b/osmo-cbc-master/osmo-cbc.cfg @@ -0,0 +1,42 @@ +! +! OsmoCBC (0.1.0.5-e88e) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print extended-timestamp 1 + logging print level 1 + logging print file 1 last + logging level cbsp debug + logging level rest debug + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice + logging level lns notice + logging level lbssgp notice +! +line vty + no login + bind 0.0.0.0 +! +cbc + unknown-peers reject -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7f144899725cd0f049f860beced45e37b3242a93 Gerrit-Change-Number: 23023 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:44:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:44:22 +0000 Subject: Change in docker-playground[master]: cbc: New ttcn3-cbc-test container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23025 ) Change subject: cbc: New ttcn3-cbc-test container ...................................................................... cbc: New ttcn3-cbc-test container Change-Id: I4386aeee8ba6d7aec7f879bad28208b7f27a45d9 --- A ttcn3-cbc-test/CBC_Tests.cfg A ttcn3-cbc-test/Dockerfile A ttcn3-cbc-test/Makefile A ttcn3-cbc-test/jenkins.sh A ttcn3-cbc-test/osmo-cbc.cfg 5 files changed, 129 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-cbc-test/CBC_Tests.cfg b/ttcn3-cbc-test/CBC_Tests.cfg new file mode 100644 index 0000000..23607e2 --- /dev/null +++ b/ttcn3-cbc-test/CBC_Tests.cfg @@ -0,0 +1,17 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/cbc/CBC_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +CBC_Tests.mp_cbc_host := "172.18.27.20"; + +[MAIN_CONTROLLER] + +[EXECUTE] +CBC_Tests.control diff --git a/ttcn3-cbc-test/Dockerfile b/ttcn3-cbc-test/Dockerfile new file mode 100644 index 0000000..8eba25f --- /dev/null +++ b/ttcn3-cbc-test/Dockerfile @@ -0,0 +1,13 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-stretch-titan +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" cbc + +VOLUME /data + +COPY CBC_Tests.cfg /data/CBC_Tests.cfg + +CMD ttcn3-docker-run cbc CBC_Tests diff --git a/ttcn3-cbc-test/Makefile b/ttcn3-cbc-test/Makefile new file mode 100644 index 0000000..34897fd --- /dev/null +++ b/ttcn3-cbc-test/Makefile @@ -0,0 +1,3 @@ +RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202 + +include ../make/Makefile diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh new file mode 100755 index 0000000..40311fd --- /dev/null +++ b/ttcn3-cbc-test/jenkins.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-cbc-$IMAGE_SUFFIX" \ + "ttcn3-cbc-test" + +mkdir $VOL_BASE_DIR/cbc-tester +cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ + +mkdir $VOL_BASE_DIR/stp +cp osmo-stp.cfg $VOL_BASE_DIR/stp/ + +mkdir $VOL_BASE_DIR/cbc +cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ + +SUBNET=27 +network_create $SUBNET + +echo Starting container with CBC +docker run --rm \ + $(docker_network_params $SUBNET 20) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/cbc:/data \ + --name ${BUILD_TAG}-cbc -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-cbc-$IMAGE_SUFFIX + +echo Starting container with CBC testsuite +docker run --rm \ + $(docker_network_params $SUBNET 100) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/cbc-tester:/data \ + --name ${BUILD_TAG}-ttcn3-cbc-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-cbc-test + +echo Stopping containers +docker container kill ${BUILD_TAG}-cbc + +network_remove +collect_logs diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg new file mode 100644 index 0000000..3b6610e --- /dev/null +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -0,0 +1,52 @@ +! +! OsmoCBC (0.1.0.5-e88e) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print extended-timestamp 1 + logging print level 1 + logging print file 1 last + logging level cbsp debug + logging level rest debug + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice + logging level lns notice + logging level lbssgp notice +! +line vty + no login + bind 0.0.0.0 +! +cbc + unknown-peers reject + peer ttcn3 + protocol cbsp + remote-port 9999 + remote-ip 172.18.27.100 + cbsp + local-ip 172.18.27.20 + local-port 48049 + ecbe + local-ip 172.18.27.20 + local-port 12345 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4386aeee8ba6d7aec7f879bad28208b7f27a45d9 Gerrit-Change-Number: 23025 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:44:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:44:33 +0000 Subject: Change in osmo-bsc[master]: CBSP: document rate counters and their mapping to basic/extended CBCH In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23024 ) Change subject: CBSP: document rate counters and their mapping to basic/extended CBCH ...................................................................... CBSP: document rate counters and their mapping to basic/extended CBCH Change-Id: Id298d547a90bb5d8e40f2cd300b7e1303bb43fdc --- M doc/manuals/chapters/smscb.adoc 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/chapters/smscb.adoc b/doc/manuals/chapters/smscb.adoc index 011aec4..6ac5370 100644 --- a/doc/manuals/chapters/smscb.adoc +++ b/doc/manuals/chapters/smscb.adoc @@ -102,3 +102,29 @@ ---- For more details on the available configuration commands, please check the OsmoBSC VTY Reference. + +=== Counters + +OsmoBSC has two Cell Broadcast related rate counter groups for each BTS: + +* the basic CBCH ("cell broadcast channel 0") +* the extended CBCH ("cell broadcast channel 1") + +See below example for a situation where no CBS messages were received yet from the CBC, +and hence only NULL messages have been sent on both basic and extended CBCH: + +.Example: CBCH related rate counters on a BTS that didn't receive any CBS messages +---- +cell broadcast channel 1: + cbch:rcvd_queued: 0 (0/s 0/m 0/h 0/d) Received + queued CBCH messages (Abis) + cbch:rcvd_dropped: 0 (0/s 0/m 0/h 0/d) Received + dropped CBCH messages (Abis) + cbch:sent_single: 0 (0/s 0/m 0/h 0/d) Sent single CBCH messages (Um) + cbch:sent_default: 0 (0/s 0/m 0/h 0/d) Sent default CBCH messages (Um) + cbch:sent_null: 31366 (0/s 45/m 2677/h 30588/d) Sent NULL CBCH messages (Um) +cell broadcast channel 0: + cbch:rcvd_queued: 0 (0/s 0/m 0/h 0/d) Received + queued CBCH messages (Abis) + cbch:rcvd_dropped: 0 (0/s 0/m 0/h 0/d) Received + dropped CBCH messages (Abis) + cbch:sent_single: 0 (0/s 0/m 0/h 0/d) Sent single CBCH messages (Um) + cbch:sent_default: 0 (0/s 0/m 0/h 0/d) Sent default CBCH messages (Um) + cbch:sent_null: 31366 (1/s 46/m 2676/h 30588/d) Sent NULL CBCH messages (Um) +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id298d547a90bb5d8e40f2cd300b7e1303bb43fdc Gerrit-Change-Number: 23024 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:45:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:45:23 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 22 Feb 2021 13:45:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:45:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:45:26 +0000 Subject: Change in osmo-trx[master]: Add a (hidden) VTY parameter for Rx/Tx freq. shifting In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22942 ) Change subject: Add a (hidden) VTY parameter for Rx/Tx freq. shifting ...................................................................... Add a (hidden) VTY parameter for Rx/Tx freq. shifting Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Related: SYS#4454 --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp 4 files changed, 22 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/CommonLibs/config_defs.h b/CommonLibs/config_defs.h index a9ed25e..17352c3 100644 --- a/CommonLibs/config_defs.h +++ b/CommonLibs/config_defs.h @@ -46,6 +46,7 @@ enum FillerType filler; bool multi_arfcn; double offset; + double freq_offset_khz; double rssi_offset; bool force_rssi_offset; /* Force value set in VTY? */ bool swap_channels; diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 0bb83fe..d1da450 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -244,6 +244,19 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_freq_offset, cfg_freq_offset_cmd, + "freq-offset FLOAT", + "Apply an artificial offset to Rx/Tx carrier frequency\n" + "Frequency offset in kHz (e.g. -145300)\n", + CMD_ATTR_HIDDEN) +{ + struct trx_ctx *trx = trx_from_vty(vty); + + trx->cfg.freq_offset_khz = atof(argv[0]); + + return CMD_SUCCESS; +} + DEFUN(cfg_rssi_offset, cfg_rssi_offset_cmd, "rssi-offset FLOAT [relative]", "Set the RSSI to dBm offset in dB (default=0)\n" @@ -593,6 +606,8 @@ vty_out(vty, " multi-arfcn %s%s", trx->cfg.multi_arfcn ? "enable" : "disable", VTY_NEWLINE); if (trx->cfg.offset != 0) vty_out(vty, " offset %f%s", trx->cfg.offset, VTY_NEWLINE); + if (trx->cfg.freq_offset_khz != 0) + vty_out(vty, " freq-offset %f%s", trx->cfg.freq_offset_khz, VTY_NEWLINE); if (!(trx->cfg.rssi_offset == 0 && !trx->cfg.force_rssi_offset)) vty_out(vty, " rssi-offset %f%s%s", trx->cfg.rssi_offset, trx->cfg.force_rssi_offset ? " relative": "", VTY_NEWLINE); @@ -758,6 +773,7 @@ install_element(TRX_NODE, &cfg_clock_ref_cmd); install_element(TRX_NODE, &cfg_multi_arfcn_cmd); install_element(TRX_NODE, &cfg_offset_cmd); + install_element(TRX_NODE, &cfg_freq_offset_cmd); install_element(TRX_NODE, &cfg_rssi_offset_cmd); install_element(TRX_NODE, &cfg_swap_channels_cmd); install_element(TRX_NODE, &cfg_egprs_cmd); diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 0a1ba6f..91f06ec 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -954,7 +954,7 @@ // tune receiver int freqKhz; sscanf(params, "%d", &freqKhz); - mRxFreq = freqKhz * 1e3; + mRxFreq = (freqKhz + cfg->freq_offset_khz) * 1e3; if (!mRadioInterface->tuneRx(mRxFreq, chan)) { LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune"; sprintf(response,"RSP RXTUNE 1 %d",freqKhz); @@ -965,7 +965,7 @@ // tune txmtr int freqKhz; sscanf(params, "%d", &freqKhz); - mTxFreq = freqKhz * 1e3; + mTxFreq = (freqKhz + cfg->freq_offset_khz) * 1e3; if (!mRadioInterface->tuneTx(mTxFreq, chan)) { LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune"; sprintf(response,"RSP TXTUNE 1 %d",freqKhz); diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 2d45932..b227863 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -542,7 +542,9 @@ ost << " Filler Burst TSC........ " << trx->cfg.rtsc << std::endl; ost << " Filler Burst RACH Delay. " << trx->cfg.rach_delay << std::endl; ost << " Multi-Carrier........... " << trx->cfg.multi_arfcn << std::endl; - ost << " Tuning offset........... " << trx->cfg.offset << std::endl; + ost << " LO freq. offset......... " << trx->cfg.offset << std::endl; + if (trx->cfg.freq_offset_khz != 0) + ost << " Tune freq. offset....... " << trx->cfg.freq_offset_khz << std::endl; ost << " RSSI to dBm offset...... " << trx->cfg.rssi_offset << (trx->cfg.force_rssi_offset ? "" : " (relative)") << std::endl; ost << " Swap channels........... " << trx->cfg.swap_channels << std::endl; ost << " Tx Antennas............."; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I360e8ba91471757210c7f096c04928a6fbb91c61 Gerrit-Change-Number: 22942 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:50:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:50:11 +0000 Subject: Change in osmo-ci[master]: ttcn3-tstsuites: Add osmo-cbc tests References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23026 ) Change subject: ttcn3-tstsuites: Add osmo-cbc tests ...................................................................... ttcn3-tstsuites: Add osmo-cbc tests Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 --- M jobs/ttcn3-testsuites.yml 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/26/23026/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f6d1bf4..fe3dd82 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -73,6 +73,9 @@ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test-fr.*" timer: 30 10 * * * node: hdlc + - ttcn3-cbc-test: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 10 * * * # debian-stretch latest stable - nplab-m3ua-test-latest: @@ -132,6 +135,9 @@ - ttcn3-gbproxy-test-latest: blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * + #- ttcn3-cbc-test-latest: + # blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + # timer: 40 10 * * * # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs @@ -184,6 +190,9 @@ - TTCN3-centos-gbproxy-test: blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * + - TTCN3-centos-cbc-test: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 10 * * * - job-template: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 Gerrit-Change-Number: 23026 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 13:51:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 13:51:57 +0000 Subject: Change in osmo-ci[master]: jobs: Fix names of commented-out SMLC test containers References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23027 ) Change subject: jobs: Fix names of commented-out SMLC test containers ...................................................................... jobs: Fix names of commented-out SMLC test containers This was a copy-+paste introduced in Ib1f374974444cdd5d829c4e57153137ecd9149f1 Change-Id: I8b315e2df34ccd9db78173ee6e83b4d8ec85e8bf --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/27/23027/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fe3dd82..a0b55ce 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -129,7 +129,7 @@ #- ttcn3-sccp-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" # timer: 00 10 * * * - #- ttcn3-smlc-test: + #- ttcn3-smlc-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" # timer: 10 10 * * * - ttcn3-gbproxy-test-latest: @@ -184,7 +184,7 @@ #- TTCN3-sccp-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" # timer: 00 10 * * * - #- ttcn3-smlc-test: + #- TTCN3-smlc-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" # timer: 10 10 * * * - TTCN3-centos-gbproxy-test: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8b315e2df34ccd9db78173ee6e83b4d8ec85e8bf Gerrit-Change-Number: 23027 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 14:12:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 14:12:49 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: Add osmo-cbc tests In-Reply-To: References: Message-ID: laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/23026 ) Change subject: ttcn3-testsuites: Add osmo-cbc tests ...................................................................... ttcn3-testsuites: Add osmo-cbc tests Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 --- M jobs/ttcn3-testsuites.yml 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/26/23026/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 Gerrit-Change-Number: 23026 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 14:12:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 14:12:55 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: Add osmo-cbc tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23026 ) Change subject: ttcn3-testsuites: Add osmo-cbc tests ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 Gerrit-Change-Number: 23026 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 14:12:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 14:13:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 14:13:01 +0000 Subject: Change in osmo-ci[master]: jobs: Fix names of commented-out SMLC test containers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23027 ) Change subject: jobs: Fix names of commented-out SMLC test containers ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8b315e2df34ccd9db78173ee6e83b4d8ec85e8bf Gerrit-Change-Number: 23027 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 22 Feb 2021 14:13:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 14:13:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 14:13:09 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: Add osmo-cbc tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23026 ) Change subject: ttcn3-testsuites: Add osmo-cbc tests ...................................................................... ttcn3-testsuites: Add osmo-cbc tests Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 --- M jobs/ttcn3-testsuites.yml 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index f6d1bf4..fe3dd82 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -73,6 +73,9 @@ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test-fr.*" timer: 30 10 * * * node: hdlc + - ttcn3-cbc-test: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 10 * * * # debian-stretch latest stable - nplab-m3ua-test-latest: @@ -132,6 +135,9 @@ - ttcn3-gbproxy-test-latest: blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * + #- ttcn3-cbc-test-latest: + # blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + # timer: 40 10 * * * # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs @@ -184,6 +190,9 @@ - TTCN3-centos-gbproxy-test: blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * + - TTCN3-centos-cbc-test: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 10 * * * - job-template: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I29eb72570d1f80c0f690878597c03afad5bb7b10 Gerrit-Change-Number: 23026 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 14:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 22 Feb 2021 14:13:13 +0000 Subject: Change in osmo-ci[master]: jobs: Fix names of commented-out SMLC test containers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23027 ) Change subject: jobs: Fix names of commented-out SMLC test containers ...................................................................... jobs: Fix names of commented-out SMLC test containers This was a copy-+paste introduced in Ib1f374974444cdd5d829c4e57153137ecd9149f1 Change-Id: I8b315e2df34ccd9db78173ee6e83b4d8ec85e8bf --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fe3dd82..a0b55ce 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -129,7 +129,7 @@ #- ttcn3-sccp-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" # timer: 00 10 * * * - #- ttcn3-smlc-test: + #- ttcn3-smlc-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" # timer: 10 10 * * * - ttcn3-gbproxy-test-latest: @@ -184,7 +184,7 @@ #- TTCN3-sccp-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" # timer: 00 10 * * * - #- ttcn3-smlc-test: + #- TTCN3-smlc-test-latest: # blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" # timer: 10 10 * * * - TTCN3-centos-gbproxy-test: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8b315e2df34ccd9db78173ee6e83b4d8ec85e8bf Gerrit-Change-Number: 23027 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 15:24:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 22 Feb 2021 15:24:20 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/23028 ) Change subject: utils: catch exceptions during reader initalitation ...................................................................... utils: catch exceptions during reader initalitation Failed reader initializations happen frome time to time, mostly because of messed up commandline arguments. This results in ugly crashes very often. Lets control this a bit by catching the exception string and print it. Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 --- M pySim-prog.py M pySim-read.py M pySim/utils.py 3 files changed, 25 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/28/23028/1 diff --git a/pySim-prog.py b/pySim-prog.py index cf503d0..e9b0433 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -720,6 +720,8 @@ # Init card reader driver sl = init_reader(opts) + if (sl == None): + exit(1) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim-read.py b/pySim-read.py index f901260..6aebda3 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -82,6 +82,8 @@ # Init card reader driver sl = init_reader(opts) + if (sel == None): + exit(1) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim/utils.py b/pySim/utils.py index c150184..67bfa74 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -607,24 +607,28 @@ """ Init card reader driver """ - if opts.pcsc_dev is not None: - print("Using PC/SC reader interface") - from pySim.transport.pcsc import PcscSimLink - sl = PcscSimLink(opts.pcsc_dev) - elif opts.osmocon_sock is not None: - print("Using Calypso-based (OsmocomBB) reader interface") - from pySim.transport.calypso import CalypsoSimLink - sl = CalypsoSimLink(sock_path=opts.osmocon_sock) - elif opts.modem_dev is not None: - print("Using modem for Generic SIM Access (3GPP TS 27.007)") - from pySim.transport.modem_atcmd import ModemATCommandLink - sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud) - else: # Serial reader is default - print("Using serial reader interface") - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) + try: + if opts.pcsc_dev is not None: + print("Using PC/SC reader interface") + from pySim.transport.pcsc import PcscSimLink + sl = PcscSimLink(opts.pcsc_dev) + elif opts.osmocon_sock is not None: + print("Using Calypso-based (OsmocomBB) reader interface") + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) + elif opts.modem_dev is not None: + print("Using modem for Generic SIM Access (3GPP TS 27.007)") + from pySim.transport.modem_atcmd import ModemATCommandLink + sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud) + else: # Serial reader is default + print("Using serial reader interface") + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) + return sl + except Exception as e: + print("Card reader initialization failed with exception:\n" + str(e)) + return None - return sl def enc_ePDGSelection(hexstr, mcc, mnc, epdg_priority='0001', epdg_fqdn_format='00'): """ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 15:24:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 22 Feb 2021 15:24:20 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/23029 ) Change subject: serial: don't crash if the device does not exist ...................................................................... serial: don't crash if the device does not exist The most common reason for pySim to crash is when it is executed without commandline parameters. Then pySim will expect a serial reader on /dev/ttyUSB0 since this is the default. Lets check if /dev/ttyUSB0 even exists before trying to open it. Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 --- M pySim/transport/serial.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/29/23029/1 diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index 61195e0..39df730 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -25,6 +25,7 @@ import serial import time +import os.path from pySim.exceptions import NoCardError, ProtocolError from pySim.transport import LinkBase @@ -34,6 +35,8 @@ class SerialSimLink(LinkBase): def __init__(self, device='/dev/ttyUSB0', baudrate=9600, rst='-rts', debug=False): + if (os.path.exists(device) == False): + raise ValueError ("device file %s does not exist -- abort" % device) self._sl = serial.Serial( port = device, parity = serial.PARITY_EVEN, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 15:24:21 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 22 Feb 2021 15:24:21 +0000 Subject: Change in pysim[master]: serial: do not try to close non existing serial connection References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/23030 ) Change subject: serial: do not try to close non existing serial connection ...................................................................... serial: do not try to close non existing serial connection The SerialSimLink only has an _sl member if serial initalization was successfull. If we close a serial connection, check if we even have the _sl member. Otherwise move on silently. Change-Id: Ic3f3f5e50d780f424da7d0be5733d7167bb7159c --- M pySim/transport/serial.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/23030/1 diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index 39df730..9730e3b 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -52,7 +52,8 @@ self._atr = None def __del__(self): - self._sl.close() + if (hasattr(self, "_sl")): + self._sl.close() def wait_for_card(self, timeout=None, newcardonly=False): # Direct try -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic3f3f5e50d780f424da7d0be5733d7167bb7159c Gerrit-Change-Number: 23030 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 15:41:09 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 22 Feb 2021 15:41:09 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/23028 to look at the new patch set (#2). Change subject: utils: catch exceptions during reader initalitation ...................................................................... utils: catch exceptions during reader initalitation Failed reader initializations happen frome time to time, mostly because of messed up commandline arguments. This results in ugly crashes very often. Lets control this a bit by catching the exception string and print it. Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 --- M pySim-prog.py M pySim-read.py M pySim/utils.py 3 files changed, 25 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/28/23028/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 17:44:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 17:44:37 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot alloctions References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot alloctions ...................................................................... Support uplink multi-slot alloctions Before this patch, allocate_usf() was implemented to only allocate 1 USF per TBF, regardless of the available ul_slot mask. As a result, only 1 slot at max was allocated to any TBF. That's a pity because usual multislot classes like 12 support up to 2 UL slots per TBF (in common TS with DL). This patch reworks allocate_usf() to allocate as many UL multislots as possible (given mslot class, current USF availability, TFI availability, related DL TBF slots for the same MS, etc.). As a result, it can be seen that AllocTest results change substantially and maximum concurrent TBF allocation drops under some conditions. That happens because due to more USFs being reserved (because each TBF has now more UL slots reserved). Hence now USF exhaustion becomes the usual limitation factor as per the number of concurrent TBFs than can be handled per TRX (as opposed to TFIs previously). Some of the biggest limitations in test appear though because really high end multislot classes are used, which can consume high volumes of UL slots (USFs), and which are probably not the most extended devices in the field. Moreover, in general the curren timeslot allocator for a given multislot class will in general try to optimize the DL side gathering most of the possible timeslots there. That means, for instance on ms class 12 (4 Tx, 4Rx, 5 Sum), 4 DL slots and 1 UL slot will still be selected. But in the case where only 3 PDCHs are available, then with this new multi-slot UL support a TBF will reserve 3 DL slots and 2 UL slots, while before this patch it would only taken 1 UL slot instead of 2. This USF exhaustion situation can be improved in the future by parametrizing (VTY command?) the maximum amount of UL slots that a TBF can reserve, making for instance a default value of 2, meaning usual classes can gather up 2 UL timelosts at a time while forbidding high-end hungry classes to gather up to 8 UL timeslots. Another approach would be to dynamically limit the amount of allowed reservable UL timeslots based on current USF reservation load. Related: OS#2282 Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 --- M src/gprs_rlcmac_ts_alloc.cpp M tests/alloc/AllocTest.cpp M tests/alloc/AllocTest.err M tests/alloc/AllocTest.ok 4 files changed, 7,608 insertions(+), 8,742 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/23031/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 17:45:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 17:45:15 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Support uplink multi-slot allocations Before this patch, allocate_usf() was implemented to only allocate 1 USF per TBF, regardless of the available ul_slot mask. As a result, only 1 slot at max was allocated to any TBF. That's a pity because usual multislot classes like 12 support up to 2 UL slots per TBF (in common TS with DL). This patch reworks allocate_usf() to allocate as many UL multislots as possible (given mslot class, current USF availability, TFI availability, related DL TBF slots for the same MS, etc.). As a result, it can be seen that AllocTest results change substantially and maximum concurrent TBF allocation drops under some conditions. That happens because due to more USFs being reserved (because each TBF has now more UL slots reserved). Hence now USF exhaustion becomes the usual limitation factor as per the number of concurrent TBFs than can be handled per TRX (as opposed to TFIs previously). Some of the biggest limitations in test appear though because really high end multislot classes are used, which can consume high volumes of UL slots (USFs), and which are probably not the most extended devices in the field. Moreover, in general the curren timeslot allocator for a given multislot class will in general try to optimize the DL side gathering most of the possible timeslots there. That means, for instance on ms class 12 (4 Tx, 4Rx, 5 Sum), 4 DL slots and 1 UL slot will still be selected. But in the case where only 3 PDCHs are available, then with this new multi-slot UL support a TBF will reserve 3 DL slots and 2 UL slots, while before this patch it would only taken 1 UL slot instead of 2. This USF exhaustion situation can be improved in the future by parametrizing (VTY command?) the maximum amount of UL slots that a TBF can reserve, making for instance a default value of 2, meaning usual classes can gather up 2 UL timelosts at a time while forbidding high-end hungry classes to gather up to 8 UL timeslots. Another approach would be to dynamically limit the amount of allowed reservable UL timeslots based on current USF reservation load. Related: OS#2282 Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 --- M src/gprs_rlcmac_ts_alloc.cpp M tests/alloc/AllocTest.cpp M tests/alloc/AllocTest.err M tests/alloc/AllocTest.ok 4 files changed, 7,608 insertions(+), 8,742 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/23031/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 17:55:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 22 Feb 2021 17:55:05 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Patch Set 2: I looked at unit tests and tested it locally on my local setup and everything looks fine as far as I can see. It also makes PCU_Tests.TC_ul_multislot_tbf_ms_class_from_2phase pass for first time. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 22 Feb 2021 17:55:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 18:36:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 18:36:11 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23028 ) Change subject: utils: catch exceptions during reader initalitation ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-prog.py at 723 PS2, Line 723: if (sl == None): Coding style: if sl is None: ... https://stackoverflow.com/questions/14247373/python-none-comparison-should-i-use-is-or/14247419#14247419 https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-read.py at 85 PS2, Line 85: if (sl == None): Coding style: if sl is None: ... https://stackoverflow.com/questions/14247373/python-none-comparison-should-i-use-is-or/14247419#14247419 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 22 Feb 2021 18:36:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 18:38:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 18:38:28 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23029 ) Change subject: serial: don't crash if the device does not exist ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/pysim/+/23029/2/pySim/transport/serial.py File pySim/transport/serial.py: https://gerrit.osmocom.org/c/pysim/+/23029/2/pySim/transport/serial.py at 38 PS2, Line 38: if (os.path.exists(device) == False): Coding style: if not os.path.exists(device): ... https://gerrit.osmocom.org/c/pysim/+/23029/2/pySim/transport/serial.py at 39 PS2, Line 39: Coding style: this space is not needed here. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 22 Feb 2021 18:38:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Feb 22 18:51:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 22 Feb 2021 18:51:43 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Patch Set 2: (3 comments) Is there a reason to keep the old allocation function commented out? https://gerrit.osmocom.org/c/osmo-pcu/+/23031/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/23031/2//COMMIT_MSG at 22 PS2, Line 22: because due to 'because' looks wrong here, but not critical https://gerrit.osmocom.org/c/osmo-pcu/+/23031/2/src/gprs_rlcmac_ts_alloc.cpp File src/gprs_rlcmac_ts_alloc.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23031/2/src/gprs_rlcmac_ts_alloc.cpp at 752 PS2, Line 752: /*static int allocate_usf(const gprs_rlcmac_trx *trx, int8_t first_common_ts, uint8_t selected_ul_slots, uint8_t dl_slots, Please use #if 0 ... #endif, this is the usual approach for commenting out large blocks. https://gerrit.osmocom.org/c/osmo-pcu/+/23031/2/src/gprs_rlcmac_ts_alloc.cpp at 772 PS2, Line 772: //We will stick to that single UL slot, unreserve the others ... so you will not need to do such unrelated changes. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 22 Feb 2021 18:51:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 23 02:50:47 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 02:50:47 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60346d95d710d_693c2b29e66f85fc44023b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 295s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 295s] [COMPILING libboard/qmod/source/card_pres.c] [ 296s] [COMPILING libboard/qmod/source/wwan_led.c] [ 296s] [COMPILING libboard/qmod/source/i2c.c] [ 296s] [COMPILING libboard/qmod/source/board_qmod.c] [ 297s] [COMPILING apps/dfu/main.c] [ 297s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 297s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 297s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 298s] Memory region Used Size Region Size %age Used [ 298s] rom: 16588 B 16 KB 101.25% [ 298s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 298s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 298s] collect2: error: ld returned 1 exit status [ 298s] % [ 298s] make[2]: *** [Makefile:234: flash] Error 1 [ 298s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 298s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 298s] dh_auto_build: error: make -j1 returned exit code 2 [ 298s] make: *** [debian/rules:16: build] Error 25 [ 298s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 298s] ### VM INTERACTION START ### [ 301s] [ 266.749377] sysrq: Power Off [ 301s] [ 266.791191] reboot: Power down [ 301s] ### VM INTERACTION END ### [ 301s] [ 301s] lamb01 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 23 02:50:39 UTC 2021. [ 301s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 02:55:04 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 02:55:04 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60346ea48cfd7_693c2b29e66f85fc4425f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 114s] [COMPILING apps/dfu/main.c] [ 114s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 114s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 114s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 114s] Memory region Used Size Region Size %age Used [ 114s] rom: 16580 B 16 KB 101.20% [ 114s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 114s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 114s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 114s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 114s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 114s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 114s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 114s] collect2: error: ld returned 1 exit status [ 114s] % [ 114s] make[2]: *** [Makefile:234: flash] Error 1 [ 114s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 114s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 114s] dh_auto_build: error: make -j1 returned exit code 2 [ 114s] make: *** [debian/rules:16: build] Error 25 [ 114s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 114s] ### VM INTERACTION START ### [ 117s] [ 107.215258] sysrq: Power Off [ 117s] [ 107.219943] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] sheep88 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 23 02:54:48 UTC 2021. [ 117s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 23 09:37:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 09:37:10 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 to look at the new patch set (#3). Change subject: Support uplink multi-slot allocations ...................................................................... Support uplink multi-slot allocations Before this patch, allocate_usf() was implemented to only allocate 1 USF per TBF, regardless of the available ul_slot mask. As a result, only 1 slot at max was allocated to any TBF. That's a pity because usual multislot classes like 12 support up to 2 UL slots per TBF (in common TS with DL). This patch reworks allocate_usf() to allocate as many UL multislots as possible (given mslot class, current USF availability, TFI availability, related DL TBF slots for the same MS, etc.). As a result, it can be seen that AllocTest results change substantially and maximum concurrent TBF allocation drops under some conditions. That happens due to more USFs being reserved (because each TBF has now more UL slots reserved). Hence now USF exhaustion becomes the usual limitation factor as per the number of concurrent TBFs than can be handled per TRX (as opposed to TFIs previously). Some of the biggest limitations in test appear though because really high end multislot classes are used, which can consume high volumes of UL slots (USFs), and which are probably not the most extended devices in the field. Moreover, in general the curren timeslot allocator for a given multislot class will in general try to optimize the DL side gathering most of the possible timeslots there. That means, for instance on ms class 12 (4 Tx, 4Rx, 5 Sum), 4 DL slots and 1 UL slot will still be selected. But in the case where only 3 PDCHs are available, then with this new multi-slot UL support a TBF will reserve 3 DL slots and 2 UL slots, while before this patch it would only taken 1 UL slot instead of 2. This USF exhaustion situation can be improved in the future by parametrizing (VTY command?) the maximum amount of UL slots that a TBF can reserve, making for instance a default value of 2, meaning usual classes can gather up 2 UL timelosts at a time while forbidding high-end hungry classes to gather up to 8 UL timeslots. Another approach would be to dynamically limit the amount of allowed reservable UL timeslots based on current USF reservation load. Related: OS#2282 Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 --- M src/gprs_rlcmac_ts_alloc.cpp M tests/alloc/AllocTest.cpp M tests/alloc/AllocTest.err M tests/alloc/AllocTest.ok 4 files changed, 7,608 insertions(+), 8,742 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/23031/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 09:37:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 09:37:28 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 to look at the new patch set (#4). Change subject: Support uplink multi-slot allocations ...................................................................... Support uplink multi-slot allocations Before this patch, allocate_usf() was implemented to only allocate 1 USF per TBF, regardless of the available ul_slot mask. As a result, only 1 slot at max was allocated to any TBF. That's a pity because usual multislot classes like 12 support up to 2 UL slots per TBF (in common TS with DL). This patch reworks allocate_usf() to allocate as many UL multislots as possible (given mslot class, current USF availability, TFI availability, related DL TBF slots for the same MS, etc.). As a result, it can be seen that AllocTest results change substantially and maximum concurrent TBF allocation drops under some conditions. That happens due to more USFs being reserved (because each TBF has now more UL slots reserved). Hence now USF exhaustion becomes the usual limitation factor as per the number of concurrent TBFs than can be handled per TRX (as opposed to TFIs previously). Some of the biggest limitations in test appear though because really high end multislot classes are used, which can consume high volumes of UL slots (USFs), and which are probably not the most extended devices in the field. Moreover, in general the curren timeslot allocator for a given multislot class will in general try to optimize the DL side gathering most of the possible timeslots there. That means, for instance on ms class 12 (4 Tx, 4Rx, 5 Sum), 4 DL slots and 1 UL slot will still be selected. But in the case where only 3 PDCHs are available, then with this new multi-slot UL support a TBF will reserve 3 DL slots and 2 UL slots, while before this patch it would only taken 1 UL slot instead of 2. This USF exhaustion situation can be improved in the future by parametrizing (VTY command?) the maximum amount of UL slots that a TBF can reserve, making for instance a default value of 2, meaning usual classes can gather up 2 UL timelosts at a time while forbidding high-end hungry classes to gather up to 8 UL timeslots. Another approach would be to dynamically limit the amount of allowed reservable UL timeslots based on current USF reservation load. Related: OS#2282 Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 --- M src/gprs_rlcmac_ts_alloc.cpp M tests/alloc/AllocTest.cpp M tests/alloc/AllocTest.err M tests/alloc/AllocTest.ok 4 files changed, 7,595 insertions(+), 8,759 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/23031/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 09:42:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 09:42:20 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Patch Set 4: > Is there a reason to keep the old allocation function commented out? Sorry I forgot to remove it. It's gone now in new version of the patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 23 Feb 2021 09:42:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 11:34:06 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Feb 2021 11:34:06 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 to look at the new patch set (#5). Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... l1sap: Store status of SRR in an lchan struct memeber The MS sets the SRR bit in the L1 SACCH header to request DL-SACCH repetition from the BTS. At the moment we access the l1_info stored in tle lchan struct each time we want to check the status of the SRR bit. However, it is more convinient to do this once at reception and store the status of the status of the flag in a separate struct member. Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Related: SYS#5114 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/28/22928/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 11:34:06 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 23 Feb 2021 11:34:06 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 to look at the new patch set (#6). Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... l1sap: add logging and VTY introspection for ACCH repetition At the moment osmo-bts is not looging much ACCH repetition related information. This makes testing ACCH repetition difficult. Lets add some debug output that informs the user when ACCH repetition is turned on or off. Lets also add an ACCH repetition status display to the show lchan VTY command. Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Related: SYS#5114 --- M src/common/l1sap.c M src/common/vty.c 2 files changed, 90 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/22888/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 11:43:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 11:43:48 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E534-fcbf-dirty_=E2=86=92_1=2E5=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23032 ) Change subject: Bump version: 1.4.0.534-fcbf-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.534-fcbf-dirty ? 1.5.0 Change-Id: I25611e9fb334e880c36f1c7c180d5a1d00298835 --- M TODO-RELEASE M contrib/libosmocore.spec.in M debian/changelog M debian/control R debian/libosmocore17.install R debian/libosmogsm16.install R debian/libosmovty9.install M src/Makefile.am M src/ctrl/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 12 files changed, 591 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/23032/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index e1b1507..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,10 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmogsm new API gsm0808_create_sapi_reject_cause() with cause argument -libosmogsm ABI change struct osmo_gprs_cell_options size changed (new field at the end) -libosmogsm API change struct ipac_preproc_ave_cfg: new zero-sized flexible array member at end -libosmovty ABI change struct cmd_element: add a field for program specific attributes -libosmovty ABI change struct vty_app_info: optional program specific attributes description -libosmoctrl ABI change struct ctrl_handle changed size (new field "reply_cb" at the end) -libosmogsm new API osmo_rai_cmp(), osmo_cgi_ps_cmp() diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 93e5e16..68b7ca1 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -111,13 +111,13 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmocoding. -%package -n libosmocore16 +%package -n libosmocore17 Summary: Osmocom core library # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: System/Libraries -%description -n libosmocore16 +%description -n libosmocore17 libosmocore is a library with various utility functions shared between OpenBSC and OsmocomBB. @@ -126,7 +126,7 @@ # crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmocore16 = %version +Requires: libosmocore17 = %version Requires: libtalloc-devel %description -n libosmocore-devel @@ -188,12 +188,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmogb. -%package -n libosmogsm15 +%package -n libosmogsm16 Summary: Osmocom GSM utility library License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogsm15 +%description -n libosmogsm16 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -208,7 +208,7 @@ License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogsm15 = %version +Requires: libosmogsm16 = %version %description -n libosmogsm-devel The libosmogsm library in particular is a collection of common code @@ -246,12 +246,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmosim. -%package -n libosmovty4 +%package -n libosmovty9 Summary: Osmocom VTY interface library License: GPL-2.0-or-later Group: System/Libraries -%description -n libosmovty4 +%description -n libosmovty9 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -263,7 +263,7 @@ License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmovty4 = %version +Requires: libosmovty9 = %version %description -n libosmovty-devel The libosmovty library implements the interactive command-line on the @@ -322,18 +322,18 @@ %postun -n libosmocodec0 -p /sbin/ldconfig %post -n libosmocoding0 -p /sbin/ldconfig %postun -n libosmocoding0 -p /sbin/ldconfig -%post -n libosmocore16 -p /sbin/ldconfig -%postun -n libosmocore16 -p /sbin/ldconfig +%post -n libosmocore17 -p /sbin/ldconfig +%postun -n libosmocore17 -p /sbin/ldconfig %post -n libosmoctrl0 -p /sbin/ldconfig %postun -n libosmoctrl0 -p /sbin/ldconfig %post -n libosmogb11 -p /sbin/ldconfig %postun -n libosmogb11 -p /sbin/ldconfig -%post -n libosmogsm15 -p /sbin/ldconfig -%postun -n libosmogsm15 -p /sbin/ldconfig +%post -n libosmogsm16 -p /sbin/ldconfig +%postun -n libosmogsm16 -p /sbin/ldconfig %post -n libosmosim2 -p /sbin/ldconfig %postun -n libosmosim2 -p /sbin/ldconfig -%post -n libosmovty4 -p /sbin/ldconfig -%postun -n libosmovty4 -p /sbin/ldconfig +%post -n libosmovty9 -p /sbin/ldconfig +%postun -n libosmovty9 -p /sbin/ldconfig %post -n libosmousb0 -p /sbin/ldconfig %postun -n libosmousb0 -p /sbin/ldconfig @@ -365,7 +365,7 @@ %_libdir/libosmocoding.so %_libdir/pkgconfig/libosmocoding.pc -%files -n libosmocore16 +%files -n libosmocore17 %defattr(-,root,root) %_libdir/libosmocore.so.16* @@ -403,7 +403,7 @@ %_libdir/libosmogb.so %_libdir/pkgconfig/libosmogb.pc -%files -n libosmogsm15 +%files -n libosmogsm16 %defattr(-,root,root) %_libdir/libosmogsm.so.15* @@ -428,7 +428,7 @@ %_libdir/libosmosim.so %_libdir/pkgconfig/libosmosim.pc -%files -n libosmovty4 +%files -n libosmovty9 %defattr(-,root,root) %_libdir/libosmovty.so.4* diff --git a/debian/changelog b/debian/changelog index 317fefe..df9689c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,561 @@ +libosmocore (1.5.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty/command: cosmetic: simplify conditions in in config_list_cmd + * vty/command: cosmetic: fix formatting of config_help_cmd + * vty/command: cosmetic: drop redundant line break + * vty/command: fix switch / case coding style in vty_go_parent() + * vty/command: cosmetic: swap i and j in vty_dump_element() + * gsm0808: add gsm0808_create_sapi_reject_cause() + * macaddr: fix osmo_get_macaddr(): return -1 if no device is found + * macaddr: fix osmo_macaddr_parse(): return meaningful error codes + * lapdm_pad_msgb(): cosmetic: use GSM_MACBLOCK_PADDING + * lapd_test: fix wrong comment in lapdm_establish() + * lapd_test: rename func=UA (RR) CM Service Request: s/ua/ua_cm/ + * lapd_test: fix: print all messages to stdout, not stderr + * lapd_test: add a test checking SAPI0/SAPI3 prioritization + * lapdm: fix SAPI-0/SAPI-3 frame prioritization on DCCH + * logging: refactor and simplify log_target_destroy() + * logging: fix log_target_destroy(): properly close syslog + * logging: fix memleak in log_target_create_file() + * vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() + * gsm0808: fix: do not encode invalid encryption algorithm + * vty: add program specific attributes to VTY commands + * vty: print program specific attributes in the XML reference + * vty: cosmetic: drop redundant 'break' statements + * vty: cosmetic: s/width/cmd_width/g in vty_describe_command() + * vty: cosmetic: fix missing curly braces in vty_describe_command() + * vty/command: introduce new attribute CMD_ATTR_IMMEDIATE + * vty/command: reflect global attributes in the XML reference + * tests: do not ignore stderr of vty_test, also match it + * vty: check for duplicate flags in application specific attributes + * vty: check for reserved flags in application specific attributes + * vty/command: add global command attribute CMD_ATTR_NODE_EXIT + * vty/command: add CMD_ATTR_LIB_COMMAND and install() API wrappers + * vty: use install_lib_element() and install_lib_element_ve() + * vty/command: introduce API for the library specific attributes + * vty: introduce and use VTY_CMD_USR_ATTR_NUM + * vty/command: introduce a command to list attributes + * vty/command: print attribute flags in the output of 'list' + * tests/vty: verify 'show vty-attributes' / 'list' commands + * vty/command: assign flags to CMD_ATTR_{IMMEDIATE,NODE_EXIT} + * vty/command: restrict the use of '.', '!', and '@' as flags + * vty: fix vty_dump_element(): do not print empty + * socket: make the arguments of osmo_sockaddr_cmp() const + * gprs_ns2: make struct osmo_sockaddr pointers const + * rsl: rsl_chan_nr_str_buf(): use ABIS_RSL_CHAN_NR_CBITS_* macros + * logging: introduce 'systemd-journal' target + * vty: introduce the expert mode and a command to enable it + * vty/command: make some 'struct cmd_element' pointers const + * vty/command: introduce vty_dump_xml_ref_mode() + * vty/command: add CMD_ATTR_HIDDEN to CMD_ATTR_PUBLIC_MASK + * application: do not document unrelated forward-declarations + * vty/command: fix: restrict the expert mode to the current session + * fix spelling in 'value_string' arrays: existAnt -> existEnt + * gsm48: add missing RR cause value definitions + * vty/command: add 'hidden only' VTY reference generation mode + * bts_features: add missing description for BTS_FEAT_ACCH_REP + * core/linuxlist: do not use 'new' as a parameter name + * protocol/gsm_08_58.h: add ip.access Power Control structures + * protocol/gsm_08_58.h: add Osmocom specific EWMA AVG algo + * logging: revert color of LGLOBAL category back to white + * gsm_08_58: fix wrong field order in 'struct ipac_preproc_pc_thresh' + * gsm_08_58: add flexible array member to 'struct ipac_preproc_ave_cfg' + * gsmtap_util: SNR can be negative, use a signed integer + * gprs_ns2_sns: always check rc of osmo_sockaddr_str_from_sockaddr() + * gprs_ns2_fr: fix resource leaks due to early return in set_ifupdown() + * gprs_bssgp: fix uninitialized struct fields in bssgp_create_rim_ri() + * bts_features: s/Repeation/Repetition/ in osmo_bts_features_descs[] + * gprs_bssgp: abuse gsm48_encode_ra() to encode TAC + * fixup: configure.ac: fix: do not define HAVE_NEON unconditionally + * gsm_7bit_encode_n(): test encoding of more than 250 septets + * gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() + * gsm0808: use msgb_tv16_put() and osmo_store32be() + * bssgp_bvc_fsm: check return value of osmo_fsm_register() + * tlv: add msgb_tv32_put(), similar to msgb_tv16_put() + * tlv: clarify documentation for msgb_tv{16,32}_put() + + [ Eric ] + * vty cpu sched: do not assert if sched impossible + * pkgconfig: link to mnl if available + + [ Pau Espin Pedrol ] + * vty: Fix cpu-sched VTY node name + * sock: osmo_sock_init2_multiaddr: decouple addr resolution from socket creation + * socket: multiaddr: Support IPv4 + IPv6 addresses in SCTP associations + * socket: Log proper getaddrinfo() error + * osmo_sock_get_ip_and_port(): Support IPv6 sockets + * l1sap.h: Fix typo in doxygen documentation + * osmo_sock_inti2_multiaddr: Fix memleak and free uninitialized mem + * socker: Remove AI_ADDRCONFIG from getaddrinfo flags + * tests: Split SCTP tests to its own file and run them conditionally + * ipa: Fix wrong output log formatting + * socket: Allow binding to :: (IPv6) and connecting to IPv4-only on the remote + * socket: Add support for AF_INET6 in osmo_sockaddr_to_str_and_uint() + * socket: Use AF_UNSPEC instead of PF_UNSPEC calling getaddrinfo + * socket: Fix stack-buffer-overflow in osmo_sock_local_ip() + * socket: fix wrong ipv6 dst buf size passed in osmo_sock_local_ip + * socket: Add some osmo_sockaddr print helpers + * tests: Add test to showcase osmo_sock_init2 bug with AF_UNSPEC + * socket: Fix bug in osmo_sock_init2(AF_UNSPEC) matching IP versions + * logging: Avoid printing OSMO_LOGCOLOR_END if no color was used + * osmo_strlcpy: Avoid calling memcpy with size=0 + * osmo_strlcpy: Clarify length calculation + * cosmetic: Fix typo in API doc + * gprs_ns2_udp: Avoid dangling freed struct in list if binding fails + * vty: Fix left shifting out of range on signed variable + * cosmetic: vty: Fix trailing whitespace + * gsm: Fix make distcheck with parallel make + * contrib: jenkins: Enable parallel make in make distcheck + * lapdm: Drop log lines printing fmt=B + * lapdm: Split lapd_rx_u() spaghetti into one function per message type + * lapdm: Allow SABM L=0 in Timer Recovery State + * gb: ns2_sns: Fix missing trailing newline char in log line + * gb: ns2_sns: Add missing value_string entry for GPRS_SNS_EV_NO_NSVC + * vty: Mark cpu_sched_vty commands with attr immediate + * tdef: Introduce OSMO_TDEF_US unit + * tests: Fix tdef_test on 32bit platforms + * bitvec: Fix left shifting out of range on signed variable + * cosmetic: serial: Fix typo in comment + * serial: Fix typo in debug log line + * serial: Log error if tcgetattr() or tcsetattr() fail + * serial: Introduce API osmo_serial_speed_t + * Revert "tests: Fix tdef_test on 32bit platforms" + * tests: Fix tdef_test on 32bit platforms + * statsd report: Fix wrong fmt specificier generating wrong stats + * gsm: Add enum for Network Feature Support IE + * Include mnl.h iif --enable-libmnl + * gb: Import mnl.h iif --enable-libmnl + * bssgp: Remove newly added log line warning about NOOP + * rest_octets: add Serving Cell Priority Parameters + * gsm: si13: Fix encode of EGPRS_PACKET_CHANNEL_REQUEST + * si2quater: fix budget calculation for multiple EARFCNs + * gsm: append_eutran_neib_cell: Fix SI2quater EARFCN list + * GPRS Cell Options (SI13): Add REL-4 CCN_ACTIVE bit + * Revert "rest_octets: fix encoding of 3G Early Classmark Sending Restriction" + * rest_octets: Fix decoding of SI3 3G Early Classmark Sending Restriction + * gitignore: Ignore *~ + * ctrl: Allow handling CTRL get/set replies in user defined code + * Intoduce Packet Switch CGI + * ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH + * gsm: Add missing osmo_*_cmp symbols to libosmogsm.map + * gsm: Introduce osmo_{rai,cgi_ps}_cmp() APIs + * gprs_bssgp_prim.h: Add missing includes + * Revert "gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty" + * ctrl_connection: Initialize write_queue.bfd.fd to -1 during allocation + * cosmetic: fix typo in comment + * gsm: Fix wrong length in SI13 GPRS Cell Options IE + * gsm: bts_features: Introduce BTS_FEAT_CCN + * Fix struct bitfields on big endian systems + * cosmetic: Move comment one line below in append_gprs_cell_opt + * gsm: Fix bitfield order in dtap_header + * comsetic: gsm0808_test: Fix trailing whitespace + * gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() + * gsm0808_utils: Move static function further up in file + * gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types + * logging: gsmtap: Fill PID field for each message + * Introduce osmo_gettid() API + * logging: gsmtap: Fix fill PID field not stored in network byte order + * logging: gsmtap: Store TID instead of PID in pkt hdr + * gsm: Introduce API osmo_gsm48_rest_octets_si13_decode + * logging: Allow prefixing thread ID to each log line + * tests: Set print_category values explicitly + * Drop use of log_set_print_filename() API inside libosmocore + * logging: Deprecate API log_set_print_filename + + [ Harald Welte ] + * gsmtap: Add definitions for E1/T1 payload (LAPD, TRAU, FR) in GSMTAP + * Add VTY + CTRL ports for upcoming OsmoSMLC + * gprs_ns2_sns: Fix compilation on Debian 8 + * ipaccess.h: Add more enum values and 'official' names + * ns2: Improve/extend doxygen comments for new ns2 implementation + * ns2: Use NULL and not '0' when returning a NULL-Pointer + * gprs_ns2: Mark gprs_ns2_validate_* as static + * write_queue: Add osmo_wqueue_enqueue_quiet() + * write_queue: use msgb_{en,de}queue_count() + * write_queue: Re-enqueue msgb if write_cb returns -EAGAIN + * logging_vty: set osmo_stderr_target to NULL on "no log stderr" + * logging: Introduce MAX_LOG_SIZE for the magic number 4096 + * bssgp: Don't include RA-ID in BVC-RESET for BVCI=0 (signalling) + * bssmap_le/bsslap tests: We must use %td for ptrdiff_t printing + * osmo_float_str_to_int: When using strtoll(), use LLONG_{MAX,MIN} + * gprs_ns2: Fix parsing of SNS-{ADD,DEL,CHANGE_WEIGHT} + * gsm48_rest_octets: Add parser for SI4 rest octets + * [cosmetic] rest_octets: Follow coding style regarding {} + * ns2: More verbose comments on gprs_ns2_vc_mode + * select: Introduce osmo_fd_{read,write}_{enable,disable}() + * select: Migrate over to poll() + * card_fs_usim.c: Add support for DF.5GS directory + * Revert "gsm_04_08: add parser for Mobile Station Classmark 3" + * card_fs_usim: Add definitions of DF.ProSe and DF.ACDC + * bssgp: Input argument to bssgp_tlv_parse() should be 'const' + * ns2: permit multiple nsvci in one nse in VTY + * frame_relay: Fix some spelling/language issues + * Revert "ns2: permit multiple nsvci in one nse in VTY" + * gprs_ns2_vty: Fix VTY documentation errors + * frame_relay: Fix null pointer dereference in DLC/PVC delete + * frame_relay: Fix error path on ioctl() failure + * gprs_ns2: Introduce gprs_ns2_lltype_str() for link layer name + * gprs_ns2_fr: Print Frame Relay 'role' in VTY + * gprs-ns2: Fix stringification of NS/FR NSVCI + * gprs_ns2: Don't return an empty string in case of unknown LL + * cosmetic: frame_relay: Fix typos + * gprs_ns2: Print link layer and global ALIVE/DEAD state + * gprs_ns2_vty: Differentiate 'show ns binds' and 'show ns entities' + * gprs_ns2_vty: Show NSVCI in dump_nsvc() + * gprs_ns_vty: Unify display of NSVCI on VTY in 'show ns entities' + * gprs_ns2_vty: Print all relevant data on each NS-VC + * gprs_ns2_udp.c: Fix typo - it's a DSCP and not a DCSP + * Integrate libmnl (minimal netlink) library with libosmocore select loop + * gprs_ns2_fr: Monitor the kernel net-device link state + * gsm_08_18.h: Update enums for message types and IEs with Release 15 + * gprs_ns2_vty: Re-introduce a 'show ns' command + * libosmogb: Add missing LIBMNL_CFLAGS + * mnl: Use mnl_socket_open() insatead of mnl_socket_open2() + * gprs_ns2_fr: remove include + * bssgp: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * gprs_ns2: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * bssgp: Update bssgp_pdu_strings with Release 15 + * bssgp: Fix typo in BSSGP Message Type enum + * Add hlist and hashtable from Linux kernel + * Use explicit type-casting in hlist_del() for C++ compatibility + * gsm_08_18.h: Add some PDU definitions still missing + * hash/log2: Add generic implementations of fls() and fls64() + * log2.h: Use uintXX_t instead of kernel specific types + * log2.h: Avoid redefining __always_inline + * ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state + * Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols + * tlv: Introduce enum with error codes for TLV parser functions + * bssgp: Add osmo_tlv_prot_def for BSSGP + * gsm_08_18.h: Add #defines for [extended] feature bits + * tlv.h: Add msgb_tvlv_put_{16,32}be() + * logging: Introduce DLBSSGP logging constant + * gb: Add beginnings of a new BSSGP implementation + * logging: Assing different 8bit colors to built-in subsystems + * bssgp2: Encoding + Decoding functions for BVC and MS flow control + * bssgp_bvc_fsm: Add basic BVC flow control rx/tx support + * gprs_ns2_fr.c: Skip extraneous FIONBIO + * gprs_ns2_fr: guard against race between socket(AF_PACKET) and bind() + * gprs_ns2_fr: use ETH_P_HDLC instead of ETH_P_ALL + * Fix VTY syntax for newly-introduced NS2 timers + * gors_ns2_vty: Fix saving of new NS2 timers + * gprs_ns2_fr: Avoid stringop-truncation warning + * gprs_ns2_fr: Use OSMO_STRLCPY_ARRAY() where possible + * fsm: Add osmo_fsm_inst_broadcast_children() + * vty: Fix left shifting out of range on signed variable + * lapd_core: Don't dereference data link after sending PRIM_DL_REL + * cbsp: Fix encoding of "ETWS Warning Security Info" IE + * cbsp: Fix osmo_cbsp_recv_buffered() for KEEP-ALIVE-COMPLETE + * cbsp: Fix parsing DCS in decode of WRITE-REPLACE + * Add inter-thread queue + * tlv_parser: Fix various out-of-bounds accesses + * gprs_ns2_fr: reduce duplication between gprs_ns2_fr_connect / connect2 + * gprs_ns2: Give NS-VC FSMs a proper name/identifier + * ns2: delay NS_AFF_CAUSE_RECOVERY until NS-VC for data + sig are unblocked + * vty/fsm_vty: Add vty_out_fsm2() + vty_out_fsm_inst2() with prefix + * ns2: Properly indent VTY output + * ns2: Unify logging context via log macros + * logging_vty: Fix saving of "logging print file .. last" + * gprs_ns2_test: Fix compilation on Debian 8 + * Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE" + * Revert "gprs_ns2_vc_fsm: check NSEI match the NSE" + * ns2: Use proper return value from write_queue callback function + * ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS + * osmo-ns-dummy: Add simple NS traffic generator + * ns2: Work around AF_PACKET socket ENOBUFS problems + * ns2: Use named array initializers to avoid mistakes + * ns2: encapsulate calls to nsvc->bind->send_vc() + * ns2: Increment Rx and Tx byte / packet counters + * ns2: Properly report packet drops in FR code + * ns2: count number of dropped packets / bytes on transmit + * ns2: Implement more rate counters + * ns2: Add a rate_ctr for each NS-UNBLOCK + * ns2: Move to one common/shared ns2_bind_alloc() + * ns2: Memory allocation failures are ENOMEM, not ENOSPC + * ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx + * ns2: Introduce a per-bind stat_item group with backlog length + * ns2: Fix typos in comments + * ns2: Print NS-STATUS.ind primitives to the log + * ns2: cosmetic: fix indent levels + * frame_relay: Send "Fuil Status" ENQUIRY after link recovers + * frame_relay: Add status call-backs for link + DLC status changes + * frame_relay: Discard received messages for DLC not yet active + * frame_relay: cosmetic: Unify log syntax when discarding Rx packets + * ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED + * ns2: Stop test procedure when going into unconfigured state + * ns2: Don't start sending NS-RESET until FR DLC is available + * osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets + * initial support for static userspace probes via systemtap + * Enable systemd-journald log target in debian + rpm packaging + * gb: frame_relay: Factor-out function to set link as dead + * gb: frame_relay: Detect link outage on "last receive seq nr == 0" + * frame_relay; Fix Q.933 async STATUS at DLC creation + * ns2: Name NSVC FSM events consistently + * ns2: Don't queue Q.933 LMI messages; only store most recent ones + * ns2: improve backlog handling on interface up/down + * ns2: Don't try to add packets to the backlog on real errors + * README.md: Use https everywhere + * ns2_fr: Fix null pointer deref in error path + * ns2_fr: Fix heap-use-after-free in error recovery path + * BVC FSM: Treat overlapping BVC-RESET as implicit ACK + * support for stats static userspace probes via systemtap + * CBSP: fix encoding/decoding of keep-alive repetition period + * CBSP: Fix encoding of warning period + + [ Neels Hofmeyr ] + * comment: mention spec reference in cbsp.[ch] + * comment: typo in cbsp.h + * bitXXgen: ensure not reading/storing past valid size + * bitXXgen: add bitgen_test.c + * bitXXgen: add osmo_loadXXbe_ext_2() to get right-adjusted values + * add osmo_use_count_to_str_c() + * osmo_use_count_to_str: make robust against unused use_count + * add osmo_float_str_to_int() and osmo_int_to_float_str_*() + * add GAD coding for Location Services + * add BSSLAP coding for Location Services + * add BSSMAP-LE coding for Location Services + * add BSSMAP coding for Location Services + * doc tweaks for osmo_float_str_to_int(), osmo_int_to_float_str*() + * gad.c: try to workaround warning for "h.type >= 0" + * gad.c: fix rc for osmo_gad_enc_ell_point_unc_circle() + * gprs_ns2_fr.c: compiler error: replace strncpy() with OSMO_STRLCPY_ARRAY() + * fix strncpy bug in gprs_ns2_fr_bind() + + [ Alexander Couzens ] + * sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port + * tests/socket: add testcase test_get_ip_and_port + * socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd + * socket: add osmo_sockaddr_cmp() + * gb/gprs_bssgp: remove superfluous whitespace + * gb/common_vty: use void * + * add osmo_sockaddr_local_ip() to determine the local address for a remote. + * Gb: add a second NS implementation + * libgb/ns: allow to create NS_ALIVE NSVC + * gb/gprs_bssgb: check if talloc failed on btsctx->fc + * gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc + * ns2: remove bssgp specific msgb->cb parts + * ns2: vty: add missing docs for IPv6 address + * ns2: check the specific bit of NS SDU Control bits + * ns2: refactor nsvc_by_ functions + * ns2: ns2_recv_vc: remove unused parameter nsi + * ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found + * ns2: refactor handle_nsip_read/handle_nsfrgre_read + * ns2: fix a msg leak when receiving REJECTED messages + * gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG + * ns2: parse the return code of gprs_ns2_ip_bind + * ns2: refactor ns2_prim_status_ind() + * ns2: status ind: add additional flags (first and persistent) + * ns2: vty: show all nse + * ns2: vty: allow the users (pcu/sgsn) to set a default bind + * ns2: vty: on `show ns` add information of NS binds + * gprs_ns2_vty_create: remove bind pointer check + * gprs_ns2: gprs_ns2_free(): add missing talloc_free + * gprs_ns2: fix SNS_ADD for IPv4 + * gprs_ns2: fix empty prefix in TLV Parse error + * gprs_ns2: add gprs_ns2_ip_bind_by_sockaddr() to search for binds by sockaddr + * gprs_ns2: gprs_ns2_ip_bind() check if the bind already exists + * gprs_ns2: add gprs_ns2_nse_nsei() to get the nsei of a nse + * gprs_ns2: add gprs_ns2_free_binds() to free all binds + * gprs_ns2: add gprs_ns2_free_nses() to free all NS-E + * gprs_ns2: const the return value of gprs_ns2_ip_vc_sockaddr / gprs_ns2_ip_bind_sockaddr + * gprs_ns2: rename gprs_ns2_ip_vc_sockaddr -> gprs_ns2_ip_vc_remote + * gprs_ns2: add gprs_ns2_ip_vc_local() return the local sockaddr + * gprs_ns2: add gprs_ns2_nse_sns_remote() returns the initial SNS address + * gprs_ns2: gprs_ns2_ip_vc_remote() the nsvc can be also const + * gprs_ns2: add gprs_ns2_nse_foreach_nsvc() + * gprs_ns2: Partial revert 48f63867 allow to create NS_ALIVE NSVC + * gprs_ns2: add gprs_ns2_ip_vc_equal() + * add osmo_sockaddr_to_str_buf/osmo_sockaddr_to_str + * gprs_ns2: remove the nsvc fsm timer when cleaning up the fsm + * ns2: add value strings for ns2_affecting_cause_prim_str & ns2_prim_str + * gprs_ns2: convert gprs_ns2_cause_str into an static inline + * libosmocore: change the memory management of NS2 + * ns2: fixup gprs_ns2_prim_strs + * ns2: check if ns_vc_alloc() fails in bind_connect() + * ns2: add support for frame relay + * ns2: implement link sharing selector + * ns2: move LL into public api + * ns2: move link layer type into NSE + * ns2: remove obsolete type GPRS_NS2_LL_E1 + * gprs_ns2_fr: remove include + * gprs_ns2: fix typo in comment + * gprs_ns2: use switch() case instead of multiple if in ns2_create_vc() + * gprs_ns2_sns: add missing transistion UNCONFIGURED -> SIZE + * gprs_ns2_sns: dynamic calculate the maximum NS-VCs + * gprs_ns2_sns: add missing S() to allow GPRS_SNS_EV_NO_NSVC happen + * gprs_ns2_sns: fix whitespaces and superflous comment + * gprs_ns2_sns: correct dynamic calculation + * gprs_ns2: introduce NS dialects + * gprs_ns2: move allocation of the SNS fsm into create_nse + * gprs_ns2: add member name to bind + * gprs_ns2: rework gprs_ns2_fr_connect*() + * gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE + * gprs_ns2_sns: rework IP-SNS initial remote + * gprs_ns2_sns: use different binds for the initial connection + * gprs_ns2_sns: introduce SNS Size/Config retries + * gprs_ns2: make nsvc argument const + * gprs_ns2: add gprs_ns2_fr_bind_role() to retrieve the fr role + * gprs_ns2: on ns2_create_vc parse the tlv before using it + * gprs_ns2_vty: udp: fixup dialect changes + * gprs_ns2: fr: fix crash when frame relay interface doesn't exists + * gprs_ns2: improve handling of TLV errors on new nsvcs + * gprs_ns2: don't pass the return code of reject_status_msg + * gprs_ns2: fr: implement a write queue + * gprs_ns2: fr: setup the device to correct FR/LMI settings + * gprs_ns2: add new vty2 + * gprs_ns2: sns: correct log message when no nsvcs available + * gprs_ns2: sns: don't send duplicated packets on retries + * gprs_ns2: sns: add log message when size/config retries exhausted + * gprs_ns2: don't start unconfigured fsm via FORCE_UNCONFIGURED + * gprs_ns2: fix force-unconfigured for IP-SNS NSE + * frame_relay: prevent null pointer exception when talloc fails + * frame_relay: link_alloc: move log message to the end + * gprs_ns2: rework frame relay load distribution function + * gprs_ns2_fr: setup_device: allow to setup a new dahdi device + * gprs_ns2: fr: check the device state before changing state + * gprs_ns2: use zero initialized memory for vty_binds + * utils: add osmo-ns-dummy + * gprs_ns2: call python vty tests + * gprs_ns2: set transfer cap in NS Status primitive + * gprs_ns2: check if persistent nsei or nsvc exists when creating dynamic NSE + * osmo-ns-dummy: allow to create dynamic NSEs + * gprs_ns2_vc: answer UNBLOCK on unblocked nsvc + * gprs_ns2: when calling nsvc_force_unconf for a dynamic NSE drop the NSE. + * gprs_ns2_sns: clear local and remote entries when SNS failed + * gprs_ns2: flag then NSE as dead in nse_free() + * gprs_ns2_vc_fsm: fix spaces and remove wrong comment + * test: gprs_ns2: don't leak the talloc context + * test: gprs_ns2: replace free_bind() with clear_pdus() + * test: gprs_ns2: free the nsi after each test + * gprs_ns2: add assert on most bind calls + * gprs_ns2: allow to use free_vc() with NULL + * osmo-ns-dummy: don't leak primitive messages + * gprs_ns2: implement BLOCK/UNBLOCK of a NSVC by vty + * gprs_ns2: correct handle BLOCK message on initator + * gprs_ns2_vc_fsm: rename all event to match RX_ or REQ_ + * gprs_ns2_vc_fsm: ensure all state is resetted via force_unconf + * gprs_ns2_vc_fsm: in RESET accept RESET as ACK + * gprs_ns2_vc_fsm: fix transitions for ALIVE state + * gprs_ns2_message: remove wrong comment + * gprs_ns2_vc_fsm: check NSEI match the NSE + * gprs_ns2_vc_fsm: check NSVCI match the NSE + * tests: gprs_ns2: add unitdata unit test + * gprs_ns2: always pass a tp to gprs_ns2_vc_rx + * gprs_ns2_vc_fsm: check NSEI match the NSE + * gprs_ns2_vc_fsm: check NSVCI match the NSE + * gprs_ns2: drop GPRS_ prefix of gprs_ns2_cs + * gprs_ns2: drop prefix of all internal exposed function + * gprs_ns2: drop the public prefix gprs_ from all static functions/structs/.. + * gprs_ns2: refactor: ensure all enums have GPRS_NS2_ + * gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty + * gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty + * gprs_ns2: remove api call gprs_ns2_dynamic_create_nse + * gprs_ns2: introduce gprs_ns2_vty_init_reduced() for the PCU + * gprs_ns2: correct vty config write + * gprs_ns2: prevent division by zero in load_sharing + * gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. + * gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING + * gprs_ns2: unify the handling of **result when bind already present. + * gprs_ns2_fr: free_bind(): first do the NULL check before using members + * frame_relay: fix NULL pointer deref + * gprs_ns2_frgre: set a correct gre pointer for ipv6 + * gprs_ns2_frgre: check iph/ip6h before passing them to rx functions + * gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state + * gprs_ns2_sns: add timeout to ST_CONFIG_SGSN + * gprs_ns2_sns: reset the N of timeout when entering a new state + * gprs_ns2: rename vty-command ip-sns -> ip-sns-remote + * gprs_ns2_vty: fix memory leak of vty_binds + * gprs_ns2: add signalling & data weights for UDP binds + * gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer + * gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime + * gprs_ns2_vty: use strcmp() instead of strncmp() + * gprs_ns2_vc_fsm: remove debug line of the alive_timer + * gprs_ns2: fix comment of alive NS-VC + * gprs_ns2_sns: fix typo in doxygen comment + * gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE + * gprs_ns2: rework IP-SNS binds + * gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` + * gprs_ns2: implement a simple load sharing for UDP + * gprs_ns2: fix typo in function name ns2_load_sharing_modulo + * gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership + * gprs_ns2_sns: rename fsm events to include RX or REQ prefix + * gprs_ns2_fr: pass MTU changes to the NSE + * gprs_ns2: truncate the NS_STATUS to the MTU + * gprs_ns2_message: tx_status: move all cause dependent code into the switch/case + * gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS + * gprs_ns2: ensure no duplicate UDP NSVC can be created + * gprs_ns2: free_nse: free the SNS fsm early + + [ Daniel Willmann ] + * gsm_08_16.h: Add missing header + * gprs_ns2: Make reason const + * libosmogb: Add a function to tx BVC RESET by nsei/bvci + * Add exported function btsctx_alloc to public header + * ns2: Add gprs_ns2_nsvc_state_name() to get the current state of a VC + * ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication + * ns2: Improve NSVC output + * ns2: Split 'initiater' into initiate_{reset,block} + * ns2: Add a function to set the NSVC FSM back to unconfigured + * ns2: Add a VTY command to reset NSVC FSM + * ns2: Fix docs for some NS2 vty commands + * logging: Calculate LOG_MAX_{CTX,FILTERS} from the enum + * ns2: Add log filtering by NSE/NSEI, fix NSVC filter on receive + * ns2: Fix argv index in logging filter VTY commands + * Declare osmo_ctx_init() in talloc.h + * bssgp: Add SUSPEND_NACK to osmo_pdef_bssgp + * logging: Remove duplicate color for DLSMS + * ns2_frgre: Fix missing break statement for recv from IPV6 + * bssgp_bvc_fsm: Handle block request from application correctly + * NS2: Fix bind selection of SNS NSVCs + * ns2: Add sanity check + * Refactor ns2_nsvc_create_ip* + * ns2: Fix memory leak in IP-SNS + * ns2: Fix assert when removing a bind listen + * ns2: Fix incompatible VTY configs when writing config + * tests/gb: Add more complex osmo-ns-dummy.cfg + * bssgp_bvc_fsm: Set/get maximum BSSGP PDU length + * bssgp2_enc_status: Truncate STATUS message to maximum PDU length + * bssgp_bvc_fsm: Consistent naming + + [ Philipp Maier ] + * command: add library command attribute for libosmo-sccp + * command: add library command attribute for libosmo-abis + * gsm_08_58: add proprietary IE to signal Repeated ACCH Capability + * gsm_04_08: add parser for Mobile Station Classmark 3 + * gsm_04_08: add parser for Mobile Station Classmark 3 + * bts_features: add feature BTS_FEAT_ACCH_REP + * gsm_08_58: add struct for RSL_IE_OSMO_REP_ACCH_CAP + * gsm_08_58: add rxqual field to RSL_IE_OSMO_REP_ACCH_CAP + * gprs_bssgp_util: complete bssgp_pdu_strings + * gprs_bssgp: add IE parser/generator for RIM Routing Information + * gprs_bssgp: add handling for BSSGP RIM primitives + * gsm_08_18: add struct to parse RIM PDU Indications + * bssgp_rim: add encoder/decoder for NACC related RIM containers + * bssgp_rim: move bssgp_parse_rim_ri and bssgp_create_rim_ri to gprs_bssgp_rim + * gprs_bssgp: add utilities to send and parse BSSGP rim PDUs + * gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers + * gprs_bssgp_rim: fix bug in dub_tlvp_header() + * gprs_bssgp_rim: add value strings for enum bssgp_nacc_cause + * gprs_bssgp_rim: add value strings for enum bssgp_ran_inf_app_id + * gprs_bssgp_rim: add value strings for enum bssgp_rim_routing_info_discr + * gprs_bssgp_rim: add functions to convert a RIM-RI to a string + * gprs_bssgp_rim: cosmetic: connect routing identifier strings with "-" + * gprs_bssgp: log source and destination RIM routing information + * gprs_bssgp: agregate RIM related code in gprs_bssgp_rim.c + * gsm48: add compare function for struct gprs_ra_id + * gsm_08_58, gsm_44_004: add struct for l1 information + + [ laforge ] + * Revert "pkgconfig: link to mnl if available" + + [ Oliver Smith ] + * tests/*: fix control reaches end of non-void func + * configure.ac: set -std=gnu11 + * sim: fix gcc 4.9.2 + -std=gnu11 error + + -- Pau Espin Pedrol Tue, 23 Feb 2021 12:41:44 +0100 + libosmocore (1.4.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 05069c5..c1170a7 100644 --- a/debian/control +++ b/debian/control @@ -31,10 +31,10 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore16 (= ${binary:Version}), + libosmocore17 (= ${binary:Version}), libosmogb11 (= ${binary:Version}), - libosmogsm15 (= ${binary:Version}), - libosmovty4 (= ${binary:Version}), + libosmogsm16 (= ${binary:Version}), + libosmovty9 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim2 (= ${binary:Version}), libosmousb0 (= ${binary:Version}), @@ -115,7 +115,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore16 +Package: libosmocore17 Section: libs Architecture: any Multi-Arch: same @@ -129,14 +129,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore16 library in particular is a collection of common code used in + The libosmocore17 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore16, + libosmocore17, libjs-jquery, libosmocodec-doc, libosmocoding-doc, @@ -183,7 +183,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm15 +Package: libosmogsm16 Section: libs Architecture: any Multi-Arch: same @@ -207,7 +207,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm15, + libosmogsm16, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library @@ -218,7 +218,7 @@ . This package contains the documentation for the libosmogsm library. -Package: libosmovty4 +Package: libosmovty9 Section: libs Architecture: any Multi-Arch: same @@ -239,7 +239,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmovty4, + libosmovty9, libjs-jquery Description: Documentation for the Osmo VTY library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmocore16.install b/debian/libosmocore17.install similarity index 100% rename from debian/libosmocore16.install rename to debian/libosmocore17.install diff --git a/debian/libosmogsm15.install b/debian/libosmogsm16.install similarity index 100% rename from debian/libosmogsm15.install rename to debian/libosmogsm16.install diff --git a/debian/libosmovty4.install b/debian/libosmovty9.install similarity index 100% rename from debian/libosmovty4.install rename to debian/libosmovty9.install diff --git a/src/Makefile.am b/src/Makefile.am index e56b57e..2f18d09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=16:0:0 +LIBVERSION=17:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index ca64286..a5f191d 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=4:0:4 +LIBVERSION=5:0:5 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index ccb2456..f1e2a5a 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=15:0:0 +LIBVERSION=16:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 4e2348b..52f3c6a 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:0 +LIBVERSION=2:1:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 81ff104..794b96c 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=8:1:4 +LIBVERSION=9:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25611e9fb334e880c36f1c7c180d5a1d00298835 Gerrit-Change-Number: 23032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 11:52:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 11:52:26 +0000 Subject: =?UTF-8?Q?Change_in_libgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E6-465b_=E2=86=92_1=2E2=2E2?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/23033 ) Change subject: Bump version: 1.2.1.6-465b ? 1.2.2 ...................................................................... Bump version: 1.2.1.6-465b ? 1.2.2 Change-Id: Ica00c6684de20df06f69678cd321abaeca1996fb --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/33/23033/1 diff --git a/debian/changelog b/debian/changelog index 9e8e6c5..904301f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libgtpnl (1.2.2) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * configure.ac: set -std=gnu11 + + [ Pau Espin Pedrol ] + * Enable parallel make in make distcheck + * .gitignore: Ignore new autofoo tmp files + + [ Gabriel Ganne ] + * install gtp-tunnel and gtp-link tools + + -- Pau Espin Pedrol Tue, 23 Feb 2021 12:52:08 +0100 + libgtpnl (1.2.1) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/23033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ica00c6684de20df06f69678cd321abaeca1996fb Gerrit-Change-Number: 23033 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 11:53:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 11:53:23 +0000 Subject: =?UTF-8?Q?Change_in_libgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E6-465b_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/23033 ) Change subject: Bump version: 1.2.1.6-465b ? 1.2.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/23033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ica00c6684de20df06f69678cd321abaeca1996fb Gerrit-Change-Number: 23033 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 11:53:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 11:53:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 11:53:26 +0000 Subject: =?UTF-8?Q?Change_in_libgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E6-465b_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/23033 ) Change subject: Bump version: 1.2.1.6-465b ? 1.2.2 ...................................................................... Bump version: 1.2.1.6-465b ? 1.2.2 Change-Id: Ica00c6684de20df06f69678cd321abaeca1996fb --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 9e8e6c5..904301f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libgtpnl (1.2.2) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * configure.ac: set -std=gnu11 + + [ Pau Espin Pedrol ] + * Enable parallel make in make distcheck + * .gitignore: Ignore new autofoo tmp files + + [ Gabriel Ganne ] + * install gtp-tunnel and gtp-link tools + + -- Pau Espin Pedrol Tue, 23 Feb 2021 12:52:08 +0100 + libgtpnl (1.2.1) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/23033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ica00c6684de20df06f69678cd321abaeca1996fb Gerrit-Change-Number: 23033 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:01:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:01:33 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E17-b83a-dirty_=E2=86=92_1=2E1=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23034 ) Change subject: Bump version: 1.0.0.17-b83a-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.17-b83a-dirty ? 1.1.0 Change-Id: I19eb9c7df3f374a6ccd23638f389e1682549a12d --- M debian/changelog 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/34/23034/1 diff --git a/debian/changelog b/debian/changelog index d999a89..f19b6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +osmo-gsm-manuals-dev (1.1.0) unstable; urgency=medium + + [ Harald Welte ] + * bibliography: Add more user manuals + * bibliography: https everywhere. + * cs7-config: Describe special meaning of M3UA routing context '0' + + [ Vadim Yanitskiy ] + * glossary.adoc: add brief definitions of AQPSK and VAMOS + * TRXC: use monospace formatting (the backticks) for 'SETFORMAT' + * TRXC: add missing description of the 'SETTSC' command + * TRXC: add proposal for multiple Training Sequences + * TRXC: introduce VAMOS enabled channel combinations + * TRXD: fix optional padding length: bits vs bytes + * TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams + * TRXD: clarify the meaning of field 'PWR' in Downlink messages + * TRXD: use different coding for AQPSK in the 'MTC' field + * TRXD: reserve a combination for Access Bursts on PACCH + * TRXD: rework description of the 'Training Sequence Code' field + * TRXD: clarify description of NOPE / IDLE indications + * TRXD: more information on PDU versioning and some highlights + * logging: add documentation for 'systemd-journal' target + + -- Pau Espin Pedrol Tue, 23 Feb 2021 12:59:20 +0100 + osmo-gsm-manuals-dev (1.0.0) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I19eb9c7df3f374a6ccd23638f389e1682549a12d Gerrit-Change-Number: 23034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:04:28 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E17-b83a-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23034 ) Change subject: Bump version: 1.0.0.17-b83a-dirty ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I19eb9c7df3f374a6ccd23638f389e1682549a12d Gerrit-Change-Number: 23034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 12:04:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:04:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:04:31 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gsm-manuals=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E17-b83a-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23034 ) Change subject: Bump version: 1.0.0.17-b83a-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.17-b83a-dirty ? 1.1.0 Change-Id: I19eb9c7df3f374a6ccd23638f389e1682549a12d --- M debian/changelog 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index d999a89..f19b6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +osmo-gsm-manuals-dev (1.1.0) unstable; urgency=medium + + [ Harald Welte ] + * bibliography: Add more user manuals + * bibliography: https everywhere. + * cs7-config: Describe special meaning of M3UA routing context '0' + + [ Vadim Yanitskiy ] + * glossary.adoc: add brief definitions of AQPSK and VAMOS + * TRXC: use monospace formatting (the backticks) for 'SETFORMAT' + * TRXC: add missing description of the 'SETTSC' command + * TRXC: add proposal for multiple Training Sequences + * TRXC: introduce VAMOS enabled channel combinations + * TRXD: fix optional padding length: bits vs bytes + * TRXD: cosmetic: clarify soft-/hard-bits on packet diagrams + * TRXD: clarify the meaning of field 'PWR' in Downlink messages + * TRXD: use different coding for AQPSK in the 'MTC' field + * TRXD: reserve a combination for Access Bursts on PACCH + * TRXD: rework description of the 'Training Sequence Code' field + * TRXD: clarify description of NOPE / IDLE indications + * TRXD: more information on PDU versioning and some highlights + * logging: add documentation for 'systemd-journal' target + + -- Pau Espin Pedrol Tue, 23 Feb 2021 12:59:20 +0100 + osmo-gsm-manuals-dev (1.0.0) unstable; urgency=medium [ Daniel Willmann ] -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/23034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I19eb9c7df3f374a6ccd23638f389e1682549a12d Gerrit-Change-Number: 23034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:17:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:17:39 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E534-fcbf-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23032 ) Change subject: Bump version: 1.4.0.534-fcbf-dirty ? 1.5.0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/23032/1/contrib/libosmocore.spec.in File contrib/libosmocore.spec.in: https://gerrit.osmocom.org/c/libosmocore/+/23032/1/contrib/libosmocore.spec.in at 329 PS1, Line 329: %post -n libosmogb11 -p /sbin/ldconfig libosmogb had no API breakage, i.e. all old symbols still remain? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25611e9fb334e880c36f1c7c180d5a1d00298835 Gerrit-Change-Number: 23032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 12:17:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:18:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:18:53 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23028 ) Change subject: utils: catch exceptions during reader initalitation ...................................................................... Patch Set 2: agreeing with fixeria -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 12:18:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:19:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:19:00 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23029 ) Change subject: serial: don't crash if the device does not exist ...................................................................... Patch Set 2: agreeing with fixeria -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 12:19:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:19:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:19:35 +0000 Subject: Change in pysim[master]: serial: do not try to close non existing serial connection In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23030 ) Change subject: serial: do not try to close non existing serial connection ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic3f3f5e50d780f424da7d0be5733d7167bb7159c Gerrit-Change-Number: 23030 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 12:19:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:20:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:20:37 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Omit tab whitespace matching debian/control versions References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23035 ) Change subject: osmo-release.sh: Omit tab whitespace matching debian/control versions ...................................................................... osmo-release.sh: Omit tab whitespace matching debian/control versions Change-Id: I054245b54adfaae3d51bcfc3a3d1e3ecbaa5f116 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/23035/1 diff --git a/osmo-release.sh b/osmo-release.sh index 31cd1a0..b4db440 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -41,7 +41,7 @@ if [ "z$debctrl_match_count" != "z1" ]; then echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!" else # 1 match: - parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g") + parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | tr -d "\t" | sed "s/>=/ /g") debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g") debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2) if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" != "z$debctrl_ver" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I054245b54adfaae3d51bcfc3a3d1e3ecbaa5f116 Gerrit-Change-Number: 23035 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:20:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:20:51 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22928 ) Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 12:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:21:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:21:09 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E2=2E9-288c-dirty_=E2=86=92_0=2E1=2E3?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/23036 ) Change subject: Bump version: 0.1.2.9-288c-dirty ? 0.1.3 ...................................................................... Bump version: 0.1.2.9-288c-dirty ? 0.1.3 Change-Id: I9287411a7c1f69ddc6211c2557d41dd533c84ff9 --- M configure.ac M contrib/osmo-pcap.spec.in M debian/changelog M debian/control 4 files changed, 27 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/36/23036/1 diff --git a/configure.ac b/configure.ac index 6660bf1..8ec9c88 100644 --- a/configure.ac +++ b/configure.ac @@ -117,9 +117,9 @@ AC_SUBST([PCAP_CFLAGS]) dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(LIBZMQ, libzmq >= 3.2.2) PKG_CHECK_MODULES(LIBGNUTLS, gnutls) diff --git a/contrib/osmo-pcap.spec.in b/contrib/osmo-pcap.spec.in index 2755afa..db2dcf0 100644 --- a/contrib/osmo-pcap.spec.in +++ b/contrib/osmo-pcap.spec.in @@ -29,10 +29,10 @@ %endif BuildRequires: pkgconfig BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(libosmocore) >= 0.11.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 0.11.0 -BuildRequires: pkgconfig(libosmovty) >= 0.11.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(libzmq) >= 3.2.2 %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index 14a0d0e..ce26f4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +osmo-pcap (0.1.3) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * configure.ac: set -std=gnu11 + + [ Harald Welte ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * reformat debian/control for osmo-release.sh compatibility + + [ Pau Espin Pedrol ] + * main: generate coredump and exit upon SIGABRT received + + -- Pau Espin Pedrol Tue, 23 Feb 2021 13:19:37 +0100 + osmo-pcap (0.1.2) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 4e2fc7c..68d38c7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ autotools-dev, libpcap0.8-dev, pkg-config, - libosmocore-dev, + libosmocore-dev (>= 1.5.0), libgnutls28-dev, libzmq3-dev Standards-Version: 3.9.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/23036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I9287411a7c1f69ddc6211c2557d41dd533c84ff9 Gerrit-Change-Number: 23036 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:21:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:21:23 +0000 Subject: Change in osmo-bts[master]: l1sap: add logging and VTY introspection for ACCH repetition In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22888 ) Change subject: l1sap: add logging and VTY introspection for ACCH repetition ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I59d11fd03be3d29fb8a4279d9945b03006764c0e Gerrit-Change-Number: 22888 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 23 Feb 2021 12:21:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:23:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:23:20 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 23 Feb 2021 12:23:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:23:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:23:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 ) Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016/1/pcu/PCU_Tests_SNS.ttcn File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016/1/pcu/PCU_Tests_SNS.ttcn at 250 PS1, Line 250: /* do an SGSN oriented reset of signalling BVCI, then the SGSN tries to reset an unknown BVCI. */ > From the test description it's not cleat to me wheter it's an expected functionality or it's actuall [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 12:23:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:25:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:25:00 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23013 ) Change subject: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 Gerrit-Change-Number: 23013 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 12:25:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:28:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:28:53 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23014 ) Change subject: gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/23014/4/src/gprs_bssgp_pcu.c File src/gprs_bssgp_pcu.c: https://gerrit.osmocom.org/c/osmo-pcu/+/23014/4/src/gprs_bssgp_pcu.c at 460 PS4, Line 460: !TLVP_PRESENT(&tp, BSSGP_IE_BVCI) I think we do have a BSSGP parser that knows which IEs are mandatory and which are not. I'd prefer using that one rathert han adding additional checks here. See osmo_pdef_bssgp, which enforces that BVCI and CAUSE are present in any RESET. https://gerrit.osmocom.org/c/osmo-pcu/+/23014/4/src/gprs_bssgp_pcu.c at 461 PS4, Line 461: an super unimportatn: I'd remove the "an" here to make it more in line with the other message below, which also doesn't state "Rx an BSSGP-RESET" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 Gerrit-Change-Number: 23014 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 12:28:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:29:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 12:29:08 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: add comments to the pcu states In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23015 ) Change subject: gprs_bssgp_pcu: add comments to the pcu states ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iccf6508ce46162e6dfd6b00abd44e24cb425b346 Gerrit-Change-Number: 23015 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 12:29:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:34:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:34:54 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E22-f01c-dirty_=E2=86=92_1=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23037 ) Change subject: Bump version: 1.6.0.22-f01c-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.22-f01c-dirty ? 1.7.0 Change-Id: I05d9bee0791cec5aebbeb1602be6697ecc2e2b74 --- M TODO-RELEASE M configure.ac M contrib/osmo-ggsn.spec.in M debian/changelog M debian/control M gtp/Makefile.am 6 files changed, 44 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/37/23037/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index dd0df1a..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-ggsn update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include diff --git a/configure.ac b/configure.ac index a1c7180..479ae3b 100644 --- a/configure.ac +++ b/configure.ac @@ -154,9 +154,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index d752a8e..dcf0e7c 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -29,11 +29,10 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libgtpnl) >= 1.0.0 -BuildRequires: pkgconfig(libosmocore) >= 1.1.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 -BuildRequires: pkgconfig(libosmovty) >= 1.1.0 BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 Obsoletes: openggsn %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index 445e75c..f65aaa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +osmo-ggsn (1.7.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Pau Espin Pedrol ] + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * contrib/jenkins: Enable parallel make in make distcheck + * ggsn: generate coredump and exit upon SIGABRT received + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Keith ] + * Fix vty PDP lookups by IMSI + * Prevent Crash in show pdp-context from vty + * Minor: remove code duplication + * Use imsi_str2gtp() in sgsnemu + * sgsnemu: relax check on length of IMSI cmdline arg. + * GTP: Replace recently introduced imsi_str2gtp() + + [ Harald Welte ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * gtp-kernel: Remove duplicate #include section + * gtp-kernel: don't #include libmnl headers + + [ Oliver Smith ] + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + * apn_start: avoid segfault if missing tun-device + * .gitignore: ignore debian/libgtp* + * deb/rpm: build with --enable-gtp-linux + + -- Pau Espin Pedrol Tue, 23 Feb 2021 13:34:39 +0100 + osmo-ggsn (1.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 1fd1937..bbffd49 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ pkg-config, libdpkg-perl, git, dh-autoreconf, - libosmocore-dev (>= 1.4.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev, libgtpnl-dev (>= 1.2.0) Standards-Version: 3.9.6 diff --git a/gtp/Makefile.am b/gtp/Makefile.am index a392277..64f63b6 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=6:0:0 +LIBVERSION=7:0:1 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I05d9bee0791cec5aebbeb1602be6697ecc2e2b74 Gerrit-Change-Number: 23037 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 12:42:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 12:42:30 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E1=2E15-9484-dirty_=E2=86=92_1=2E5=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/23038 ) Change subject: Bump version: 1.4.1.15-9484-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.1.15-9484-dirty ? 1.5.0 Change-Id: I2cafda295513b019cda424f09655061fa7a0fa10 --- M configure.ac M contrib/osmo-sip-connector.spec.in M debian/changelog M debian/control 4 files changed, 36 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/38/23038/1 diff --git a/configure.ac b/configure.ac index 10a6392..de19d88 100644 --- a/configure.ac +++ b/configure.ac @@ -24,9 +24,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE(sanitize, diff --git a/contrib/osmo-sip-connector.spec.in b/contrib/osmo-sip-connector.spec.in index 4361daa..29baf9b 100644 --- a/contrib/osmo-sip-connector.spec.in +++ b/contrib/osmo-sip-connector.spec.in @@ -27,9 +27,9 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(sofia-sip-ua-glib) >= 1.12.0 %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index c983128..e147a38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +osmo-sip-connector (1.5.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Matt Johnson ] + * sip: Specify invite contact tag + + [ Alexander Couzens ] + * Revert "sip: Specify invite contact tag" + * mncc: remove callref argument from mncc_write() + * mncc: add return code for write/send function + * mncc: Introduce mncc_rtp_write similiar to mncc_write + * mncc: mncc_create_remote_leg: use mncc_write instead of write direct to the fd + + [ Pau Espin Pedrol ] + * mncc: Support IPv6 addresses (new version mncc 7) + * sdp: Don't select addresses failing to parse + * contrib/jenkins: Enable parallel make in make distcheck + * mncc: Log write error code + * .gitignore: Get rid of new autofoo tmp files + * mncc: Fix write len + + [ Oliver Smith ] + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 13:42:08 +0100 + osmo-sip-connector (1.4.1) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 4692ea5..0de3953 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ libsofia-sip-ua-dev, dh-systemd (>= 1.5), dh-autoreconf, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.8.4 Homepage: https://osmocom.org/projects/osmo-sip-conector/wiki -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/23038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2cafda295513b019cda424f09655061fa7a0fa10 Gerrit-Change-Number: 23038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:03:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:03:41 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E535-e387-dirty_=E2=86=92_1=2E5=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23039 ) Change subject: Bump version: 1.4.0.535-e387-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.535-e387-dirty ? 1.5.0 Change-Id: I3bc0826c0000be4d76235ed6b5be86d216ea2e4d --- M TODO-RELEASE M contrib/libosmocore.spec.in M debian/changelog M debian/control R debian/libosmocore17.install R debian/libosmogb12.install R debian/libosmogsm16.install R debian/libosmovty9.install M src/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 14 files changed, 602 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/23039/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index e1b1507..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,10 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmogsm new API gsm0808_create_sapi_reject_cause() with cause argument -libosmogsm ABI change struct osmo_gprs_cell_options size changed (new field at the end) -libosmogsm API change struct ipac_preproc_ave_cfg: new zero-sized flexible array member at end -libosmovty ABI change struct cmd_element: add a field for program specific attributes -libosmovty ABI change struct vty_app_info: optional program specific attributes description -libosmoctrl ABI change struct ctrl_handle changed size (new field "reply_cb" at the end) -libosmogsm new API osmo_rai_cmp(), osmo_cgi_ps_cmp() diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 93e5e16..b6791eb 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -111,13 +111,13 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmocoding. -%package -n libosmocore16 +%package -n libosmocore17 Summary: Osmocom core library # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: System/Libraries -%description -n libosmocore16 +%description -n libosmocore17 libosmocore is a library with various utility functions shared between OpenBSC and OsmocomBB. @@ -126,7 +126,7 @@ # crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmocore16 = %version +Requires: libosmocore17 = %version Requires: libtalloc-devel %description -n libosmocore-devel @@ -163,12 +163,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoctrl. -%package -n libosmogb11 +%package -n libosmogb12 Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogb11 +%description -n libosmogb12 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -179,7 +179,7 @@ License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogb11 = %version +Requires: libosmogb12 = %version Requires: libosmovty-devel = %version %description -n libosmogb-devel @@ -188,12 +188,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmogb. -%package -n libosmogsm15 +%package -n libosmogsm16 Summary: Osmocom GSM utility library License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogsm15 +%description -n libosmogsm16 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -208,7 +208,7 @@ License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogsm15 = %version +Requires: libosmogsm16 = %version %description -n libosmogsm-devel The libosmogsm library in particular is a collection of common code @@ -246,12 +246,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmosim. -%package -n libosmovty4 +%package -n libosmovty9 Summary: Osmocom VTY interface library License: GPL-2.0-or-later Group: System/Libraries -%description -n libosmovty4 +%description -n libosmovty9 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -263,7 +263,7 @@ License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmovty4 = %version +Requires: libosmovty9 = %version %description -n libosmovty-devel The libosmovty library implements the interactive command-line on the @@ -322,18 +322,18 @@ %postun -n libosmocodec0 -p /sbin/ldconfig %post -n libosmocoding0 -p /sbin/ldconfig %postun -n libosmocoding0 -p /sbin/ldconfig -%post -n libosmocore16 -p /sbin/ldconfig -%postun -n libosmocore16 -p /sbin/ldconfig +%post -n libosmocore17 -p /sbin/ldconfig +%postun -n libosmocore17 -p /sbin/ldconfig %post -n libosmoctrl0 -p /sbin/ldconfig %postun -n libosmoctrl0 -p /sbin/ldconfig -%post -n libosmogb11 -p /sbin/ldconfig -%postun -n libosmogb11 -p /sbin/ldconfig -%post -n libosmogsm15 -p /sbin/ldconfig -%postun -n libosmogsm15 -p /sbin/ldconfig +%post -n libosmogb12 -p /sbin/ldconfig +%postun -n libosmogb12 -p /sbin/ldconfig +%post -n libosmogsm16 -p /sbin/ldconfig +%postun -n libosmogsm16 -p /sbin/ldconfig %post -n libosmosim2 -p /sbin/ldconfig %postun -n libosmosim2 -p /sbin/ldconfig -%post -n libosmovty4 -p /sbin/ldconfig -%postun -n libosmovty4 -p /sbin/ldconfig +%post -n libosmovty9 -p /sbin/ldconfig +%postun -n libosmovty9 -p /sbin/ldconfig %post -n libosmousb0 -p /sbin/ldconfig %postun -n libosmousb0 -p /sbin/ldconfig @@ -365,7 +365,7 @@ %_libdir/libosmocoding.so %_libdir/pkgconfig/libosmocoding.pc -%files -n libosmocore16 +%files -n libosmocore17 %defattr(-,root,root) %_libdir/libosmocore.so.16* @@ -391,7 +391,7 @@ %_libdir/libosmoctrl.so %_libdir/pkgconfig/libosmoctrl.pc -%files -n libosmogb11 +%files -n libosmogb12 %defattr(-,root,root) %_libdir/libosmogb.so.11* @@ -403,7 +403,7 @@ %_libdir/libosmogb.so %_libdir/pkgconfig/libosmogb.pc -%files -n libosmogsm15 +%files -n libosmogsm16 %defattr(-,root,root) %_libdir/libosmogsm.so.15* @@ -428,7 +428,7 @@ %_libdir/libosmosim.so %_libdir/pkgconfig/libosmosim.pc -%files -n libosmovty4 +%files -n libosmovty9 %defattr(-,root,root) %_libdir/libosmovty.so.4* diff --git a/debian/changelog b/debian/changelog index 317fefe..d83a232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,562 @@ +libosmocore (1.5.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty/command: cosmetic: simplify conditions in in config_list_cmd + * vty/command: cosmetic: fix formatting of config_help_cmd + * vty/command: cosmetic: drop redundant line break + * vty/command: fix switch / case coding style in vty_go_parent() + * vty/command: cosmetic: swap i and j in vty_dump_element() + * gsm0808: add gsm0808_create_sapi_reject_cause() + * macaddr: fix osmo_get_macaddr(): return -1 if no device is found + * macaddr: fix osmo_macaddr_parse(): return meaningful error codes + * lapdm_pad_msgb(): cosmetic: use GSM_MACBLOCK_PADDING + * lapd_test: fix wrong comment in lapdm_establish() + * lapd_test: rename func=UA (RR) CM Service Request: s/ua/ua_cm/ + * lapd_test: fix: print all messages to stdout, not stderr + * lapd_test: add a test checking SAPI0/SAPI3 prioritization + * lapdm: fix SAPI-0/SAPI-3 frame prioritization on DCCH + * logging: refactor and simplify log_target_destroy() + * logging: fix log_target_destroy(): properly close syslog + * logging: fix memleak in log_target_create_file() + * vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() + * gsm0808: fix: do not encode invalid encryption algorithm + * vty: add program specific attributes to VTY commands + * vty: print program specific attributes in the XML reference + * vty: cosmetic: drop redundant 'break' statements + * vty: cosmetic: s/width/cmd_width/g in vty_describe_command() + * vty: cosmetic: fix missing curly braces in vty_describe_command() + * vty/command: introduce new attribute CMD_ATTR_IMMEDIATE + * vty/command: reflect global attributes in the XML reference + * tests: do not ignore stderr of vty_test, also match it + * vty: check for duplicate flags in application specific attributes + * vty: check for reserved flags in application specific attributes + * vty/command: add global command attribute CMD_ATTR_NODE_EXIT + * vty/command: add CMD_ATTR_LIB_COMMAND and install() API wrappers + * vty: use install_lib_element() and install_lib_element_ve() + * vty/command: introduce API for the library specific attributes + * vty: introduce and use VTY_CMD_USR_ATTR_NUM + * vty/command: introduce a command to list attributes + * vty/command: print attribute flags in the output of 'list' + * tests/vty: verify 'show vty-attributes' / 'list' commands + * vty/command: assign flags to CMD_ATTR_{IMMEDIATE,NODE_EXIT} + * vty/command: restrict the use of '.', '!', and '@' as flags + * vty: fix vty_dump_element(): do not print empty + * socket: make the arguments of osmo_sockaddr_cmp() const + * gprs_ns2: make struct osmo_sockaddr pointers const + * rsl: rsl_chan_nr_str_buf(): use ABIS_RSL_CHAN_NR_CBITS_* macros + * logging: introduce 'systemd-journal' target + * vty: introduce the expert mode and a command to enable it + * vty/command: make some 'struct cmd_element' pointers const + * vty/command: introduce vty_dump_xml_ref_mode() + * vty/command: add CMD_ATTR_HIDDEN to CMD_ATTR_PUBLIC_MASK + * application: do not document unrelated forward-declarations + * vty/command: fix: restrict the expert mode to the current session + * fix spelling in 'value_string' arrays: existAnt -> existEnt + * gsm48: add missing RR cause value definitions + * vty/command: add 'hidden only' VTY reference generation mode + * bts_features: add missing description for BTS_FEAT_ACCH_REP + * core/linuxlist: do not use 'new' as a parameter name + * protocol/gsm_08_58.h: add ip.access Power Control structures + * protocol/gsm_08_58.h: add Osmocom specific EWMA AVG algo + * logging: revert color of LGLOBAL category back to white + * gsm_08_58: fix wrong field order in 'struct ipac_preproc_pc_thresh' + * gsm_08_58: add flexible array member to 'struct ipac_preproc_ave_cfg' + * gsmtap_util: SNR can be negative, use a signed integer + * gprs_ns2_sns: always check rc of osmo_sockaddr_str_from_sockaddr() + * gprs_ns2_fr: fix resource leaks due to early return in set_ifupdown() + * gprs_bssgp: fix uninitialized struct fields in bssgp_create_rim_ri() + * bts_features: s/Repeation/Repetition/ in osmo_bts_features_descs[] + * gprs_bssgp: abuse gsm48_encode_ra() to encode TAC + * fixup: configure.ac: fix: do not define HAVE_NEON unconditionally + * gsm_7bit_encode_n(): test encoding of more than 250 septets + * gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() + * gsm0808: use msgb_tv16_put() and osmo_store32be() + * bssgp_bvc_fsm: check return value of osmo_fsm_register() + * tlv: add msgb_tv32_put(), similar to msgb_tv16_put() + * tlv: clarify documentation for msgb_tv{16,32}_put() + + [ Eric ] + * vty cpu sched: do not assert if sched impossible + * pkgconfig: link to mnl if available + + [ Pau Espin Pedrol ] + * vty: Fix cpu-sched VTY node name + * sock: osmo_sock_init2_multiaddr: decouple addr resolution from socket creation + * socket: multiaddr: Support IPv4 + IPv6 addresses in SCTP associations + * socket: Log proper getaddrinfo() error + * osmo_sock_get_ip_and_port(): Support IPv6 sockets + * l1sap.h: Fix typo in doxygen documentation + * osmo_sock_inti2_multiaddr: Fix memleak and free uninitialized mem + * socker: Remove AI_ADDRCONFIG from getaddrinfo flags + * tests: Split SCTP tests to its own file and run them conditionally + * ipa: Fix wrong output log formatting + * socket: Allow binding to :: (IPv6) and connecting to IPv4-only on the remote + * socket: Add support for AF_INET6 in osmo_sockaddr_to_str_and_uint() + * socket: Use AF_UNSPEC instead of PF_UNSPEC calling getaddrinfo + * socket: Fix stack-buffer-overflow in osmo_sock_local_ip() + * socket: fix wrong ipv6 dst buf size passed in osmo_sock_local_ip + * socket: Add some osmo_sockaddr print helpers + * tests: Add test to showcase osmo_sock_init2 bug with AF_UNSPEC + * socket: Fix bug in osmo_sock_init2(AF_UNSPEC) matching IP versions + * logging: Avoid printing OSMO_LOGCOLOR_END if no color was used + * osmo_strlcpy: Avoid calling memcpy with size=0 + * osmo_strlcpy: Clarify length calculation + * cosmetic: Fix typo in API doc + * gprs_ns2_udp: Avoid dangling freed struct in list if binding fails + * vty: Fix left shifting out of range on signed variable + * cosmetic: vty: Fix trailing whitespace + * gsm: Fix make distcheck with parallel make + * contrib: jenkins: Enable parallel make in make distcheck + * lapdm: Drop log lines printing fmt=B + * lapdm: Split lapd_rx_u() spaghetti into one function per message type + * lapdm: Allow SABM L=0 in Timer Recovery State + * gb: ns2_sns: Fix missing trailing newline char in log line + * gb: ns2_sns: Add missing value_string entry for GPRS_SNS_EV_NO_NSVC + * vty: Mark cpu_sched_vty commands with attr immediate + * tdef: Introduce OSMO_TDEF_US unit + * tests: Fix tdef_test on 32bit platforms + * bitvec: Fix left shifting out of range on signed variable + * cosmetic: serial: Fix typo in comment + * serial: Fix typo in debug log line + * serial: Log error if tcgetattr() or tcsetattr() fail + * serial: Introduce API osmo_serial_speed_t + * Revert "tests: Fix tdef_test on 32bit platforms" + * tests: Fix tdef_test on 32bit platforms + * statsd report: Fix wrong fmt specificier generating wrong stats + * gsm: Add enum for Network Feature Support IE + * Include mnl.h iif --enable-libmnl + * gb: Import mnl.h iif --enable-libmnl + * bssgp: Remove newly added log line warning about NOOP + * rest_octets: add Serving Cell Priority Parameters + * gsm: si13: Fix encode of EGPRS_PACKET_CHANNEL_REQUEST + * si2quater: fix budget calculation for multiple EARFCNs + * gsm: append_eutran_neib_cell: Fix SI2quater EARFCN list + * GPRS Cell Options (SI13): Add REL-4 CCN_ACTIVE bit + * Revert "rest_octets: fix encoding of 3G Early Classmark Sending Restriction" + * rest_octets: Fix decoding of SI3 3G Early Classmark Sending Restriction + * gitignore: Ignore *~ + * ctrl: Allow handling CTRL get/set replies in user defined code + * Intoduce Packet Switch CGI + * ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH + * gsm: Add missing osmo_*_cmp symbols to libosmogsm.map + * gsm: Introduce osmo_{rai,cgi_ps}_cmp() APIs + * gprs_bssgp_prim.h: Add missing includes + * Revert "gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty" + * ctrl_connection: Initialize write_queue.bfd.fd to -1 during allocation + * cosmetic: fix typo in comment + * gsm: Fix wrong length in SI13 GPRS Cell Options IE + * gsm: bts_features: Introduce BTS_FEAT_CCN + * Fix struct bitfields on big endian systems + * cosmetic: Move comment one line below in append_gprs_cell_opt + * gsm: Fix bitfield order in dtap_header + * comsetic: gsm0808_test: Fix trailing whitespace + * gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() + * gsm0808_utils: Move static function further up in file + * gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types + * logging: gsmtap: Fill PID field for each message + * Introduce osmo_gettid() API + * logging: gsmtap: Fix fill PID field not stored in network byte order + * logging: gsmtap: Store TID instead of PID in pkt hdr + * gsm: Introduce API osmo_gsm48_rest_octets_si13_decode + * logging: Allow prefixing thread ID to each log line + * tests: Set print_category values explicitly + * Drop use of log_set_print_filename() API inside libosmocore + * logging: Deprecate API log_set_print_filename + * osmo-release.sh: Omit tab whitespace matching debian/control versions + + [ Harald Welte ] + * gsmtap: Add definitions for E1/T1 payload (LAPD, TRAU, FR) in GSMTAP + * Add VTY + CTRL ports for upcoming OsmoSMLC + * gprs_ns2_sns: Fix compilation on Debian 8 + * ipaccess.h: Add more enum values and 'official' names + * ns2: Improve/extend doxygen comments for new ns2 implementation + * ns2: Use NULL and not '0' when returning a NULL-Pointer + * gprs_ns2: Mark gprs_ns2_validate_* as static + * write_queue: Add osmo_wqueue_enqueue_quiet() + * write_queue: use msgb_{en,de}queue_count() + * write_queue: Re-enqueue msgb if write_cb returns -EAGAIN + * logging_vty: set osmo_stderr_target to NULL on "no log stderr" + * logging: Introduce MAX_LOG_SIZE for the magic number 4096 + * bssgp: Don't include RA-ID in BVC-RESET for BVCI=0 (signalling) + * bssmap_le/bsslap tests: We must use %td for ptrdiff_t printing + * osmo_float_str_to_int: When using strtoll(), use LLONG_{MAX,MIN} + * gprs_ns2: Fix parsing of SNS-{ADD,DEL,CHANGE_WEIGHT} + * gsm48_rest_octets: Add parser for SI4 rest octets + * [cosmetic] rest_octets: Follow coding style regarding {} + * ns2: More verbose comments on gprs_ns2_vc_mode + * select: Introduce osmo_fd_{read,write}_{enable,disable}() + * select: Migrate over to poll() + * card_fs_usim.c: Add support for DF.5GS directory + * Revert "gsm_04_08: add parser for Mobile Station Classmark 3" + * card_fs_usim: Add definitions of DF.ProSe and DF.ACDC + * bssgp: Input argument to bssgp_tlv_parse() should be 'const' + * ns2: permit multiple nsvci in one nse in VTY + * frame_relay: Fix some spelling/language issues + * Revert "ns2: permit multiple nsvci in one nse in VTY" + * gprs_ns2_vty: Fix VTY documentation errors + * frame_relay: Fix null pointer dereference in DLC/PVC delete + * frame_relay: Fix error path on ioctl() failure + * gprs_ns2: Introduce gprs_ns2_lltype_str() for link layer name + * gprs_ns2_fr: Print Frame Relay 'role' in VTY + * gprs-ns2: Fix stringification of NS/FR NSVCI + * gprs_ns2: Don't return an empty string in case of unknown LL + * cosmetic: frame_relay: Fix typos + * gprs_ns2: Print link layer and global ALIVE/DEAD state + * gprs_ns2_vty: Differentiate 'show ns binds' and 'show ns entities' + * gprs_ns2_vty: Show NSVCI in dump_nsvc() + * gprs_ns_vty: Unify display of NSVCI on VTY in 'show ns entities' + * gprs_ns2_vty: Print all relevant data on each NS-VC + * gprs_ns2_udp.c: Fix typo - it's a DSCP and not a DCSP + * Integrate libmnl (minimal netlink) library with libosmocore select loop + * gprs_ns2_fr: Monitor the kernel net-device link state + * gsm_08_18.h: Update enums for message types and IEs with Release 15 + * gprs_ns2_vty: Re-introduce a 'show ns' command + * libosmogb: Add missing LIBMNL_CFLAGS + * mnl: Use mnl_socket_open() insatead of mnl_socket_open2() + * gprs_ns2_fr: remove include + * bssgp: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * gprs_ns2: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * bssgp: Update bssgp_pdu_strings with Release 15 + * bssgp: Fix typo in BSSGP Message Type enum + * Add hlist and hashtable from Linux kernel + * Use explicit type-casting in hlist_del() for C++ compatibility + * gsm_08_18.h: Add some PDU definitions still missing + * hash/log2: Add generic implementations of fls() and fls64() + * log2.h: Use uintXX_t instead of kernel specific types + * log2.h: Avoid redefining __always_inline + * ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state + * Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols + * tlv: Introduce enum with error codes for TLV parser functions + * bssgp: Add osmo_tlv_prot_def for BSSGP + * gsm_08_18.h: Add #defines for [extended] feature bits + * tlv.h: Add msgb_tvlv_put_{16,32}be() + * logging: Introduce DLBSSGP logging constant + * gb: Add beginnings of a new BSSGP implementation + * logging: Assing different 8bit colors to built-in subsystems + * bssgp2: Encoding + Decoding functions for BVC and MS flow control + * bssgp_bvc_fsm: Add basic BVC flow control rx/tx support + * gprs_ns2_fr.c: Skip extraneous FIONBIO + * gprs_ns2_fr: guard against race between socket(AF_PACKET) and bind() + * gprs_ns2_fr: use ETH_P_HDLC instead of ETH_P_ALL + * Fix VTY syntax for newly-introduced NS2 timers + * gors_ns2_vty: Fix saving of new NS2 timers + * gprs_ns2_fr: Avoid stringop-truncation warning + * gprs_ns2_fr: Use OSMO_STRLCPY_ARRAY() where possible + * fsm: Add osmo_fsm_inst_broadcast_children() + * vty: Fix left shifting out of range on signed variable + * lapd_core: Don't dereference data link after sending PRIM_DL_REL + * cbsp: Fix encoding of "ETWS Warning Security Info" IE + * cbsp: Fix osmo_cbsp_recv_buffered() for KEEP-ALIVE-COMPLETE + * cbsp: Fix parsing DCS in decode of WRITE-REPLACE + * Add inter-thread queue + * tlv_parser: Fix various out-of-bounds accesses + * gprs_ns2_fr: reduce duplication between gprs_ns2_fr_connect / connect2 + * gprs_ns2: Give NS-VC FSMs a proper name/identifier + * ns2: delay NS_AFF_CAUSE_RECOVERY until NS-VC for data + sig are unblocked + * vty/fsm_vty: Add vty_out_fsm2() + vty_out_fsm_inst2() with prefix + * ns2: Properly indent VTY output + * ns2: Unify logging context via log macros + * logging_vty: Fix saving of "logging print file .. last" + * gprs_ns2_test: Fix compilation on Debian 8 + * Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE" + * Revert "gprs_ns2_vc_fsm: check NSEI match the NSE" + * ns2: Use proper return value from write_queue callback function + * ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS + * osmo-ns-dummy: Add simple NS traffic generator + * ns2: Work around AF_PACKET socket ENOBUFS problems + * ns2: Use named array initializers to avoid mistakes + * ns2: encapsulate calls to nsvc->bind->send_vc() + * ns2: Increment Rx and Tx byte / packet counters + * ns2: Properly report packet drops in FR code + * ns2: count number of dropped packets / bytes on transmit + * ns2: Implement more rate counters + * ns2: Add a rate_ctr for each NS-UNBLOCK + * ns2: Move to one common/shared ns2_bind_alloc() + * ns2: Memory allocation failures are ENOMEM, not ENOSPC + * ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx + * ns2: Introduce a per-bind stat_item group with backlog length + * ns2: Fix typos in comments + * ns2: Print NS-STATUS.ind primitives to the log + * ns2: cosmetic: fix indent levels + * frame_relay: Send "Fuil Status" ENQUIRY after link recovers + * frame_relay: Add status call-backs for link + DLC status changes + * frame_relay: Discard received messages for DLC not yet active + * frame_relay: cosmetic: Unify log syntax when discarding Rx packets + * ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED + * ns2: Stop test procedure when going into unconfigured state + * ns2: Don't start sending NS-RESET until FR DLC is available + * osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets + * initial support for static userspace probes via systemtap + * Enable systemd-journald log target in debian + rpm packaging + * gb: frame_relay: Factor-out function to set link as dead + * gb: frame_relay: Detect link outage on "last receive seq nr == 0" + * frame_relay; Fix Q.933 async STATUS at DLC creation + * ns2: Name NSVC FSM events consistently + * ns2: Don't queue Q.933 LMI messages; only store most recent ones + * ns2: improve backlog handling on interface up/down + * ns2: Don't try to add packets to the backlog on real errors + * README.md: Use https everywhere + * ns2_fr: Fix null pointer deref in error path + * ns2_fr: Fix heap-use-after-free in error recovery path + * BVC FSM: Treat overlapping BVC-RESET as implicit ACK + * support for stats static userspace probes via systemtap + * CBSP: fix encoding/decoding of keep-alive repetition period + * CBSP: Fix encoding of warning period + + [ Neels Hofmeyr ] + * comment: mention spec reference in cbsp.[ch] + * comment: typo in cbsp.h + * bitXXgen: ensure not reading/storing past valid size + * bitXXgen: add bitgen_test.c + * bitXXgen: add osmo_loadXXbe_ext_2() to get right-adjusted values + * add osmo_use_count_to_str_c() + * osmo_use_count_to_str: make robust against unused use_count + * add osmo_float_str_to_int() and osmo_int_to_float_str_*() + * add GAD coding for Location Services + * add BSSLAP coding for Location Services + * add BSSMAP-LE coding for Location Services + * add BSSMAP coding for Location Services + * doc tweaks for osmo_float_str_to_int(), osmo_int_to_float_str*() + * gad.c: try to workaround warning for "h.type >= 0" + * gad.c: fix rc for osmo_gad_enc_ell_point_unc_circle() + * gprs_ns2_fr.c: compiler error: replace strncpy() with OSMO_STRLCPY_ARRAY() + * fix strncpy bug in gprs_ns2_fr_bind() + + [ Alexander Couzens ] + * sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port + * tests/socket: add testcase test_get_ip_and_port + * socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd + * socket: add osmo_sockaddr_cmp() + * gb/gprs_bssgp: remove superfluous whitespace + * gb/common_vty: use void * + * add osmo_sockaddr_local_ip() to determine the local address for a remote. + * Gb: add a second NS implementation + * libgb/ns: allow to create NS_ALIVE NSVC + * gb/gprs_bssgb: check if talloc failed on btsctx->fc + * gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc + * ns2: remove bssgp specific msgb->cb parts + * ns2: vty: add missing docs for IPv6 address + * ns2: check the specific bit of NS SDU Control bits + * ns2: refactor nsvc_by_ functions + * ns2: ns2_recv_vc: remove unused parameter nsi + * ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found + * ns2: refactor handle_nsip_read/handle_nsfrgre_read + * ns2: fix a msg leak when receiving REJECTED messages + * gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG + * ns2: parse the return code of gprs_ns2_ip_bind + * ns2: refactor ns2_prim_status_ind() + * ns2: status ind: add additional flags (first and persistent) + * ns2: vty: show all nse + * ns2: vty: allow the users (pcu/sgsn) to set a default bind + * ns2: vty: on `show ns` add information of NS binds + * gprs_ns2_vty_create: remove bind pointer check + * gprs_ns2: gprs_ns2_free(): add missing talloc_free + * gprs_ns2: fix SNS_ADD for IPv4 + * gprs_ns2: fix empty prefix in TLV Parse error + * gprs_ns2: add gprs_ns2_ip_bind_by_sockaddr() to search for binds by sockaddr + * gprs_ns2: gprs_ns2_ip_bind() check if the bind already exists + * gprs_ns2: add gprs_ns2_nse_nsei() to get the nsei of a nse + * gprs_ns2: add gprs_ns2_free_binds() to free all binds + * gprs_ns2: add gprs_ns2_free_nses() to free all NS-E + * gprs_ns2: const the return value of gprs_ns2_ip_vc_sockaddr / gprs_ns2_ip_bind_sockaddr + * gprs_ns2: rename gprs_ns2_ip_vc_sockaddr -> gprs_ns2_ip_vc_remote + * gprs_ns2: add gprs_ns2_ip_vc_local() return the local sockaddr + * gprs_ns2: add gprs_ns2_nse_sns_remote() returns the initial SNS address + * gprs_ns2: gprs_ns2_ip_vc_remote() the nsvc can be also const + * gprs_ns2: add gprs_ns2_nse_foreach_nsvc() + * gprs_ns2: Partial revert 48f63867 allow to create NS_ALIVE NSVC + * gprs_ns2: add gprs_ns2_ip_vc_equal() + * add osmo_sockaddr_to_str_buf/osmo_sockaddr_to_str + * gprs_ns2: remove the nsvc fsm timer when cleaning up the fsm + * ns2: add value strings for ns2_affecting_cause_prim_str & ns2_prim_str + * gprs_ns2: convert gprs_ns2_cause_str into an static inline + * libosmocore: change the memory management of NS2 + * ns2: fixup gprs_ns2_prim_strs + * ns2: check if ns_vc_alloc() fails in bind_connect() + * ns2: add support for frame relay + * ns2: implement link sharing selector + * ns2: move LL into public api + * ns2: move link layer type into NSE + * ns2: remove obsolete type GPRS_NS2_LL_E1 + * gprs_ns2_fr: remove include + * gprs_ns2: fix typo in comment + * gprs_ns2: use switch() case instead of multiple if in ns2_create_vc() + * gprs_ns2_sns: add missing transistion UNCONFIGURED -> SIZE + * gprs_ns2_sns: dynamic calculate the maximum NS-VCs + * gprs_ns2_sns: add missing S() to allow GPRS_SNS_EV_NO_NSVC happen + * gprs_ns2_sns: fix whitespaces and superflous comment + * gprs_ns2_sns: correct dynamic calculation + * gprs_ns2: introduce NS dialects + * gprs_ns2: move allocation of the SNS fsm into create_nse + * gprs_ns2: add member name to bind + * gprs_ns2: rework gprs_ns2_fr_connect*() + * gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE + * gprs_ns2_sns: rework IP-SNS initial remote + * gprs_ns2_sns: use different binds for the initial connection + * gprs_ns2_sns: introduce SNS Size/Config retries + * gprs_ns2: make nsvc argument const + * gprs_ns2: add gprs_ns2_fr_bind_role() to retrieve the fr role + * gprs_ns2: on ns2_create_vc parse the tlv before using it + * gprs_ns2_vty: udp: fixup dialect changes + * gprs_ns2: fr: fix crash when frame relay interface doesn't exists + * gprs_ns2: improve handling of TLV errors on new nsvcs + * gprs_ns2: don't pass the return code of reject_status_msg + * gprs_ns2: fr: implement a write queue + * gprs_ns2: fr: setup the device to correct FR/LMI settings + * gprs_ns2: add new vty2 + * gprs_ns2: sns: correct log message when no nsvcs available + * gprs_ns2: sns: don't send duplicated packets on retries + * gprs_ns2: sns: add log message when size/config retries exhausted + * gprs_ns2: don't start unconfigured fsm via FORCE_UNCONFIGURED + * gprs_ns2: fix force-unconfigured for IP-SNS NSE + * frame_relay: prevent null pointer exception when talloc fails + * frame_relay: link_alloc: move log message to the end + * gprs_ns2: rework frame relay load distribution function + * gprs_ns2_fr: setup_device: allow to setup a new dahdi device + * gprs_ns2: fr: check the device state before changing state + * gprs_ns2: use zero initialized memory for vty_binds + * utils: add osmo-ns-dummy + * gprs_ns2: call python vty tests + * gprs_ns2: set transfer cap in NS Status primitive + * gprs_ns2: check if persistent nsei or nsvc exists when creating dynamic NSE + * osmo-ns-dummy: allow to create dynamic NSEs + * gprs_ns2_vc: answer UNBLOCK on unblocked nsvc + * gprs_ns2: when calling nsvc_force_unconf for a dynamic NSE drop the NSE. + * gprs_ns2_sns: clear local and remote entries when SNS failed + * gprs_ns2: flag then NSE as dead in nse_free() + * gprs_ns2_vc_fsm: fix spaces and remove wrong comment + * test: gprs_ns2: don't leak the talloc context + * test: gprs_ns2: replace free_bind() with clear_pdus() + * test: gprs_ns2: free the nsi after each test + * gprs_ns2: add assert on most bind calls + * gprs_ns2: allow to use free_vc() with NULL + * osmo-ns-dummy: don't leak primitive messages + * gprs_ns2: implement BLOCK/UNBLOCK of a NSVC by vty + * gprs_ns2: correct handle BLOCK message on initator + * gprs_ns2_vc_fsm: rename all event to match RX_ or REQ_ + * gprs_ns2_vc_fsm: ensure all state is resetted via force_unconf + * gprs_ns2_vc_fsm: in RESET accept RESET as ACK + * gprs_ns2_vc_fsm: fix transitions for ALIVE state + * gprs_ns2_message: remove wrong comment + * gprs_ns2_vc_fsm: check NSEI match the NSE + * gprs_ns2_vc_fsm: check NSVCI match the NSE + * tests: gprs_ns2: add unitdata unit test + * gprs_ns2: always pass a tp to gprs_ns2_vc_rx + * gprs_ns2_vc_fsm: check NSEI match the NSE + * gprs_ns2_vc_fsm: check NSVCI match the NSE + * gprs_ns2: drop GPRS_ prefix of gprs_ns2_cs + * gprs_ns2: drop prefix of all internal exposed function + * gprs_ns2: drop the public prefix gprs_ from all static functions/structs/.. + * gprs_ns2: refactor: ensure all enums have GPRS_NS2_ + * gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty + * gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty + * gprs_ns2: remove api call gprs_ns2_dynamic_create_nse + * gprs_ns2: introduce gprs_ns2_vty_init_reduced() for the PCU + * gprs_ns2: correct vty config write + * gprs_ns2: prevent division by zero in load_sharing + * gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. + * gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING + * gprs_ns2: unify the handling of **result when bind already present. + * gprs_ns2_fr: free_bind(): first do the NULL check before using members + * frame_relay: fix NULL pointer deref + * gprs_ns2_frgre: set a correct gre pointer for ipv6 + * gprs_ns2_frgre: check iph/ip6h before passing them to rx functions + * gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state + * gprs_ns2_sns: add timeout to ST_CONFIG_SGSN + * gprs_ns2_sns: reset the N of timeout when entering a new state + * gprs_ns2: rename vty-command ip-sns -> ip-sns-remote + * gprs_ns2_vty: fix memory leak of vty_binds + * gprs_ns2: add signalling & data weights for UDP binds + * gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer + * gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime + * gprs_ns2_vty: use strcmp() instead of strncmp() + * gprs_ns2_vc_fsm: remove debug line of the alive_timer + * gprs_ns2: fix comment of alive NS-VC + * gprs_ns2_sns: fix typo in doxygen comment + * gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE + * gprs_ns2: rework IP-SNS binds + * gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` + * gprs_ns2: implement a simple load sharing for UDP + * gprs_ns2: fix typo in function name ns2_load_sharing_modulo + * gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership + * gprs_ns2_sns: rename fsm events to include RX or REQ prefix + * gprs_ns2_fr: pass MTU changes to the NSE + * gprs_ns2: truncate the NS_STATUS to the MTU + * gprs_ns2_message: tx_status: move all cause dependent code into the switch/case + * gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS + * gprs_ns2: ensure no duplicate UDP NSVC can be created + * gprs_ns2: free_nse: free the SNS fsm early + + [ Daniel Willmann ] + * gsm_08_16.h: Add missing header + * gprs_ns2: Make reason const + * libosmogb: Add a function to tx BVC RESET by nsei/bvci + * Add exported function btsctx_alloc to public header + * ns2: Add gprs_ns2_nsvc_state_name() to get the current state of a VC + * ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication + * ns2: Improve NSVC output + * ns2: Split 'initiater' into initiate_{reset,block} + * ns2: Add a function to set the NSVC FSM back to unconfigured + * ns2: Add a VTY command to reset NSVC FSM + * ns2: Fix docs for some NS2 vty commands + * logging: Calculate LOG_MAX_{CTX,FILTERS} from the enum + * ns2: Add log filtering by NSE/NSEI, fix NSVC filter on receive + * ns2: Fix argv index in logging filter VTY commands + * Declare osmo_ctx_init() in talloc.h + * bssgp: Add SUSPEND_NACK to osmo_pdef_bssgp + * logging: Remove duplicate color for DLSMS + * ns2_frgre: Fix missing break statement for recv from IPV6 + * bssgp_bvc_fsm: Handle block request from application correctly + * NS2: Fix bind selection of SNS NSVCs + * ns2: Add sanity check + * Refactor ns2_nsvc_create_ip* + * ns2: Fix memory leak in IP-SNS + * ns2: Fix assert when removing a bind listen + * ns2: Fix incompatible VTY configs when writing config + * tests/gb: Add more complex osmo-ns-dummy.cfg + * bssgp_bvc_fsm: Set/get maximum BSSGP PDU length + * bssgp2_enc_status: Truncate STATUS message to maximum PDU length + * bssgp_bvc_fsm: Consistent naming + + [ Philipp Maier ] + * command: add library command attribute for libosmo-sccp + * command: add library command attribute for libosmo-abis + * gsm_08_58: add proprietary IE to signal Repeated ACCH Capability + * gsm_04_08: add parser for Mobile Station Classmark 3 + * gsm_04_08: add parser for Mobile Station Classmark 3 + * bts_features: add feature BTS_FEAT_ACCH_REP + * gsm_08_58: add struct for RSL_IE_OSMO_REP_ACCH_CAP + * gsm_08_58: add rxqual field to RSL_IE_OSMO_REP_ACCH_CAP + * gprs_bssgp_util: complete bssgp_pdu_strings + * gprs_bssgp: add IE parser/generator for RIM Routing Information + * gprs_bssgp: add handling for BSSGP RIM primitives + * gsm_08_18: add struct to parse RIM PDU Indications + * bssgp_rim: add encoder/decoder for NACC related RIM containers + * bssgp_rim: move bssgp_parse_rim_ri and bssgp_create_rim_ri to gprs_bssgp_rim + * gprs_bssgp: add utilities to send and parse BSSGP rim PDUs + * gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers + * gprs_bssgp_rim: fix bug in dub_tlvp_header() + * gprs_bssgp_rim: add value strings for enum bssgp_nacc_cause + * gprs_bssgp_rim: add value strings for enum bssgp_ran_inf_app_id + * gprs_bssgp_rim: add value strings for enum bssgp_rim_routing_info_discr + * gprs_bssgp_rim: add functions to convert a RIM-RI to a string + * gprs_bssgp_rim: cosmetic: connect routing identifier strings with "-" + * gprs_bssgp: log source and destination RIM routing information + * gprs_bssgp: agregate RIM related code in gprs_bssgp_rim.c + * gsm48: add compare function for struct gprs_ra_id + * gsm_08_58, gsm_44_004: add struct for l1 information + + [ laforge ] + * Revert "pkgconfig: link to mnl if available" + + [ Oliver Smith ] + * tests/*: fix control reaches end of non-void func + * configure.ac: set -std=gnu11 + * sim: fix gcc 4.9.2 + -std=gnu11 error + + -- Pau Espin Pedrol Tue, 23 Feb 2021 14:03:31 +0100 + libosmocore (1.4.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 05069c5..b319132 100644 --- a/debian/control +++ b/debian/control @@ -31,10 +31,10 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore16 (= ${binary:Version}), - libosmogb11 (= ${binary:Version}), - libosmogsm15 (= ${binary:Version}), - libosmovty4 (= ${binary:Version}), + libosmocore17 (= ${binary:Version}), + libosmogb12 (= ${binary:Version}), + libosmogsm16 (= ${binary:Version}), + libosmovty9 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim2 (= ${binary:Version}), libosmousb0 (= ${binary:Version}), @@ -115,7 +115,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore16 +Package: libosmocore17 Section: libs Architecture: any Multi-Arch: same @@ -129,14 +129,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore16 library in particular is a collection of common code used in + The libosmocore17 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore16, + libosmocore17, libjs-jquery, libosmocodec-doc, libosmocoding-doc, @@ -151,7 +151,7 @@ . This package contains the documentation for the libosmocore library. -Package: libosmogb11 +Package: libosmogb12 Section: libs Architecture: any Multi-Arch: same @@ -172,7 +172,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogb11, + libosmogb12, libjs-jquery Description: Documentation for the Osmo GPRS Gb library This is part of the libosmocore "meta"-library. The libosmocore library @@ -183,7 +183,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm15 +Package: libosmogsm16 Section: libs Architecture: any Multi-Arch: same @@ -207,7 +207,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm15, + libosmogsm16, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library @@ -218,7 +218,7 @@ . This package contains the documentation for the libosmogsm library. -Package: libosmovty4 +Package: libosmovty9 Section: libs Architecture: any Multi-Arch: same @@ -239,7 +239,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmovty4, + libosmovty9, libjs-jquery Description: Documentation for the Osmo VTY library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmocore16.install b/debian/libosmocore17.install similarity index 100% rename from debian/libosmocore16.install rename to debian/libosmocore17.install diff --git a/debian/libosmogb11.install b/debian/libosmogb12.install similarity index 100% rename from debian/libosmogb11.install rename to debian/libosmogb12.install diff --git a/debian/libosmogsm15.install b/debian/libosmogsm16.install similarity index 100% rename from debian/libosmogsm15.install rename to debian/libosmogsm16.install diff --git a/debian/libosmovty4.install b/debian/libosmovty9.install similarity index 100% rename from debian/libosmovty4.install rename to debian/libosmovty9.install diff --git a/src/Makefile.am b/src/Makefile.am index e56b57e..2f18d09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=16:0:0 +LIBVERSION=17:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index ca64286..a5f191d 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=4:0:4 +LIBVERSION=5:0:5 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index d0db814..2ccb757 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=11:0:0 +LIBVERSION=12:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing \ diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index ccb2456..f1e2a5a 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=15:0:0 +LIBVERSION=16:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 4e2348b..52f3c6a 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:0 +LIBVERSION=2:1:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 81ff104..794b96c 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=8:1:4 +LIBVERSION=9:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3bc0826c0000be4d76235ed6b5be86d216ea2e4d Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:29:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:29:21 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E132-3b8f-dirty_=E2=86=92_1=2E3=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/23040 ) Change subject: Bump version: 1.2.0.132-3b8f-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.132-3b8f-dirty ? 1.3.0 Change-Id: I92b99ebab1d54e9cbdc8469d76105c55bcb03f36 --- M TODO-RELEASE M configure.ac M contrib/osmo-trx.spec.in M debian/changelog M debian/control M debian/patches/build-for-debian8.patch 6 files changed, 164 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/40/23040/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index c916fb1..e69de29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +0,0 @@ -* update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread() -* update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. -* update libosmocore dependency to > 1.4.x for osmo_fd_{read,write}_{enable,disable}() -* update libosmocore dependency to > 1.4.2 for osmo_gettid() diff --git a/configure.ac b/configure.ac index 8067fa7..5706a39 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,10 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.5.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/contrib/osmo-trx.spec.in b/contrib/osmo-trx.spec.in index 8f4bb48..b80d8e2 100644 --- a/contrib/osmo-trx.spec.in +++ b/contrib/osmo-trx.spec.in @@ -34,10 +34,10 @@ BuildRequires: pkgconfig(usrp) >= 3.3 %endif BuildRequires: pkgconfig(fftw3f) -BuildRequires: pkgconfig(libosmocoding) >= 1.3.0 -BuildRequires: pkgconfig(libosmocore) >= 0.12.0 -BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0 -BuildRequires: pkgconfig(libosmovty) >= 0.12.0 +BuildRequires: pkgconfig(libosmocoding) >= 1.5.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(uhd) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index 0ec7b9f..f69b2d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,157 @@ +osmo-trx (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Make logging category DLMS generic and reusable for other backends + * uhd: Use DEVDRV log category and support UHD >=3.11 logging framework + * uhd: Improve some logging lines printing UHD pretty-print output + * doc: clarify number of channels on B210 with multi-arfcn enabled + * radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions + * doc: Update vty reference xml file + * lms: Move initialization of field started to constructor + * lms: Drop unused define + * smpl_buf: Fix str_code() param and print unknown error val + * lms: Improve smpl_buf error logging + * lms: Change radioDevice constructor arg name to avoid masking instance attr + * lms: Make reference to std::vector unambiguous + * lms: Move rx_buffers allocation to constructor + * lms: Store device type specific parameters in one place + * lms: Make ts_offset and smpl rate coefs device-specific + * lms: Initial multi-arfcn support + * contrib/jenkins.sh: Reorder sanity checks + * debug.h: Avoid printing pthread_t type + * debug.h: Fix print format of chan in CLOGCHAN + * cosmetic: fix several typos found by codespell + * radioDevice: Drop unused RSSI param from readSamples API + * radioDevice: Drop unused isControl param from WriteSamples API + * Use OSMO_FD_READ instead of deprecated BSC_FD_READ + * Transceiver: Fix extra space in RSP NOISELEV error + * Transceiver: Implement TRXC cmd NOMTXPOWER + * UHDDevice: Implement getNominalTxPower() based on TxFrequency + * radioInterface: Operate on real Tx power attenuation rather than on device specific gains + * UHDDevice: Compute TxGain on UHD API based on expected Tx output power + * proto_trxd: Fix UndefinedBehaviorSanitizer from ubsan + * Transceiver: Allow sending negative nominal tx power in RSP NOMTXPOWER + * LMSDevice: Compute TxGain on LimeSuite API based on expected Tx output power + * Drop old TxGain APIs from parent radioDevice abstract class + * {UHD,LMS}Dervice: Log expected resulting TxPower when setting device specific TxGain + * cosmetic: trx_rate_ctr: Fix whitespace + * trx_rate_ctr: Fix immediate rescheduling on per-sec thresholds + * Rename device specific rate counter multi-thread helpers + * Introduce rate counter tx_stale_bursts + * TransceiverState: Initialize ctrs field in constructor + * doc/manuals: Update thread documentation after dropping CTRL sock threads + * trx_rate_ctr: Fix locking wrong mutex + * Introduce rate counters to detect issues in received Dl bursts from TRXD + * Transceiver: Fix race condition obtaining Dl burst from Upper layer + * Add rate counter for missing Txbursts when scheduled towards the radioInterface + * Transceiver: Provide initial value for TransceiverState::mFiller in constructor + * Transceiver: Use already obtained value from Rx msg structure + * Transceiver: Restrict conditions where FN gaps are detected + * trx_rate_ctr: Lower some log levels + * Introduce CTR log category + * Transceiver: Lower some log levels which have an associated counter + * Transceiver: Check log level before generating burst str representation + * Transceiver: Add several rate_ctr for rx error conditions + * Use new libosmovty cpu sched config features + * debian: Update debian8 osmo-trx specific patch + * jenkins.sh: Verify distro-specific patches apply + * ipc: fix var declaration in for loop + * Add support for TRXC MUTE command + * arch: x86: Fix convolve optimizations breaking signal + * contrib/jenkins: Enable parallel make in make distcheck + * Transceiver: Pass config struct instead of large list of params + * Calculate RSSI offset based on RxGain configuration + * main: generate coredump and exit upon SIGABRT received + * ipc: Fix wrong reference to BTS in log line + * ipc-driver-test: Allow setting dir prefix for UD socket + * radioInterfaceMulti: Fix memory leak upon close() + * ChannelizerBase: Fix memory leak + * Threads.cpp: Use already existing gettid wrapper function + * Replace my_gettid with libosmocore osmo_gettid API + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Philipp Maier ] + * debug: use LOGL_NOTICE for log category DDEV + * doc: do not set the base-port of the trx + * doc: apply an rssi-offset of 28 by default. + * doc: switch log levels to notice + * Transceiver: Log when sending of CLK indications begins + * vty: add attributes to VTY commands indicating when they apply + * osmo-trx: add commandline option --vty-ref-xml + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + * transceiver: check the right vector + * transceiver: get rid of the ctrl threads + * add kernel style .clang-format with 120 chars per line limit + * devices: reset internal smart sample buffers upon stop + * transceiver: optimize code if optimizations are enabled + * transceiver: initialize reorder flag so we don't miscount + + [ Harald Welte ] + * PRBS tool sending PRBS sequence to TRX + * prbs-tool: Add error simulation capabilities + * utils: Ensure content of this directory is included in 'make dist' + * prbs-tool: Don't require C99 + * RPM spec file: Require uhd-firmware for osmo-trx-uhd + * osmo-trx.spec.in: Use %config(noreplace) to retain current config file + * Fix build on Debian8 + * [cosmetic] radioInterfaceMulti: More comments + * [cosmetic] radioIntefaceMulti: Fix whitespace / indent + * ipc: Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() wherever applicable + * Use osmo_fd_*_{disable,enable} + * README update + * manual: Fix typo OsmTRX -> OsmoTRX + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Vadim Yanitskiy ] + * UHDDevice: catch LookupError/IndexError in set{Rx,Tx}Antenna() + * debian/control: change maintainer to the Osmocom team / mailing list + * proto_trxd: cosmetic: 'if' is not a function, add space + * vty: add multi-ARFCN specific warning for chan N > 0 + * radioDevice: fix set_antennas(): consider MULTI_ARFCN mode + * device/lms: fix: 'trx_vty.h' header requires C linkage + * device/lms: fix missing semicolon in LMSDevice::assign_band_desc() + * device/lms: get rid of 'using namespace std' + * device/common/Makefile.am: remove $(LMS_CFLAGS) from AM_CXXFLAGS + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * device: drop unreasonable LIBOSMO{CTRL,VTY}_{CFLAGS,LIBS} + * Transceiver: use size_t and ARRAY_SIZE() in constructor + * Transceiver: explicitly init m{Rx,Tx}LowerLoopThread + * vty: fix documentation for 'swap-channels (disable|enable)' + * vty: fix documentation for 'egprs (disable|enable)' + * vty: fix documentation for 'rx-sps (1|4)' and 'tx-sps (1|4)' + * vty: cosmetic: use VTY_IPV4_CMD in 'bind-ip' / 'remote-ip' + * vty: fix documentation for 'multi-arfcn (disable|enable)' + * vty: remove groundless statement about filler type 'dummy' + * vty: auto-generate cmd and doc strings for cfg_filler_type_cmd + * vty: fix documentation for 'ext-rach (disable|enable)' + * main: use logging API to print SIMD info instead of printf() + * doc/manuals: generate XML VTY reference at build-time + * vty: fix swapped documentation for 'filler type' command + * Transceiver: fix integer division in addRadioVector() + * Transceiver: use proper factor for amplitude scaling + * Add a (hidden) VTY parameter for Rx/Tx freq. shifting + + [ Eric Wild ] + * osmo-trx-ipc + + [ Alexander Couzens ] + * osmo-trx.spec: move ipc-driver-test into package ipc-test + + [ Sylvain Munaut ] + * sigProcLib: fix C/I computation for 8-PSK modulated bursts + + -- Pau Espin Pedrol Tue, 23 Feb 2021 14:27:15 +0100 + osmo-trx (1.2.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 12d9af5..d1532f2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libtalloc-dev, libusrp-dev, liblimesuite-dev, - libosmocore-dev (>= 1.3.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-trx diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index ee3bd19..074dca9 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, - libosmocore-dev (>= 1.3.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I92b99ebab1d54e9cbdc8469d76105c55bcb03f36 Gerrit-Change-Number: 23040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:31:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:31:26 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23041 ) Change subject: osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines ...................................................................... osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines Change-Id: Iff09a090284a0f65fd798d99265cba51f3309923 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/23041/1 diff --git a/osmo-release.sh b/osmo-release.sh index b4db440..b63f981 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -164,7 +164,7 @@ set -e if [ -f "TODO-RELEASE" ]; then - grep '#' TODO-RELEASE > TODO-RELEASE.clean + grep '#' TODO-RELEASE > TODO-RELEASE.clean || true mv TODO-RELEASE.clean TODO-RELEASE git add TODO-RELEASE fi -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iff09a090284a0f65fd798d99265cba51f3309923 Gerrit-Change-Number: 23041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:32:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:32:08 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E534-fcbf-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23032 ) Change subject: Bump version: 1.4.0.534-fcbf-dirty ? 1.5.0 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I25611e9fb334e880c36f1c7c180d5a1d00298835 Gerrit-Change-Number: 23032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:32:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:32:23 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Omit tab whitespace matching debian/control versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23035 ) Change subject: osmo-release.sh: Omit tab whitespace matching debian/control versions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I054245b54adfaae3d51bcfc3a3d1e3ecbaa5f116 Gerrit-Change-Number: 23035 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 13:32:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:32:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:32:26 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E535-e387-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23039 ) Change subject: Bump version: 1.4.0.535-e387-dirty ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3bc0826c0000be4d76235ed6b5be86d216ea2e4d Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 13:32:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:32:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:32:32 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23041 ) Change subject: osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iff09a090284a0f65fd798d99265cba51f3309923 Gerrit-Change-Number: 23041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 13:32:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:36:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:36:02 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Omit tab whitespace matching debian/control versions In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23035 ) Change subject: osmo-release.sh: Omit tab whitespace matching debian/control versions ...................................................................... osmo-release.sh: Omit tab whitespace matching debian/control versions Change-Id: I054245b54adfaae3d51bcfc3a3d1e3ecbaa5f116 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 31cd1a0..b4db440 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -41,7 +41,7 @@ if [ "z$debctrl_match_count" != "z1" ]; then echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!" else # 1 match: - parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g") + parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | tr -d "\t" | sed "s/>=/ /g") debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g") debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2) if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver" != "z$debctrl_ver" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I054245b54adfaae3d51bcfc3a3d1e3ecbaa5f116 Gerrit-Change-Number: 23035 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:36:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:36:02 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E0=2E535-e387-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23039 ) Change subject: Bump version: 1.4.0.535-e387-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.0.535-e387-dirty ? 1.5.0 Change-Id: I3bc0826c0000be4d76235ed6b5be86d216ea2e4d --- M TODO-RELEASE M contrib/libosmocore.spec.in M debian/changelog M debian/control R debian/libosmocore17.install R debian/libosmogb12.install R debian/libosmogsm16.install R debian/libosmovty9.install M src/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 14 files changed, 602 insertions(+), 50 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index e1b1507..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,10 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmogsm new API gsm0808_create_sapi_reject_cause() with cause argument -libosmogsm ABI change struct osmo_gprs_cell_options size changed (new field at the end) -libosmogsm API change struct ipac_preproc_ave_cfg: new zero-sized flexible array member at end -libosmovty ABI change struct cmd_element: add a field for program specific attributes -libosmovty ABI change struct vty_app_info: optional program specific attributes description -libosmoctrl ABI change struct ctrl_handle changed size (new field "reply_cb" at the end) -libosmogsm new API osmo_rai_cmp(), osmo_cgi_ps_cmp() diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 93e5e16..b6791eb 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -111,13 +111,13 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmocoding. -%package -n libosmocore16 +%package -n libosmocore17 Summary: Osmocom core library # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: System/Libraries -%description -n libosmocore16 +%description -n libosmocore17 libosmocore is a library with various utility functions shared between OpenBSC and OsmocomBB. @@ -126,7 +126,7 @@ # crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+ License: GPL-2.0-only AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmocore16 = %version +Requires: libosmocore17 = %version Requires: libtalloc-devel %description -n libosmocore-devel @@ -163,12 +163,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoctrl. -%package -n libosmogb11 +%package -n libosmogb12 Summary: Osmocom GPRS Gb Interface (NS/BSSGP) library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogb11 +%description -n libosmogb12 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -179,7 +179,7 @@ License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogb11 = %version +Requires: libosmogb12 = %version Requires: libosmovty-devel = %version %description -n libosmogb-devel @@ -188,12 +188,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmogb. -%package -n libosmogsm15 +%package -n libosmogsm16 Summary: Osmocom GSM utility library License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: System/Libraries -%description -n libosmogsm15 +%description -n libosmogsm16 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -208,7 +208,7 @@ License: GPL-2.0-or-later AND AGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmogsm15 = %version +Requires: libosmogsm16 = %version %description -n libosmogsm-devel The libosmogsm library in particular is a collection of common code @@ -246,12 +246,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmosim. -%package -n libosmovty4 +%package -n libosmovty9 Summary: Osmocom VTY interface library License: GPL-2.0-or-later Group: System/Libraries -%description -n libosmovty4 +%description -n libosmovty9 libosmocore is a package with various utility functions that were originally developed as part of the OpenBSC project. @@ -263,7 +263,7 @@ License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: libosmocore-devel = %version -Requires: libosmovty4 = %version +Requires: libosmovty9 = %version %description -n libosmovty-devel The libosmovty library implements the interactive command-line on the @@ -322,18 +322,18 @@ %postun -n libosmocodec0 -p /sbin/ldconfig %post -n libosmocoding0 -p /sbin/ldconfig %postun -n libosmocoding0 -p /sbin/ldconfig -%post -n libosmocore16 -p /sbin/ldconfig -%postun -n libosmocore16 -p /sbin/ldconfig +%post -n libosmocore17 -p /sbin/ldconfig +%postun -n libosmocore17 -p /sbin/ldconfig %post -n libosmoctrl0 -p /sbin/ldconfig %postun -n libosmoctrl0 -p /sbin/ldconfig -%post -n libosmogb11 -p /sbin/ldconfig -%postun -n libosmogb11 -p /sbin/ldconfig -%post -n libosmogsm15 -p /sbin/ldconfig -%postun -n libosmogsm15 -p /sbin/ldconfig +%post -n libosmogb12 -p /sbin/ldconfig +%postun -n libosmogb12 -p /sbin/ldconfig +%post -n libosmogsm16 -p /sbin/ldconfig +%postun -n libosmogsm16 -p /sbin/ldconfig %post -n libosmosim2 -p /sbin/ldconfig %postun -n libosmosim2 -p /sbin/ldconfig -%post -n libosmovty4 -p /sbin/ldconfig -%postun -n libosmovty4 -p /sbin/ldconfig +%post -n libosmovty9 -p /sbin/ldconfig +%postun -n libosmovty9 -p /sbin/ldconfig %post -n libosmousb0 -p /sbin/ldconfig %postun -n libosmousb0 -p /sbin/ldconfig @@ -365,7 +365,7 @@ %_libdir/libosmocoding.so %_libdir/pkgconfig/libosmocoding.pc -%files -n libosmocore16 +%files -n libosmocore17 %defattr(-,root,root) %_libdir/libosmocore.so.16* @@ -391,7 +391,7 @@ %_libdir/libosmoctrl.so %_libdir/pkgconfig/libosmoctrl.pc -%files -n libosmogb11 +%files -n libosmogb12 %defattr(-,root,root) %_libdir/libosmogb.so.11* @@ -403,7 +403,7 @@ %_libdir/libosmogb.so %_libdir/pkgconfig/libosmogb.pc -%files -n libosmogsm15 +%files -n libosmogsm16 %defattr(-,root,root) %_libdir/libosmogsm.so.15* @@ -428,7 +428,7 @@ %_libdir/libosmosim.so %_libdir/pkgconfig/libosmosim.pc -%files -n libosmovty4 +%files -n libosmovty9 %defattr(-,root,root) %_libdir/libosmovty.so.4* diff --git a/debian/changelog b/debian/changelog index 317fefe..d83a232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,562 @@ +libosmocore (1.5.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty/command: cosmetic: simplify conditions in in config_list_cmd + * vty/command: cosmetic: fix formatting of config_help_cmd + * vty/command: cosmetic: drop redundant line break + * vty/command: fix switch / case coding style in vty_go_parent() + * vty/command: cosmetic: swap i and j in vty_dump_element() + * gsm0808: add gsm0808_create_sapi_reject_cause() + * macaddr: fix osmo_get_macaddr(): return -1 if no device is found + * macaddr: fix osmo_macaddr_parse(): return meaningful error codes + * lapdm_pad_msgb(): cosmetic: use GSM_MACBLOCK_PADDING + * lapd_test: fix wrong comment in lapdm_establish() + * lapd_test: rename func=UA (RR) CM Service Request: s/ua/ua_cm/ + * lapd_test: fix: print all messages to stdout, not stderr + * lapd_test: add a test checking SAPI0/SAPI3 prioritization + * lapdm: fix SAPI-0/SAPI-3 frame prioritization on DCCH + * logging: refactor and simplify log_target_destroy() + * logging: fix log_target_destroy(): properly close syslog + * logging: fix memleak in log_target_create_file() + * vty: fix 'Unsigned compared against 0' generate_cpu_hex_mask() + * gsm0808: fix: do not encode invalid encryption algorithm + * vty: add program specific attributes to VTY commands + * vty: print program specific attributes in the XML reference + * vty: cosmetic: drop redundant 'break' statements + * vty: cosmetic: s/width/cmd_width/g in vty_describe_command() + * vty: cosmetic: fix missing curly braces in vty_describe_command() + * vty/command: introduce new attribute CMD_ATTR_IMMEDIATE + * vty/command: reflect global attributes in the XML reference + * tests: do not ignore stderr of vty_test, also match it + * vty: check for duplicate flags in application specific attributes + * vty: check for reserved flags in application specific attributes + * vty/command: add global command attribute CMD_ATTR_NODE_EXIT + * vty/command: add CMD_ATTR_LIB_COMMAND and install() API wrappers + * vty: use install_lib_element() and install_lib_element_ve() + * vty/command: introduce API for the library specific attributes + * vty: introduce and use VTY_CMD_USR_ATTR_NUM + * vty/command: introduce a command to list attributes + * vty/command: print attribute flags in the output of 'list' + * tests/vty: verify 'show vty-attributes' / 'list' commands + * vty/command: assign flags to CMD_ATTR_{IMMEDIATE,NODE_EXIT} + * vty/command: restrict the use of '.', '!', and '@' as flags + * vty: fix vty_dump_element(): do not print empty + * socket: make the arguments of osmo_sockaddr_cmp() const + * gprs_ns2: make struct osmo_sockaddr pointers const + * rsl: rsl_chan_nr_str_buf(): use ABIS_RSL_CHAN_NR_CBITS_* macros + * logging: introduce 'systemd-journal' target + * vty: introduce the expert mode and a command to enable it + * vty/command: make some 'struct cmd_element' pointers const + * vty/command: introduce vty_dump_xml_ref_mode() + * vty/command: add CMD_ATTR_HIDDEN to CMD_ATTR_PUBLIC_MASK + * application: do not document unrelated forward-declarations + * vty/command: fix: restrict the expert mode to the current session + * fix spelling in 'value_string' arrays: existAnt -> existEnt + * gsm48: add missing RR cause value definitions + * vty/command: add 'hidden only' VTY reference generation mode + * bts_features: add missing description for BTS_FEAT_ACCH_REP + * core/linuxlist: do not use 'new' as a parameter name + * protocol/gsm_08_58.h: add ip.access Power Control structures + * protocol/gsm_08_58.h: add Osmocom specific EWMA AVG algo + * logging: revert color of LGLOBAL category back to white + * gsm_08_58: fix wrong field order in 'struct ipac_preproc_pc_thresh' + * gsm_08_58: add flexible array member to 'struct ipac_preproc_ave_cfg' + * gsmtap_util: SNR can be negative, use a signed integer + * gprs_ns2_sns: always check rc of osmo_sockaddr_str_from_sockaddr() + * gprs_ns2_fr: fix resource leaks due to early return in set_ifupdown() + * gprs_bssgp: fix uninitialized struct fields in bssgp_create_rim_ri() + * bts_features: s/Repeation/Repetition/ in osmo_bts_features_descs[] + * gprs_bssgp: abuse gsm48_encode_ra() to encode TAC + * fixup: configure.ac: fix: do not define HAVE_NEON unconditionally + * gsm_7bit_encode_n(): test encoding of more than 250 septets + * gsm_7bit_encode_n(): fix integer overflow in gsm_septets2octets() + * gsm0808: use msgb_tv16_put() and osmo_store32be() + * bssgp_bvc_fsm: check return value of osmo_fsm_register() + * tlv: add msgb_tv32_put(), similar to msgb_tv16_put() + * tlv: clarify documentation for msgb_tv{16,32}_put() + + [ Eric ] + * vty cpu sched: do not assert if sched impossible + * pkgconfig: link to mnl if available + + [ Pau Espin Pedrol ] + * vty: Fix cpu-sched VTY node name + * sock: osmo_sock_init2_multiaddr: decouple addr resolution from socket creation + * socket: multiaddr: Support IPv4 + IPv6 addresses in SCTP associations + * socket: Log proper getaddrinfo() error + * osmo_sock_get_ip_and_port(): Support IPv6 sockets + * l1sap.h: Fix typo in doxygen documentation + * osmo_sock_inti2_multiaddr: Fix memleak and free uninitialized mem + * socker: Remove AI_ADDRCONFIG from getaddrinfo flags + * tests: Split SCTP tests to its own file and run them conditionally + * ipa: Fix wrong output log formatting + * socket: Allow binding to :: (IPv6) and connecting to IPv4-only on the remote + * socket: Add support for AF_INET6 in osmo_sockaddr_to_str_and_uint() + * socket: Use AF_UNSPEC instead of PF_UNSPEC calling getaddrinfo + * socket: Fix stack-buffer-overflow in osmo_sock_local_ip() + * socket: fix wrong ipv6 dst buf size passed in osmo_sock_local_ip + * socket: Add some osmo_sockaddr print helpers + * tests: Add test to showcase osmo_sock_init2 bug with AF_UNSPEC + * socket: Fix bug in osmo_sock_init2(AF_UNSPEC) matching IP versions + * logging: Avoid printing OSMO_LOGCOLOR_END if no color was used + * osmo_strlcpy: Avoid calling memcpy with size=0 + * osmo_strlcpy: Clarify length calculation + * cosmetic: Fix typo in API doc + * gprs_ns2_udp: Avoid dangling freed struct in list if binding fails + * vty: Fix left shifting out of range on signed variable + * cosmetic: vty: Fix trailing whitespace + * gsm: Fix make distcheck with parallel make + * contrib: jenkins: Enable parallel make in make distcheck + * lapdm: Drop log lines printing fmt=B + * lapdm: Split lapd_rx_u() spaghetti into one function per message type + * lapdm: Allow SABM L=0 in Timer Recovery State + * gb: ns2_sns: Fix missing trailing newline char in log line + * gb: ns2_sns: Add missing value_string entry for GPRS_SNS_EV_NO_NSVC + * vty: Mark cpu_sched_vty commands with attr immediate + * tdef: Introduce OSMO_TDEF_US unit + * tests: Fix tdef_test on 32bit platforms + * bitvec: Fix left shifting out of range on signed variable + * cosmetic: serial: Fix typo in comment + * serial: Fix typo in debug log line + * serial: Log error if tcgetattr() or tcsetattr() fail + * serial: Introduce API osmo_serial_speed_t + * Revert "tests: Fix tdef_test on 32bit platforms" + * tests: Fix tdef_test on 32bit platforms + * statsd report: Fix wrong fmt specificier generating wrong stats + * gsm: Add enum for Network Feature Support IE + * Include mnl.h iif --enable-libmnl + * gb: Import mnl.h iif --enable-libmnl + * bssgp: Remove newly added log line warning about NOOP + * rest_octets: add Serving Cell Priority Parameters + * gsm: si13: Fix encode of EGPRS_PACKET_CHANNEL_REQUEST + * si2quater: fix budget calculation for multiple EARFCNs + * gsm: append_eutran_neib_cell: Fix SI2quater EARFCN list + * GPRS Cell Options (SI13): Add REL-4 CCN_ACTIVE bit + * Revert "rest_octets: fix encoding of 3G Early Classmark Sending Restriction" + * rest_octets: Fix decoding of SI3 3G Early Classmark Sending Restriction + * gitignore: Ignore *~ + * ctrl: Allow handling CTRL get/set replies in user defined code + * Intoduce Packet Switch CGI + * ctrl: ports.h: Add OSMO_CTRL_PORT_BSC_NEIGH + * gsm: Add missing osmo_*_cmp symbols to libosmogsm.map + * gsm: Introduce osmo_{rai,cgi_ps}_cmp() APIs + * gprs_bssgp_prim.h: Add missing includes + * Revert "gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty" + * ctrl_connection: Initialize write_queue.bfd.fd to -1 during allocation + * cosmetic: fix typo in comment + * gsm: Fix wrong length in SI13 GPRS Cell Options IE + * gsm: bts_features: Introduce BTS_FEAT_CCN + * Fix struct bitfields on big endian systems + * cosmetic: Move comment one line below in append_gprs_cell_opt + * gsm: Fix bitfield order in dtap_header + * comsetic: gsm0808_test: Fix trailing whitespace + * gsm: Support converting to cgi-ps in gsm0808_cell_id_from_cgi() + * gsm0808_utils: Move static function further up in file + * gsm: Fix encoding of gsm0808_cell_id_list2 with CGI-PS types + * logging: gsmtap: Fill PID field for each message + * Introduce osmo_gettid() API + * logging: gsmtap: Fix fill PID field not stored in network byte order + * logging: gsmtap: Store TID instead of PID in pkt hdr + * gsm: Introduce API osmo_gsm48_rest_octets_si13_decode + * logging: Allow prefixing thread ID to each log line + * tests: Set print_category values explicitly + * Drop use of log_set_print_filename() API inside libosmocore + * logging: Deprecate API log_set_print_filename + * osmo-release.sh: Omit tab whitespace matching debian/control versions + + [ Harald Welte ] + * gsmtap: Add definitions for E1/T1 payload (LAPD, TRAU, FR) in GSMTAP + * Add VTY + CTRL ports for upcoming OsmoSMLC + * gprs_ns2_sns: Fix compilation on Debian 8 + * ipaccess.h: Add more enum values and 'official' names + * ns2: Improve/extend doxygen comments for new ns2 implementation + * ns2: Use NULL and not '0' when returning a NULL-Pointer + * gprs_ns2: Mark gprs_ns2_validate_* as static + * write_queue: Add osmo_wqueue_enqueue_quiet() + * write_queue: use msgb_{en,de}queue_count() + * write_queue: Re-enqueue msgb if write_cb returns -EAGAIN + * logging_vty: set osmo_stderr_target to NULL on "no log stderr" + * logging: Introduce MAX_LOG_SIZE for the magic number 4096 + * bssgp: Don't include RA-ID in BVC-RESET for BVCI=0 (signalling) + * bssmap_le/bsslap tests: We must use %td for ptrdiff_t printing + * osmo_float_str_to_int: When using strtoll(), use LLONG_{MAX,MIN} + * gprs_ns2: Fix parsing of SNS-{ADD,DEL,CHANGE_WEIGHT} + * gsm48_rest_octets: Add parser for SI4 rest octets + * [cosmetic] rest_octets: Follow coding style regarding {} + * ns2: More verbose comments on gprs_ns2_vc_mode + * select: Introduce osmo_fd_{read,write}_{enable,disable}() + * select: Migrate over to poll() + * card_fs_usim.c: Add support for DF.5GS directory + * Revert "gsm_04_08: add parser for Mobile Station Classmark 3" + * card_fs_usim: Add definitions of DF.ProSe and DF.ACDC + * bssgp: Input argument to bssgp_tlv_parse() should be 'const' + * ns2: permit multiple nsvci in one nse in VTY + * frame_relay: Fix some spelling/language issues + * Revert "ns2: permit multiple nsvci in one nse in VTY" + * gprs_ns2_vty: Fix VTY documentation errors + * frame_relay: Fix null pointer dereference in DLC/PVC delete + * frame_relay: Fix error path on ioctl() failure + * gprs_ns2: Introduce gprs_ns2_lltype_str() for link layer name + * gprs_ns2_fr: Print Frame Relay 'role' in VTY + * gprs-ns2: Fix stringification of NS/FR NSVCI + * gprs_ns2: Don't return an empty string in case of unknown LL + * cosmetic: frame_relay: Fix typos + * gprs_ns2: Print link layer and global ALIVE/DEAD state + * gprs_ns2_vty: Differentiate 'show ns binds' and 'show ns entities' + * gprs_ns2_vty: Show NSVCI in dump_nsvc() + * gprs_ns_vty: Unify display of NSVCI on VTY in 'show ns entities' + * gprs_ns2_vty: Print all relevant data on each NS-VC + * gprs_ns2_udp.c: Fix typo - it's a DSCP and not a DCSP + * Integrate libmnl (minimal netlink) library with libosmocore select loop + * gprs_ns2_fr: Monitor the kernel net-device link state + * gsm_08_18.h: Update enums for message types and IEs with Release 15 + * gprs_ns2_vty: Re-introduce a 'show ns' command + * libosmogb: Add missing LIBMNL_CFLAGS + * mnl: Use mnl_socket_open() insatead of mnl_socket_open2() + * gprs_ns2_fr: remove include + * bssgp: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * gprs_ns2: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * bssgp: Update bssgp_pdu_strings with Release 15 + * bssgp: Fix typo in BSSGP Message Type enum + * Add hlist and hashtable from Linux kernel + * Use explicit type-casting in hlist_del() for C++ compatibility + * gsm_08_18.h: Add some PDU definitions still missing + * hash/log2: Add generic implementations of fls() and fls64() + * log2.h: Use uintXX_t instead of kernel specific types + * log2.h: Avoid redefining __always_inline + * ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state + * Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols + * tlv: Introduce enum with error codes for TLV parser functions + * bssgp: Add osmo_tlv_prot_def for BSSGP + * gsm_08_18.h: Add #defines for [extended] feature bits + * tlv.h: Add msgb_tvlv_put_{16,32}be() + * logging: Introduce DLBSSGP logging constant + * gb: Add beginnings of a new BSSGP implementation + * logging: Assing different 8bit colors to built-in subsystems + * bssgp2: Encoding + Decoding functions for BVC and MS flow control + * bssgp_bvc_fsm: Add basic BVC flow control rx/tx support + * gprs_ns2_fr.c: Skip extraneous FIONBIO + * gprs_ns2_fr: guard against race between socket(AF_PACKET) and bind() + * gprs_ns2_fr: use ETH_P_HDLC instead of ETH_P_ALL + * Fix VTY syntax for newly-introduced NS2 timers + * gors_ns2_vty: Fix saving of new NS2 timers + * gprs_ns2_fr: Avoid stringop-truncation warning + * gprs_ns2_fr: Use OSMO_STRLCPY_ARRAY() where possible + * fsm: Add osmo_fsm_inst_broadcast_children() + * vty: Fix left shifting out of range on signed variable + * lapd_core: Don't dereference data link after sending PRIM_DL_REL + * cbsp: Fix encoding of "ETWS Warning Security Info" IE + * cbsp: Fix osmo_cbsp_recv_buffered() for KEEP-ALIVE-COMPLETE + * cbsp: Fix parsing DCS in decode of WRITE-REPLACE + * Add inter-thread queue + * tlv_parser: Fix various out-of-bounds accesses + * gprs_ns2_fr: reduce duplication between gprs_ns2_fr_connect / connect2 + * gprs_ns2: Give NS-VC FSMs a proper name/identifier + * ns2: delay NS_AFF_CAUSE_RECOVERY until NS-VC for data + sig are unblocked + * vty/fsm_vty: Add vty_out_fsm2() + vty_out_fsm_inst2() with prefix + * ns2: Properly indent VTY output + * ns2: Unify logging context via log macros + * logging_vty: Fix saving of "logging print file .. last" + * gprs_ns2_test: Fix compilation on Debian 8 + * Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE" + * Revert "gprs_ns2_vc_fsm: check NSEI match the NSE" + * ns2: Use proper return value from write_queue callback function + * ns2: Log ERROR if we cannot transmit a packet due to ENOBUFS + * osmo-ns-dummy: Add simple NS traffic generator + * ns2: Work around AF_PACKET socket ENOBUFS problems + * ns2: Use named array initializers to avoid mistakes + * ns2: encapsulate calls to nsvc->bind->send_vc() + * ns2: Increment Rx and Tx byte / packet counters + * ns2: Properly report packet drops in FR code + * ns2: count number of dropped packets / bytes on transmit + * ns2: Implement more rate counters + * ns2: Add a rate_ctr for each NS-UNBLOCK + * ns2: Move to one common/shared ns2_bind_alloc() + * ns2: Memory allocation failures are ENOMEM, not ENOSPC + * ns2: Rename nsi->rate_ctr_idx to nsi->nsvc_rate_ctr_idx + * ns2: Introduce a per-bind stat_item group with backlog length + * ns2: Fix typos in comments + * ns2: Print NS-STATUS.ind primitives to the log + * ns2: cosmetic: fix indent levels + * frame_relay: Send "Fuil Status" ENQUIRY after link recovers + * frame_relay: Add status call-backs for link + DLC status changes + * frame_relay: Discard received messages for DLC not yet active + * frame_relay: cosmetic: Unify log syntax when discarding Rx packets + * ns2: Don't automatically re-start FSM at FORCE_UNCONFIGURED + * ns2: Stop test procedure when going into unconfigured state + * ns2: Don't start sending NS-RESET until FR DLC is available + * osmo-ns-dummy: Add "mirror-mode" to mirror back any received packets + * initial support for static userspace probes via systemtap + * Enable systemd-journald log target in debian + rpm packaging + * gb: frame_relay: Factor-out function to set link as dead + * gb: frame_relay: Detect link outage on "last receive seq nr == 0" + * frame_relay; Fix Q.933 async STATUS at DLC creation + * ns2: Name NSVC FSM events consistently + * ns2: Don't queue Q.933 LMI messages; only store most recent ones + * ns2: improve backlog handling on interface up/down + * ns2: Don't try to add packets to the backlog on real errors + * README.md: Use https everywhere + * ns2_fr: Fix null pointer deref in error path + * ns2_fr: Fix heap-use-after-free in error recovery path + * BVC FSM: Treat overlapping BVC-RESET as implicit ACK + * support for stats static userspace probes via systemtap + * CBSP: fix encoding/decoding of keep-alive repetition period + * CBSP: Fix encoding of warning period + + [ Neels Hofmeyr ] + * comment: mention spec reference in cbsp.[ch] + * comment: typo in cbsp.h + * bitXXgen: ensure not reading/storing past valid size + * bitXXgen: add bitgen_test.c + * bitXXgen: add osmo_loadXXbe_ext_2() to get right-adjusted values + * add osmo_use_count_to_str_c() + * osmo_use_count_to_str: make robust against unused use_count + * add osmo_float_str_to_int() and osmo_int_to_float_str_*() + * add GAD coding for Location Services + * add BSSLAP coding for Location Services + * add BSSMAP-LE coding for Location Services + * add BSSMAP coding for Location Services + * doc tweaks for osmo_float_str_to_int(), osmo_int_to_float_str*() + * gad.c: try to workaround warning for "h.type >= 0" + * gad.c: fix rc for osmo_gad_enc_ell_point_unc_circle() + * gprs_ns2_fr.c: compiler error: replace strncpy() with OSMO_STRLCPY_ARRAY() + * fix strncpy bug in gprs_ns2_fr_bind() + + [ Alexander Couzens ] + * sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port + * tests/socket: add testcase test_get_ip_and_port + * socket: introduce osmo_sock_init_osa & osmo_sock_init_osa_ofd + * socket: add osmo_sockaddr_cmp() + * gb/gprs_bssgp: remove superfluous whitespace + * gb/common_vty: use void * + * add osmo_sockaddr_local_ip() to determine the local address for a remote. + * Gb: add a second NS implementation + * libgb/ns: allow to create NS_ALIVE NSVC + * gb/gprs_bssgb: check if talloc failed on btsctx->fc + * gb/gprs_bssgb: ensure the fc timer has been stopped when freeing bssgp_bvc + * ns2: remove bssgp specific msgb->cb parts + * ns2: vty: add missing docs for IPv6 address + * ns2: check the specific bit of NS SDU Control bits + * ns2: refactor nsvc_by_ functions + * ns2: ns2_recv_vc: remove unused parameter nsi + * ns2: vty: fix behavior of vtyvc_by_nsei when vtyvc isn't found + * ns2: refactor handle_nsip_read/handle_nsfrgre_read + * ns2: fix a msg leak when receiving REJECTED messages + * gsm_12_21: add osmo_oml_nsvc_address_type for OML NM_ATT_OSMO_NS_LINK_CFG + * ns2: parse the return code of gprs_ns2_ip_bind + * ns2: refactor ns2_prim_status_ind() + * ns2: status ind: add additional flags (first and persistent) + * ns2: vty: show all nse + * ns2: vty: allow the users (pcu/sgsn) to set a default bind + * ns2: vty: on `show ns` add information of NS binds + * gprs_ns2_vty_create: remove bind pointer check + * gprs_ns2: gprs_ns2_free(): add missing talloc_free + * gprs_ns2: fix SNS_ADD for IPv4 + * gprs_ns2: fix empty prefix in TLV Parse error + * gprs_ns2: add gprs_ns2_ip_bind_by_sockaddr() to search for binds by sockaddr + * gprs_ns2: gprs_ns2_ip_bind() check if the bind already exists + * gprs_ns2: add gprs_ns2_nse_nsei() to get the nsei of a nse + * gprs_ns2: add gprs_ns2_free_binds() to free all binds + * gprs_ns2: add gprs_ns2_free_nses() to free all NS-E + * gprs_ns2: const the return value of gprs_ns2_ip_vc_sockaddr / gprs_ns2_ip_bind_sockaddr + * gprs_ns2: rename gprs_ns2_ip_vc_sockaddr -> gprs_ns2_ip_vc_remote + * gprs_ns2: add gprs_ns2_ip_vc_local() return the local sockaddr + * gprs_ns2: add gprs_ns2_nse_sns_remote() returns the initial SNS address + * gprs_ns2: gprs_ns2_ip_vc_remote() the nsvc can be also const + * gprs_ns2: add gprs_ns2_nse_foreach_nsvc() + * gprs_ns2: Partial revert 48f63867 allow to create NS_ALIVE NSVC + * gprs_ns2: add gprs_ns2_ip_vc_equal() + * add osmo_sockaddr_to_str_buf/osmo_sockaddr_to_str + * gprs_ns2: remove the nsvc fsm timer when cleaning up the fsm + * ns2: add value strings for ns2_affecting_cause_prim_str & ns2_prim_str + * gprs_ns2: convert gprs_ns2_cause_str into an static inline + * libosmocore: change the memory management of NS2 + * ns2: fixup gprs_ns2_prim_strs + * ns2: check if ns_vc_alloc() fails in bind_connect() + * ns2: add support for frame relay + * ns2: implement link sharing selector + * ns2: move LL into public api + * ns2: move link layer type into NSE + * ns2: remove obsolete type GPRS_NS2_LL_E1 + * gprs_ns2_fr: remove include + * gprs_ns2: fix typo in comment + * gprs_ns2: use switch() case instead of multiple if in ns2_create_vc() + * gprs_ns2_sns: add missing transistion UNCONFIGURED -> SIZE + * gprs_ns2_sns: dynamic calculate the maximum NS-VCs + * gprs_ns2_sns: add missing S() to allow GPRS_SNS_EV_NO_NSVC happen + * gprs_ns2_sns: fix whitespaces and superflous comment + * gprs_ns2_sns: correct dynamic calculation + * gprs_ns2: introduce NS dialects + * gprs_ns2: move allocation of the SNS fsm into create_nse + * gprs_ns2: add member name to bind + * gprs_ns2: rework gprs_ns2_fr_connect*() + * gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE + * gprs_ns2_sns: rework IP-SNS initial remote + * gprs_ns2_sns: use different binds for the initial connection + * gprs_ns2_sns: introduce SNS Size/Config retries + * gprs_ns2: make nsvc argument const + * gprs_ns2: add gprs_ns2_fr_bind_role() to retrieve the fr role + * gprs_ns2: on ns2_create_vc parse the tlv before using it + * gprs_ns2_vty: udp: fixup dialect changes + * gprs_ns2: fr: fix crash when frame relay interface doesn't exists + * gprs_ns2: improve handling of TLV errors on new nsvcs + * gprs_ns2: don't pass the return code of reject_status_msg + * gprs_ns2: fr: implement a write queue + * gprs_ns2: fr: setup the device to correct FR/LMI settings + * gprs_ns2: add new vty2 + * gprs_ns2: sns: correct log message when no nsvcs available + * gprs_ns2: sns: don't send duplicated packets on retries + * gprs_ns2: sns: add log message when size/config retries exhausted + * gprs_ns2: don't start unconfigured fsm via FORCE_UNCONFIGURED + * gprs_ns2: fix force-unconfigured for IP-SNS NSE + * frame_relay: prevent null pointer exception when talloc fails + * frame_relay: link_alloc: move log message to the end + * gprs_ns2: rework frame relay load distribution function + * gprs_ns2_fr: setup_device: allow to setup a new dahdi device + * gprs_ns2: fr: check the device state before changing state + * gprs_ns2: use zero initialized memory for vty_binds + * utils: add osmo-ns-dummy + * gprs_ns2: call python vty tests + * gprs_ns2: set transfer cap in NS Status primitive + * gprs_ns2: check if persistent nsei or nsvc exists when creating dynamic NSE + * osmo-ns-dummy: allow to create dynamic NSEs + * gprs_ns2_vc: answer UNBLOCK on unblocked nsvc + * gprs_ns2: when calling nsvc_force_unconf for a dynamic NSE drop the NSE. + * gprs_ns2_sns: clear local and remote entries when SNS failed + * gprs_ns2: flag then NSE as dead in nse_free() + * gprs_ns2_vc_fsm: fix spaces and remove wrong comment + * test: gprs_ns2: don't leak the talloc context + * test: gprs_ns2: replace free_bind() with clear_pdus() + * test: gprs_ns2: free the nsi after each test + * gprs_ns2: add assert on most bind calls + * gprs_ns2: allow to use free_vc() with NULL + * osmo-ns-dummy: don't leak primitive messages + * gprs_ns2: implement BLOCK/UNBLOCK of a NSVC by vty + * gprs_ns2: correct handle BLOCK message on initator + * gprs_ns2_vc_fsm: rename all event to match RX_ or REQ_ + * gprs_ns2_vc_fsm: ensure all state is resetted via force_unconf + * gprs_ns2_vc_fsm: in RESET accept RESET as ACK + * gprs_ns2_vc_fsm: fix transitions for ALIVE state + * gprs_ns2_message: remove wrong comment + * gprs_ns2_vc_fsm: check NSEI match the NSE + * gprs_ns2_vc_fsm: check NSVCI match the NSE + * tests: gprs_ns2: add unitdata unit test + * gprs_ns2: always pass a tp to gprs_ns2_vc_rx + * gprs_ns2_vc_fsm: check NSEI match the NSE + * gprs_ns2_vc_fsm: check NSVCI match the NSE + * gprs_ns2: drop GPRS_ prefix of gprs_ns2_cs + * gprs_ns2: drop prefix of all internal exposed function + * gprs_ns2: drop the public prefix gprs_ from all static functions/structs/.. + * gprs_ns2: refactor: ensure all enums have GPRS_NS2_ + * gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty + * gprs_ns2: drop gprs_ns2_vty, rename vty2 -> vty + * gprs_ns2: remove api call gprs_ns2_dynamic_create_nse + * gprs_ns2: introduce gprs_ns2_vty_init_reduced() for the PCU + * gprs_ns2: correct vty config write + * gprs_ns2: prevent division by zero in load_sharing + * gprs_ns2_vc_fsm: reset ALIVE N counter when restarting the test procedure. + * gprs_ns2_vc_fsm: rename ST_ALIVE -> ST_RECOVERING + * gprs_ns2: unify the handling of **result when bind already present. + * gprs_ns2_fr: free_bind(): first do the NULL check before using members + * frame_relay: fix NULL pointer deref + * gprs_ns2_frgre: set a correct gre pointer for ipv6 + * gprs_ns2_frgre: check iph/ip6h before passing them to rx functions + * gprs_ns2_sns: rework tracking of NS-VC unblocked/alive state + * gprs_ns2_sns: add timeout to ST_CONFIG_SGSN + * gprs_ns2_sns: reset the N of timeout when entering a new state + * gprs_ns2: rename vty-command ip-sns -> ip-sns-remote + * gprs_ns2_vty: fix memory leak of vty_binds + * gprs_ns2: add signalling & data weights for UDP binds + * gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer + * gprs_ns2_vc_fsm: reset the alive elapsed timeout everytime + * gprs_ns2_vty: use strcmp() instead of strncmp() + * gprs_ns2_vc_fsm: remove debug line of the alive_timer + * gprs_ns2: fix comment of alive NS-VC + * gprs_ns2_sns: fix typo in doxygen comment + * gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE + * gprs_ns2: rework IP-SNS binds + * gprs_ns2_vty: add optional argument signalling and data weights to `nsvc udp` + * gprs_ns2: implement a simple load sharing for UDP + * gprs_ns2: fix typo in function name ns2_load_sharing_modulo + * gprs_ns2: make gprs_ns2_recv_prim() always take msgb ownership + * gprs_ns2_sns: rename fsm events to include RX or REQ prefix + * gprs_ns2_fr: pass MTU changes to the NSE + * gprs_ns2: truncate the NS_STATUS to the MTU + * gprs_ns2_message: tx_status: move all cause dependent code into the switch/case + * gprs_ns2: add value_string for GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS + * gprs_ns2: ensure no duplicate UDP NSVC can be created + * gprs_ns2: free_nse: free the SNS fsm early + + [ Daniel Willmann ] + * gsm_08_16.h: Add missing header + * gprs_ns2: Make reason const + * libosmogb: Add a function to tx BVC RESET by nsei/bvci + * Add exported function btsctx_alloc to public header + * ns2: Add gprs_ns2_nsvc_state_name() to get the current state of a VC + * ns2: Send NSVC representation in NS_AFF_CAUSE_VC_* status indication + * ns2: Improve NSVC output + * ns2: Split 'initiater' into initiate_{reset,block} + * ns2: Add a function to set the NSVC FSM back to unconfigured + * ns2: Add a VTY command to reset NSVC FSM + * ns2: Fix docs for some NS2 vty commands + * logging: Calculate LOG_MAX_{CTX,FILTERS} from the enum + * ns2: Add log filtering by NSE/NSEI, fix NSVC filter on receive + * ns2: Fix argv index in logging filter VTY commands + * Declare osmo_ctx_init() in talloc.h + * bssgp: Add SUSPEND_NACK to osmo_pdef_bssgp + * logging: Remove duplicate color for DLSMS + * ns2_frgre: Fix missing break statement for recv from IPV6 + * bssgp_bvc_fsm: Handle block request from application correctly + * NS2: Fix bind selection of SNS NSVCs + * ns2: Add sanity check + * Refactor ns2_nsvc_create_ip* + * ns2: Fix memory leak in IP-SNS + * ns2: Fix assert when removing a bind listen + * ns2: Fix incompatible VTY configs when writing config + * tests/gb: Add more complex osmo-ns-dummy.cfg + * bssgp_bvc_fsm: Set/get maximum BSSGP PDU length + * bssgp2_enc_status: Truncate STATUS message to maximum PDU length + * bssgp_bvc_fsm: Consistent naming + + [ Philipp Maier ] + * command: add library command attribute for libosmo-sccp + * command: add library command attribute for libosmo-abis + * gsm_08_58: add proprietary IE to signal Repeated ACCH Capability + * gsm_04_08: add parser for Mobile Station Classmark 3 + * gsm_04_08: add parser for Mobile Station Classmark 3 + * bts_features: add feature BTS_FEAT_ACCH_REP + * gsm_08_58: add struct for RSL_IE_OSMO_REP_ACCH_CAP + * gsm_08_58: add rxqual field to RSL_IE_OSMO_REP_ACCH_CAP + * gprs_bssgp_util: complete bssgp_pdu_strings + * gprs_bssgp: add IE parser/generator for RIM Routing Information + * gprs_bssgp: add handling for BSSGP RIM primitives + * gsm_08_18: add struct to parse RIM PDU Indications + * bssgp_rim: add encoder/decoder for NACC related RIM containers + * bssgp_rim: move bssgp_parse_rim_ri and bssgp_create_rim_ri to gprs_bssgp_rim + * gprs_bssgp: add utilities to send and parse BSSGP rim PDUs + * gprs_bssgp_rim: Return with EOPNOTSUPP on unsupported containers + * gprs_bssgp_rim: fix bug in dub_tlvp_header() + * gprs_bssgp_rim: add value strings for enum bssgp_nacc_cause + * gprs_bssgp_rim: add value strings for enum bssgp_ran_inf_app_id + * gprs_bssgp_rim: add value strings for enum bssgp_rim_routing_info_discr + * gprs_bssgp_rim: add functions to convert a RIM-RI to a string + * gprs_bssgp_rim: cosmetic: connect routing identifier strings with "-" + * gprs_bssgp: log source and destination RIM routing information + * gprs_bssgp: agregate RIM related code in gprs_bssgp_rim.c + * gsm48: add compare function for struct gprs_ra_id + * gsm_08_58, gsm_44_004: add struct for l1 information + + [ laforge ] + * Revert "pkgconfig: link to mnl if available" + + [ Oliver Smith ] + * tests/*: fix control reaches end of non-void func + * configure.ac: set -std=gnu11 + * sim: fix gcc 4.9.2 + -std=gnu11 error + + -- Pau Espin Pedrol Tue, 23 Feb 2021 14:03:31 +0100 + libosmocore (1.4.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 05069c5..b319132 100644 --- a/debian/control +++ b/debian/control @@ -31,10 +31,10 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore16 (= ${binary:Version}), - libosmogb11 (= ${binary:Version}), - libosmogsm15 (= ${binary:Version}), - libosmovty4 (= ${binary:Version}), + libosmocore17 (= ${binary:Version}), + libosmogb12 (= ${binary:Version}), + libosmogsm16 (= ${binary:Version}), + libosmovty9 (= ${binary:Version}), libosmoctrl0 (= ${binary:Version}), libosmosim2 (= ${binary:Version}), libosmousb0 (= ${binary:Version}), @@ -115,7 +115,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore16 +Package: libosmocore17 Section: libs Architecture: any Multi-Arch: same @@ -129,14 +129,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore16 library in particular is a collection of common code used in + The libosmocore17 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore16, + libosmocore17, libjs-jquery, libosmocodec-doc, libosmocoding-doc, @@ -151,7 +151,7 @@ . This package contains the documentation for the libosmocore library. -Package: libosmogb11 +Package: libosmogb12 Section: libs Architecture: any Multi-Arch: same @@ -172,7 +172,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogb11, + libosmogb12, libjs-jquery Description: Documentation for the Osmo GPRS Gb library This is part of the libosmocore "meta"-library. The libosmocore library @@ -183,7 +183,7 @@ . This package contains the documentation for the libosmogb library. -Package: libosmogsm15 +Package: libosmogsm16 Section: libs Architecture: any Multi-Arch: same @@ -207,7 +207,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmogsm15, + libosmogsm16, libjs-jquery Description: Documentation for the Osmo GSM utility library This is part of the libosmocore "meta"-library. The libosmocore library @@ -218,7 +218,7 @@ . This package contains the documentation for the libosmogsm library. -Package: libosmovty4 +Package: libosmovty9 Section: libs Architecture: any Multi-Arch: same @@ -239,7 +239,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmovty4, + libosmovty9, libjs-jquery Description: Documentation for the Osmo VTY library This is part of the libosmocore "meta"-library. The libosmocore library diff --git a/debian/libosmocore16.install b/debian/libosmocore17.install similarity index 100% rename from debian/libosmocore16.install rename to debian/libosmocore17.install diff --git a/debian/libosmogb11.install b/debian/libosmogb12.install similarity index 100% rename from debian/libosmogb11.install rename to debian/libosmogb12.install diff --git a/debian/libosmogsm15.install b/debian/libosmogsm16.install similarity index 100% rename from debian/libosmogsm15.install rename to debian/libosmogsm16.install diff --git a/debian/libosmovty4.install b/debian/libosmovty9.install similarity index 100% rename from debian/libosmovty4.install rename to debian/libosmovty9.install diff --git a/src/Makefile.am b/src/Makefile.am index e56b57e..2f18d09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=16:0:0 +LIBVERSION=17:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index ca64286..a5f191d 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=4:0:4 +LIBVERSION=5:0:5 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index d0db814..2ccb757 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=11:0:0 +LIBVERSION=12:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing \ diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index ccb2456..f1e2a5a 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=15:0:0 +LIBVERSION=16:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 4e2348b..52f3c6a 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:0 +LIBVERSION=2:1:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 81ff104..794b96c 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=8:1:4 +LIBVERSION=9:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3bc0826c0000be4d76235ed6b5be86d216ea2e4d Gerrit-Change-Number: 23039 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:36:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:36:03 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23041 ) Change subject: osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines ...................................................................... osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines Change-Id: Iff09a090284a0f65fd798d99265cba51f3309923 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index b4db440..b63f981 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -164,7 +164,7 @@ set -e if [ -f "TODO-RELEASE" ]; then - grep '#' TODO-RELEASE > TODO-RELEASE.clean + grep '#' TODO-RELEASE > TODO-RELEASE.clean || true mv TODO-RELEASE.clean TODO-RELEASE git add TODO-RELEASE fi -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iff09a090284a0f65fd798d99265cba51f3309923 Gerrit-Change-Number: 23041 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:41:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:41:39 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E0=2E396-fe8d-dirty_=E2=86=92_0=2E9=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23042 ) Change subject: Bump version: 0.8.0.396-fe8d-dirty ? 0.9.0 ...................................................................... Bump version: 0.8.0.396-fe8d-dirty ? 0.9.0 Change-Id: I4b9405df5f40e8f2724ba8aa8f88e2602c1e8374 --- M TODO-RELEASE M configure.ac M contrib/osmo-pcu.spec.in M debian/changelog M debian/control 5 files changed, 448 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/23042/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index eee6aa2..cbfda24 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-pcu update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include -osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}+DLBSSGP diff --git a/configure.ac b/configure.ac index 60dcb87..31ead00 100644 --- a/configure.ac +++ b/configure.ac @@ -82,11 +82,11 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.5.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/contrib/osmo-pcu.spec.in b/contrib/osmo-pcu.spec.in index a48a4ed..96e9481 100644 --- a/contrib/osmo-pcu.spec.in +++ b/contrib/osmo-pcu.spec.in @@ -28,11 +28,11 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmocore) >= 1.4.0 -BuildRequires: pkgconfig(libosmogb) >= 1.4.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.4.0 -BuildRequires: pkgconfig(libosmovty) >= 1.4.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index ae85b61..dc42c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,439 @@ +osmo-pcu (0.9.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Pass paging group instead of imsi where later is not needed + * Allow Gb PAGING-PS without P-TMSI + * Support Gb PAGING-CS + * Support PAGING-CS and PAGING-PS on on PTP-BVCI + * tests/rlcmac: print test name at the start + * tests/rlcmac: Memzero decoded struct + * tests/rlcmac: Fix missing commas with unexpected results + * tests/rlcmac: Use osmo_hexdump to print buffers + * tests/rlcmac: Don't check stderr output + * tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails + * csn1: Extend CSN_SERIALIZE to allow 0 bit of length + * csn1: Allow CHOICE elements to re-process the bits used for the choice + * csn1: Fix pedantic compiler warnings in csn.1 dissectors + * csn1: Drop format_p union from CSN_DESCR + * gsm_rlcmac.cpp: Fix trailing whitespace + * cosmetic: csn1.cpp: Fix whitespace + * csn1.cpp: Rework ProcessError() function to print errors + * rlcmac: Return error code from csn1 encoder/decoder + * Check return code of rlcmac decode/encode functions + * rlcmac: Transform a few LOGPC messages to LOGP + * Fix trailing newline mess with LOGP(C) in rlcmac/csn1 + * llc_queue::{dequeue,enqueue}() refactor + * gsm_rlcmac: fix Packet_Resource_Request_t: s/Slot/I_LEVEL_TN/ + * tests/llc: Change unrealistic time jump to avoid runtime error under ARM + * Use clock_gettime(CLOCK_MONOTONIC) and timespec everywhere + * Use downlink BSSGP RA Cap IE + * tests/RLCMACTest: free allocated bitvectors + * tests/RLCMACTest: Several fixes and improvements to RAcap tests + * rlcmac: Don't pass array element to CSN1 descriptors + * csn1: Validate recursive array max size during decoding + * rlcmac: Fix bug receiving RA cap + * rlcmac: Log names of de/encoded rlcmac packet types + * rlcmac: Introduce MS Radio Access Capabilities 2 to fix related spare bits + * cosmetic: rlcmac: Fix comment typo and whitespace introduced recently + * rlcmac: Rename field to MS RA Cap2 in Additional_MS_Rad_Access_Cap_t + * pcu_l1_if.cpp: Add missing header ctype.h + * gsm_rlcmac: Use 'struct bitvec' instead of 'bitvec' + * cosmetic: Do not indent header includes inside extern C block + * gsm_rlcmac.cpp: Avoid declaring variable in for loop + * csn1.h: Fix trailing whitespace + * tbf.cpp: Include c++ header required for new operator's replacement type + * gsm_rlcmac: Disable unused CSN1 descriptors + * Move gsm_rlcmac.cpp -> .c + * rlcmac: support decode FDD_CELL_INFORMATION of "UTRAN FDD Description + * rlcmac: add dissection of 2G->3G/4G PS handover + * csn1: Fix Several typos & whitespace + * csn1: verify enough bits present to decode whole CSN_UINT_ARRAY + * csn1: Properly verify CSN_BITMAP length + * csn1: Remove code block from CSN_NEXT_EXIST_LH + * pcu_l1_if: Don't use GSMTAP_CHANNEL_PACCH when sending unknown gsmtap blocks + * pdch: Avoid sending GSMTAP_CHANNEL_UNKOWN for rejected UL EGPRS data block + * tbf: Avoid crash: don't set TBF window size if setup failed + * bts: Rename mslot_class_from_ra + * bts: Fix Decoding EGPRS MultislotClass from 11-bit EGPRS PACKET CHANNEL REQUEST + * bts: Return uint8_t in egprs_mslot_class_from_ra() + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Expect ms object to exist before calling tbf_alloc_ul_tbf() + * Expect ms object to exist before calling tbf_alloc_dl_tbf() + * pdch: rcv_resource_request(): Clarify tbf_free only needed if MS used to exist beforehand + * Drop unneeded arg 'ta' in tbf_alloc_ul() + * bts: Drop specific functions to increase counters + * bts: Drop specific functions to add values to counters + * bts: Drop specific functions to add values to stats + * pcu: tbf_ul: Clean up maybe_schedule_uplink_acknack() + * sysmo: femtobts.h: Avoid redefining global variables + * rlc: Drop unused function gprs_rlc_data::put_data + * rlc: Move prepare() function out of gprs_rlc_data struct + * tbf_ul: Fix UL ACK not sent to MS if intermediate UL block is lost + * Get rid of class GprsCodingScheme + * gsmtap: Set signal level and SNR fields + * gprs_ms: Small clean ups in IMSI storage related code + * gprs_ms: Transfer known EGPRS MS class when mergling old MS + * tbf: Drop unneeded method set_tlli_from_ul + * pdch.cpp: Fix logging line format in rcv_block wrong length + * Set correct GSMTAP channel type for PDTCH messages returning error + * decoding.cpp: Improve logging in malformed UL data parsing + * tbf_dl: uint8_t is enough to store a TA value + * encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID + * encoding.cpp: Fix missing spacing in function param + * pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request + * pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap + * pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received + * pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request + * Fix typo in log message + * pdch: Drop unneeded notice log message in rcv pkt meas report + * Introduce log macro helper LOGPMS + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * pdch: rcv pkt meas rep: Allocate MS object early in path and use it + * Fix recent typo preventing MS from registering + * gitignore: Add __pychache__ dir + * tbf: Don't log rlcmac_diag() output in separate lines + * gprs_ms_storage.h: Set pointer to NULL instead of 0 + * Free all MS TBFs when receiving GPRS Suspension Request + * cosmetic: fix indentation alignment + * vty: Add 'show bts pdch' command + * cosmetic: Fix indentation of for loops + * cosmetic: Fix typo in comment + * Fix crash accessing NULL tbf->pdch[first_ts] + * contrib/jenkins: Enable parallel make in make distcheck + * Improve debug logging for alloc algos + * Fix several calls to LOGPAL + * Move gprs_rlcmac_ul_tbf::window to correct file + * Move constructor gprs_rlcmac_dl_tbf::BandWidth to correct file + * tbf: Make window() available to tbf base class + * tbf: Implement enable_egprs() once + * tbf: Set MS during constructor time + * Move ul_tbf allocation code to correct file + * Move dl_tbf allocation code to correct file + * tbf: Drop unused function disable_egprs() + * tests: ms: Pass correct pointer in constructor instead of NULL + * tbf: Clean up gprs_rlcmac_dl_tbf::handle() + * alloc_algo_b: Select TRX with least assigned TFIs during TBF alloc + * bts: define egprs_enabled as bool + * cosmetic: Fix ws between if keyword and parenthesis + * tbf_dl: Update (egprs_)ms_class for already known MS + * cosmetic: tests: pcu_emu: fix trailing whitespace + * gprs_ms: Use proper function to get CS + * Move BTS initial values inside bts.cpp + * pcuif: Improve BTS-supported CS/MCS handling + * Move EGPRS MS mode set to gprs_ms.cpp + * Take into account BTS supported (M)CS values when retrieving the maximum + * Enable egprs support through PCUIF from BTS/BSC + * pdch: Process received CS1-4 data blocks regardless of egprs_enabled + * tbf_dl: Don't fake EGPRS MS class when no related info is available + * tbf_ul: Allow non-egprs phones if EGPRS is enabled + * Get rid of bts->egprs_enabled + * Fix configuration of initial_(m)cs + * Fix mcs_is_valid(): UNKNOWN value is not a valid (M)CS + * gprs_ms: Avoid enabling EGPRS if no MCS are supported + * tbf_ul: Log mismatching TLLI on log message + * Fix ctr reports: Remove ctr description from already removed counter + * encoding: Fix duplicate word in log str + * sched: Fix sending GSMTAP DL data blocks with unset USF + * sched: Use correct GMSTAP category for EGPRS DL data blocks + * Support multiplexing of GPRS and EGPRS TBFs in one PDCH + * pdch: packet_paging_request: Put back non-fitting paging entry where where it was + * pdch: Log hexdump of decde failure for dl rlcmac block + * csn1: Fix readIndex pointer change in CSN_VARIABLE_ARRAY + * csn1: Log CSN_VARIABLE_ARRAY values as hex + * main: generate coredump and exit upon SIGABRT received + * tbf: Log previous TS when changing Control TS + * Implement downgrade to DL MCS1-4 when USF for GPRS_only MS + * Dl TBF: Get rid of LLC UI dummy blocks following other data + * rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string + * gprs_rlcmac_sched: Use helper structure to store several tbf pointer params + * sched: Convert code handling next_list array to be size independant + * Convert GprsMS and helpers classes to C + * tbf: Fix wrong verb used in log message + * .gitignore: ignore files ending with ~ + * doc: Improve CS/MCS GPRS/EGPRS considerations in User Manual + * tbf: remove 'software error' logs from tbf_free + * ms: Replace struct var with rate_ctr + * AllocTest: Avoid queuing tons of to-be-freed ms + * gprs_ms: Mark ms_ctrg_desc static + * Workaround ASan false positive runtime errors under some platforms + * Split PCU global PCU object from BTS object + * Move T_defs_pcu from BTS to PCU object + * Move force_two_phase field from BTS to PCU + * Move alpha,gamma fields from BTS to PCU + * Move dl_tbf_preemptive_retransmission field from BTS to PCU + * Move dl_arq_type field from BTS to PCU + * Move cs_adj* fields from BTS to PCU + * Move cs_downgrade_threshold field from BTS to PCU + * Move (m)cs_lqual_ranges fields from BTS to PCU + * Move ns_dialect field from BTS to PCU + * Move fc_* fields from BTS to PCU + * tests/tbf: Allocate PCU per test instead of globally + * Move ws_* fields from BTS to PCU + * Move llc_* fields from BTS to PCU + * Fix configuration mess of initial_cs/mcs between PCUIF and VTY + * Unify BTS into a C usable structure + * Get rid of bts singletons + * Rename 'bts_data' leftovers to 'bts' + * bts: combine bts_{init,cleanup} into consturctor/destructor methods + * Get rid of unused gsm_timer.{cpp,h} + * Convert gprs_bssgp_pcu.cpp to C + * Move tbf::free_all static methods to proper object files + * Convert osmo_bts_sock.cpp to C + * Allow multiple bts objects in PCU + * bts: Store RAC+CI from info_ind + * Get rid of singleton gprs_bssgp_pcu_current_bctx() + * Initial handling support for RIM messages + * gprs_pcu: Use libosmocore osmo_cgi_ps_cmp API + * ms: Drop always-false check + * sched: Check if egprs is enabled in TBF rather than MS being egprs capable + * tbf: Drop always-true condition checking for MS + * encoding: fix typos in comment + * ms: Set proper initial MCS values setting mode EGPRS_GMSK + * ms: Properly handle EGPRS_GMSK mode in ms_max_cs_dl/ul() + * Fix Dl EGPRS data blocks being generated occasionally on GPRS TBFs + * sched: Avoid picking TBF with nacked dl blocks when GMSK is required + * tbf: Make tbf_ms() param const + * Introduce NACC support + * NACC: Fix crash freeing struct if CTRL conn was refused during alloc + * NACC: delay CTRL conn socket init until it's needed + * NACC: allow setting keep time for entries in neigh and si cache + * NACC: Configure neighbor and SI resolution timeout values + * NACC: Send only Pkt Cell Chg Continue if SI retrieve fails + * doc: Mark PCU node red in network node diagram + * doc: Introduce section documenting NACC support + * nacc: Improve log line failing to establish CTRL neigh conn + * Update TS 04.60 references to new TS 44.060 + * Drop comment about an already implemented TODO + * Move src/tbf.txt to doc/ + * encoding: Fix comment description of S/P field + * tbf: Reuse stored result in variable in check_polling() + * tbf: Constify some methods + * nacc: Fix typo in function name + * nacc: Implement Pkt Cell Change Continue retransmission + * nacc: Avoid RIM procedures targeting cells under same PCU + * rlc.h: Fix struct bit fields on big endian systems + * cosmetic: fix typo in comment + * nacc_fsm: Move code filling struct to helper function + * nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states + * nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI + * nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI + * nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states + * nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell + * vty: Write 'neighbor resolution' config to file + * cosmetic: fix line indentation + * sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + * Use NULL as default value for pointer type + * find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration + * find_multi_slots: Avoid multiple calls to mslot_class_get_rx() + * find_multi_slots: Mark mslot_class properties const + * find_multi_slots: Avoid multiple calls to mslot_class_get_type() + * Use ALPHA value received in SI13 from PCUIF + + [ Vadim Yanitskiy ] + * pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() + * gsm_timer: fix comparison of constant LONG_MAX with an integer + * encoding: fix log_alert_exit(): do not treat error as format string + * tests/alloc: fix implicit conversion from 'double' to 'int8_t' + * gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' + * gprs_bssgp_pcu: fixup: fix length check in gprs_bssgp_pcu_rx_dl_ud() + * csn1: fix csnStreamDecoder(): avoid conditional calls to bitvec_read_field() + * VTY: get rid of pcu_vty_go_parent() / pcu_vty_is_config_node() + * VTY: install talloc context introspection commands + * pcu_sock: fix memleak, allocate pcu_sock_state on stack + * pcu_sock: cosmetic: fix typo in a comment message + * tbf: cosmetic: fix spacing in gprs_rlcmac_tbf::create_ul_ass() + * tbf: fix NULL pointer dereference in create_[ul|dl]_ass() + * encoding: assert return value of bitvec_set_u64() + * csn1: fix some mistaken CSN.1 error names + * csn1: fix csnStreamDecoder(): catch unknown CSN_CHOICE values + * tests/rlcmac: mark Packet Polling Request as malformed + * csn1: fix existNextElement(): use bitvec_get_bit_pos() + * tests/rlcmac: additionally match debug output of the CSN.1 codec + * csn1: get rid of C++ specific code, compile with GCC + * csn1: fix csnStreamDecoder(): do not subtract no_of_bits twice + * csn1: fix csnStreamDecoder(): always keep remaining_bits_len updated + * csn1: fix csnStreamDecoder(): update bit_offset in CSN_EXIST{_LH} + * csn1: bitvec_get_uint() may return a negative, use %d + * csn1: use proper format specifier for unsigned integers + * gsm_rlcmac: fix misleading LOGP statement in decode_gsm_ra_cap() + * tests/rlcmac: fix malformed MS RA capability in testRAcap() + * tests/rlcmac: also verify encoding of MS RA Capability + * tests/rlcmac: add a new test vector for Packet Resource Request + * csn1: fix csnStreamDecoder(): skip bits unhandled by serialize() + * tests/rlcmac: also enable logging for DRLCMACDATA category + * rlcmac: fix encode_gsm_*(): do not suppress encoding errors + * csn1: fix: do not return 0 if no bits left in the buffer + * BSSGP: cosmetic use OSMO_IMSI_BUF_SIZE from libosmocore + * BSSGP: fix: properly encode P-TMSI in RR Paging Request + * pdch: fix packet_paging_request(): properly print paging MI + * pdch: cosmetic: use GSM_MI_TYPE_* constants from libosmocore + * fix: properly include pure C headers from C++ code + * l1if: fix pcu_rx_rach_ind(): use proper format string specifiers + * sba: fix possible memleak in SBAController::alloc() + * TBF/UL: fix rcv_data_block_acknowledged(): print the actual TLLI + * fix egprs_mslot_class_from_ra(): multislot class may not be present + * l1if: fix: s/pcu_rx_rach_ind_pdtch/pcu_rx_rach_ind_ptcch/g + * csn1: fix M_CHOICE: restirct maximum length of the choice list + * csn1: fix csnStreamEncoder(): also check length of the choice list + * csn1: fix csnStreamEncoder(): always check the choice index + * csn1: fix: never use enumerated types in codec structures + * encoding: cosmetic: use RLC_MODE_ACKNOWLEDGED where possible + * RLC/MAC: implement decoding of EGPRS Packet Channel Request + * encoding: fix write_ia_rest_egprs_uplink_sba(): add missing CHECK(rc) + * doc/manuals: fix typo in overview.adoc: s/Omsocom/Osmocom/g + * bts: refactor handling and parsing of RACH.ind + * BTS::parse_rach_ind(): properly handle EGPRS Packet Channel Request + * bts: add send_gsmtap_rach(), also send PTCCH/U over GSMTAP + * bts: fix send_gsmtap_rach(): properly pack 11 bit RA + * bts: cosmetic: use DUMMY_VEC for padding where possible + * encoding: drop log_alert_exit(), use OSMO_ASSERT() instead + * encoding: assert() presence of Downlink TBF + * direct-phy: fix handle_ph_ra_ind(): handle PH-RA.ind on PRACH SAPI + * debian/control: change maintainer to the Osmocom team / mailing list + * pcu_l1_if: use proper format specifier for PCUIF version + * pcu_l1_if: constify the argument of pcu_rx_info_ind() + * pcu_l1_if: cosmetic: rename both 'trx'/'ts' to 'trx_nr'/'ts_nr' + * pcu_l1_if: cosmetic: move struct 'gprs_rlcmac_pdch' into the for loop + * pcu_l1_if: cosmetic: correct error message in pcu_rx_info_ind() + * gsm_rlcmac: use consistent naming for [Extended] Packet Timing Advance + * tbf: cosmetic: use GSM_MACBLOCK_LEN where possible + * tbf: allocate the bitvec on stack in create_{dl,ul}_ass() + * encoding: constify 'tbf' in UL/DL assignment functions + * encoding: do not encode out of range Timing Advance values + * encoding: fix RRBP field in write_packet_uplink_assignment() + * encoding: use bool for use_egprs in write_packet_uplink_assignment() + * encoding: pass pdch slot directly to encoding functions + * encoding: clarify docstring for write_packet_downlink_assignment() + * encoding: use CSN.1 codec to generate Packet Uplink Assignment + * encoding: implement handing of hopping parameters + * encoding: fix gen_freq_params(): do not check pdch twice + * pcuif_proto: version 10: add frequency hopping parameters + * pcu_l1_if: cosmetic: use ARRAY_SIZE() in pcu_rx_info_ind() + * pcu_l1_if: correct logging level in pcu_rx_info_ind() + * pcu_l1_if: cosmetic: make {local,remote}_sockaddr scoped variables + * pcu_l1_if: use proper format string specifiers: %d -> %u + * pcu_l1_if: print NSVC address in more common format + * gprs_bssgp_pcu: make osmo_sockaddr local/sgsn arguments const + * gprs_bssgp_pcu: fix possible memleak in gprs_nsvc_create_and_connect() + * struct gprs_rlcmac_bts: remove unused 'nsei' field + * gprs_bssgp_pcu: fix: do not crash on receipt of subsequent INFO.ind + * doc/manuals: (re-)generate XML VTY reference automatically + * fix tbf_select_slot_set(): use LOGP() instead of LOGPC() + * main: remove line breaks in print_help(), increase spacing + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * BSSGP: use tlvp_val8() in gprs_bssgp_pcu_rx_paging_cs() + * BSSGP: constify argument 'tp' of gprs_bssgp_pcu_rx_paging_{cs,ps} + * TLLI 0x00000000 is a valid TLLI, use 0xffffffff instead + * gprs_rlcmac_sched: fix incorrect SBA frame number assignment + * bts: fix uninitialized memaccess in BTS::send_gsmtap_rach() + * bts: fix uninitialized memaccess in BTS::send_gsmtap() + * tests/rlcmac: add more test vectors for Packet Resource Request + * contrib/osmo-pcu.spec.in: require libosmo* version 1.4.0 + * contrib/osmo-pcu.spec.in: add missing libosmoctrl dependency + * vty: register libosmocore's FSM introspection commands + + [ Anders Broman ] + * csn1: Update M_NULL CSN_DESCR to match wireshark + * csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function + * csn1: Fix warning with -Wmissing-prototypes + * csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type + * gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. + + [ Jeff Morriss ] + * csn1: shuffle decrements of remaining_bits_len + + [ Pascal Quantin ] + * csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits + * gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure + * gsm_rlcmac: Enhance dissection of PSI1 + * gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing + * gsm_rlcmac.cpp: fix an out of bounds access + * gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ASAN + * gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN + + [ Guy Harris ] + * csn1: Don't cast away constness + + [ Alexis La Goutte ] + * csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 + + [ Bill Meier ] + * gsm_rlcmac.h: #if 0 unused stuff + + [ Gerald Combs ] + * gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call + + [ Vincent Helfre ] + * gsm_rlcmac: add dissection of NAS container + * gsm_rlcmac: improve dissection of MS RA Capability IE + + [ AndersBroman ] + * gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 + + [ Keith ] + * Send UL-CTRL Packet to GSMTAP even if we fail to decode. + * Don't check ul_control_block before decoding into it. + + [ Harald Welte ] + * csn1.c: Almost all of the logging is DEBUG, not NOTICE + * TODO: remove those that have obviously been implemented 5+ years ago + * bts.cpp: Increase constructor priority + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * gb manual: 08.16 -> 48.016 / 08.18 -> 48.018 + * gb manual: NS is implemented in libosmogb, not libosmocore + * manuals/gb/ns.adoc: Update documentation regarding SNS capability + * migrate to DLBSSGP as log sub-system for BSSGP + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + * tbf: add virtual destructor + + [ Philipp Maier ] + * gprs_debug: Use only LOGL_NOTICE as default loglevel + * vty: add attributes to VTY commands indicating when they apply + * pcu_main: add commandline option --vty-ref-xml + * gprs_bssgp_rim: add serving BSS NACC application + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Neels Hofmeyr ] + * use new osmo_mobile_identity api (avoid deprecation) + * paging: pass struct osmo_mobile_identity, not encoded IE bytes + + [ Alexander Couzens ] + * pcuif_proto: version 0xa: add support for IPv6 NSVCs + * Revert "pcuif_proto: version 0xa: add support for IPv6 NSVCs" + * pcuif_proto: version 10: add support for IPv6 NSVCs + * Use the new NS2 lib + * Rework NS configuration over the info indication + * pcu_l1_if: fix misaligned assignment of remote address + * NS2: follow the change of ownership + * gprs_bssgp_pcu: follow ns2 library changes + * NS2: rework handling of unknown primitive + * ns2: follow ns2 dialect changes + * ns2: follow changes to add a unique name to all binds + * ns2: follow ns2 sns api changes + * gprs_ns2: set default dialect to ipaccess + * gprs_rlcmac_sched: don't leak a sched_dummy() + * gprs_rlc_ts_alloc: ensure no rolling slots are allocated + * follow gprs_ns2 API enum changes + * gprs_ns2: migrate to the new vty syntax + * gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse + * gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config + * gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration + + -- Pau Espin Pedrol Tue, 23 Feb 2021 14:41:00 +0100 + osmo-pcu (0.8.0) unstable; urgency=medium [ Alexander Couzens ] diff --git a/debian/control b/debian/control index 0d69a9a..a8eae93 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 1.4.0), - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Homepage: http://osmocom.org/projects/osmopcu Vcs-Git: git://git.osmocom.org/osmo-pcu -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b9405df5f40e8f2724ba8aa8f88e2602c1e8374 Gerrit-Change-Number: 23042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:45:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:45:19 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E1=2E15-9484-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/23038 ) Change subject: Bump version: 1.4.1.15-9484-dirty ? 1.5.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/23038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2cafda295513b019cda424f09655061fa7a0fa10 Gerrit-Change-Number: 23038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 13:45:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:45:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:45:21 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E4=2E1=2E15-9484-dirty_=E2=86=92_1=2E5=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/23038 ) Change subject: Bump version: 1.4.1.15-9484-dirty ? 1.5.0 ...................................................................... Bump version: 1.4.1.15-9484-dirty ? 1.5.0 Change-Id: I2cafda295513b019cda424f09655061fa7a0fa10 --- M configure.ac M contrib/osmo-sip-connector.spec.in M debian/changelog M debian/control 4 files changed, 36 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 10a6392..de19d88 100644 --- a/configure.ac +++ b/configure.ac @@ -24,9 +24,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE(sanitize, diff --git a/contrib/osmo-sip-connector.spec.in b/contrib/osmo-sip-connector.spec.in index 4361daa..29baf9b 100644 --- a/contrib/osmo-sip-connector.spec.in +++ b/contrib/osmo-sip-connector.spec.in @@ -27,9 +27,9 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(sofia-sip-ua-glib) >= 1.12.0 %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index c983128..e147a38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +osmo-sip-connector (1.5.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Matt Johnson ] + * sip: Specify invite contact tag + + [ Alexander Couzens ] + * Revert "sip: Specify invite contact tag" + * mncc: remove callref argument from mncc_write() + * mncc: add return code for write/send function + * mncc: Introduce mncc_rtp_write similiar to mncc_write + * mncc: mncc_create_remote_leg: use mncc_write instead of write direct to the fd + + [ Pau Espin Pedrol ] + * mncc: Support IPv6 addresses (new version mncc 7) + * sdp: Don't select addresses failing to parse + * contrib/jenkins: Enable parallel make in make distcheck + * mncc: Log write error code + * .gitignore: Get rid of new autofoo tmp files + * mncc: Fix write len + + [ Oliver Smith ] + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 13:42:08 +0100 + osmo-sip-connector (1.4.1) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 4692ea5..0de3953 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ libsofia-sip-ua-dev, dh-systemd (>= 1.5), dh-autoreconf, - libosmocore-dev (>= 1.0.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.8.4 Homepage: https://osmocom.org/projects/osmo-sip-conector/wiki -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/23038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I2cafda295513b019cda424f09655061fa7a0fa10 Gerrit-Change-Number: 23038 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:46:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:46:28 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E2=2E9-288c-dirty_=E2=86=92_0=2E1=2E3?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/23036 ) Change subject: Bump version: 0.1.2.9-288c-dirty ? 0.1.3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/23036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I9287411a7c1f69ddc6211c2557d41dd533c84ff9 Gerrit-Change-Number: 23036 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 13:46:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:46:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:46:30 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcap=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E2=2E9-288c-dirty_=E2=86=92_0=2E1=2E3?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/23036 ) Change subject: Bump version: 0.1.2.9-288c-dirty ? 0.1.3 ...................................................................... Bump version: 0.1.2.9-288c-dirty ? 0.1.3 Change-Id: I9287411a7c1f69ddc6211c2557d41dd533c84ff9 --- M configure.ac M contrib/osmo-pcap.spec.in M debian/changelog M debian/control 4 files changed, 27 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 6660bf1..8ec9c88 100644 --- a/configure.ac +++ b/configure.ac @@ -117,9 +117,9 @@ AC_SUBST([PCAP_CFLAGS]) dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(LIBZMQ, libzmq >= 3.2.2) PKG_CHECK_MODULES(LIBGNUTLS, gnutls) diff --git a/contrib/osmo-pcap.spec.in b/contrib/osmo-pcap.spec.in index 2755afa..db2dcf0 100644 --- a/contrib/osmo-pcap.spec.in +++ b/contrib/osmo-pcap.spec.in @@ -29,10 +29,10 @@ %endif BuildRequires: pkgconfig BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(libosmocore) >= 0.11.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 0.11.0 -BuildRequires: pkgconfig(libosmovty) >= 0.11.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(libzmq) >= 3.2.2 %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index 14a0d0e..ce26f4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +osmo-pcap (0.1.3) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * configure.ac: set -std=gnu11 + + [ Harald Welte ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * reformat debian/control for osmo-release.sh compatibility + + [ Pau Espin Pedrol ] + * main: generate coredump and exit upon SIGABRT received + + -- Pau Espin Pedrol Tue, 23 Feb 2021 13:19:37 +0100 + osmo-pcap (0.1.2) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 4e2fc7c..68d38c7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ autotools-dev, libpcap0.8-dev, pkg-config, - libosmocore-dev, + libosmocore-dev (>= 1.5.0), libgnutls28-dev, libzmq3-dev Standards-Version: 3.9.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/23036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I9287411a7c1f69ddc6211c2557d41dd533c84ff9 Gerrit-Change-Number: 23036 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:47:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:47:31 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E22-f01c-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23037 ) Change subject: Bump version: 1.6.0.22-f01c-dirty ? 1.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I05d9bee0791cec5aebbeb1602be6697ecc2e2b74 Gerrit-Change-Number: 23037 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 13:47:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:47:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:47:36 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E22-f01c-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23037 ) Change subject: Bump version: 1.6.0.22-f01c-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.22-f01c-dirty ? 1.7.0 Change-Id: I05d9bee0791cec5aebbeb1602be6697ecc2e2b74 --- M TODO-RELEASE M configure.ac M contrib/osmo-ggsn.spec.in M debian/changelog M debian/control M gtp/Makefile.am 6 files changed, 44 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index dd0df1a..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-ggsn update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include diff --git a/configure.ac b/configure.ac index a1c7180..479ae3b 100644 --- a/configure.ac +++ b/configure.ac @@ -154,9 +154,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index d752a8e..dcf0e7c 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -29,11 +29,10 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libgtpnl) >= 1.0.0 -BuildRequires: pkgconfig(libosmocore) >= 1.1.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 -BuildRequires: pkgconfig(libosmovty) >= 1.1.0 BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 Obsoletes: openggsn %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index 445e75c..f65aaa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +osmo-ggsn (1.7.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Pau Espin Pedrol ] + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * contrib/jenkins: Enable parallel make in make distcheck + * ggsn: generate coredump and exit upon SIGABRT received + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Keith ] + * Fix vty PDP lookups by IMSI + * Prevent Crash in show pdp-context from vty + * Minor: remove code duplication + * Use imsi_str2gtp() in sgsnemu + * sgsnemu: relax check on length of IMSI cmdline arg. + * GTP: Replace recently introduced imsi_str2gtp() + + [ Harald Welte ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * gtp-kernel: Remove duplicate #include section + * gtp-kernel: don't #include libmnl headers + + [ Oliver Smith ] + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + * apn_start: avoid segfault if missing tun-device + * .gitignore: ignore debian/libgtp* + * deb/rpm: build with --enable-gtp-linux + + -- Pau Espin Pedrol Tue, 23 Feb 2021 13:34:39 +0100 + osmo-ggsn (1.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 1fd1937..bbffd49 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ pkg-config, libdpkg-perl, git, dh-autoreconf, - libosmocore-dev (>= 1.4.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev, libgtpnl-dev (>= 1.2.0) Standards-Version: 3.9.6 diff --git a/gtp/Makefile.am b/gtp/Makefile.am index a392277..64f63b6 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=6:0:0 +LIBVERSION=7:0:1 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I05d9bee0791cec5aebbeb1602be6697ecc2e2b74 Gerrit-Change-Number: 23037 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:52:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:52:32 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E0=2E396-fe8d-dirty_=E2=86=92_0=2E9=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23042 ) Change subject: Bump version: 0.8.0.396-fe8d-dirty ? 0.9.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b9405df5f40e8f2724ba8aa8f88e2602c1e8374 Gerrit-Change-Number: 23042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 13:52:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 13:52:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 13:52:36 +0000 Subject: =?UTF-8?Q?Change_in_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E0=2E396-fe8d-dirty_=E2=86=92_0=2E9=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23042 ) Change subject: Bump version: 0.8.0.396-fe8d-dirty ? 0.9.0 ...................................................................... Bump version: 0.8.0.396-fe8d-dirty ? 0.9.0 Change-Id: I4b9405df5f40e8f2724ba8aa8f88e2602c1e8374 --- M TODO-RELEASE M configure.ac M contrib/osmo-pcu.spec.in M debian/changelog M debian/control 5 files changed, 448 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index eee6aa2..cbfda24 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-pcu update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include -osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}+DLBSSGP diff --git a/configure.ac b/configure.ac index 60dcb87..31ead00 100644 --- a/configure.ac +++ b/configure.ac @@ -82,11 +82,11 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.5.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/contrib/osmo-pcu.spec.in b/contrib/osmo-pcu.spec.in index a48a4ed..96e9481 100644 --- a/contrib/osmo-pcu.spec.in +++ b/contrib/osmo-pcu.spec.in @@ -28,11 +28,11 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmocore) >= 1.4.0 -BuildRequires: pkgconfig(libosmogb) >= 1.4.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.4.0 -BuildRequires: pkgconfig(libosmovty) >= 1.4.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index ae85b61..dc42c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,439 @@ +osmo-pcu (0.9.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Pass paging group instead of imsi where later is not needed + * Allow Gb PAGING-PS without P-TMSI + * Support Gb PAGING-CS + * Support PAGING-CS and PAGING-PS on on PTP-BVCI + * tests/rlcmac: print test name at the start + * tests/rlcmac: Memzero decoded struct + * tests/rlcmac: Fix missing commas with unexpected results + * tests/rlcmac: Use osmo_hexdump to print buffers + * tests/rlcmac: Don't check stderr output + * tests/rlcmac: Add test to showcase that decode_gsm_ra_cap() fails + * csn1: Extend CSN_SERIALIZE to allow 0 bit of length + * csn1: Allow CHOICE elements to re-process the bits used for the choice + * csn1: Fix pedantic compiler warnings in csn.1 dissectors + * csn1: Drop format_p union from CSN_DESCR + * gsm_rlcmac.cpp: Fix trailing whitespace + * cosmetic: csn1.cpp: Fix whitespace + * csn1.cpp: Rework ProcessError() function to print errors + * rlcmac: Return error code from csn1 encoder/decoder + * Check return code of rlcmac decode/encode functions + * rlcmac: Transform a few LOGPC messages to LOGP + * Fix trailing newline mess with LOGP(C) in rlcmac/csn1 + * llc_queue::{dequeue,enqueue}() refactor + * gsm_rlcmac: fix Packet_Resource_Request_t: s/Slot/I_LEVEL_TN/ + * tests/llc: Change unrealistic time jump to avoid runtime error under ARM + * Use clock_gettime(CLOCK_MONOTONIC) and timespec everywhere + * Use downlink BSSGP RA Cap IE + * tests/RLCMACTest: free allocated bitvectors + * tests/RLCMACTest: Several fixes and improvements to RAcap tests + * rlcmac: Don't pass array element to CSN1 descriptors + * csn1: Validate recursive array max size during decoding + * rlcmac: Fix bug receiving RA cap + * rlcmac: Log names of de/encoded rlcmac packet types + * rlcmac: Introduce MS Radio Access Capabilities 2 to fix related spare bits + * cosmetic: rlcmac: Fix comment typo and whitespace introduced recently + * rlcmac: Rename field to MS RA Cap2 in Additional_MS_Rad_Access_Cap_t + * pcu_l1_if.cpp: Add missing header ctype.h + * gsm_rlcmac: Use 'struct bitvec' instead of 'bitvec' + * cosmetic: Do not indent header includes inside extern C block + * gsm_rlcmac.cpp: Avoid declaring variable in for loop + * csn1.h: Fix trailing whitespace + * tbf.cpp: Include c++ header required for new operator's replacement type + * gsm_rlcmac: Disable unused CSN1 descriptors + * Move gsm_rlcmac.cpp -> .c + * rlcmac: support decode FDD_CELL_INFORMATION of "UTRAN FDD Description + * rlcmac: add dissection of 2G->3G/4G PS handover + * csn1: Fix Several typos & whitespace + * csn1: verify enough bits present to decode whole CSN_UINT_ARRAY + * csn1: Properly verify CSN_BITMAP length + * csn1: Remove code block from CSN_NEXT_EXIST_LH + * pcu_l1_if: Don't use GSMTAP_CHANNEL_PACCH when sending unknown gsmtap blocks + * pdch: Avoid sending GSMTAP_CHANNEL_UNKOWN for rejected UL EGPRS data block + * tbf: Avoid crash: don't set TBF window size if setup failed + * bts: Rename mslot_class_from_ra + * bts: Fix Decoding EGPRS MultislotClass from 11-bit EGPRS PACKET CHANNEL REQUEST + * bts: Return uint8_t in egprs_mslot_class_from_ra() + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Expect ms object to exist before calling tbf_alloc_ul_tbf() + * Expect ms object to exist before calling tbf_alloc_dl_tbf() + * pdch: rcv_resource_request(): Clarify tbf_free only needed if MS used to exist beforehand + * Drop unneeded arg 'ta' in tbf_alloc_ul() + * bts: Drop specific functions to increase counters + * bts: Drop specific functions to add values to counters + * bts: Drop specific functions to add values to stats + * pcu: tbf_ul: Clean up maybe_schedule_uplink_acknack() + * sysmo: femtobts.h: Avoid redefining global variables + * rlc: Drop unused function gprs_rlc_data::put_data + * rlc: Move prepare() function out of gprs_rlc_data struct + * tbf_ul: Fix UL ACK not sent to MS if intermediate UL block is lost + * Get rid of class GprsCodingScheme + * gsmtap: Set signal level and SNR fields + * gprs_ms: Small clean ups in IMSI storage related code + * gprs_ms: Transfer known EGPRS MS class when mergling old MS + * tbf: Drop unneeded method set_tlli_from_ul + * pdch.cpp: Fix logging line format in rcv_block wrong length + * Set correct GSMTAP channel type for PDTCH messages returning error + * decoding.cpp: Improve logging in malformed UL data parsing + * tbf_dl: uint8_t is enough to store a TA value + * encoding: Encode TA as unsigned and check validty against GSM48_TA_INVALID + * encoding.cpp: Fix missing spacing in function param + * pdch.cpp: Avoid dropping existing DL TBF during rcv_resource_request + * pdch.cpp: Avoid resetting (egprs_)ms_class to unknown if not found in MS RadioAccCap + * pdch.cpp: Fix wrong annoying log line about non-scheduled ResourceReq received + * pdch.cpp: Store TLLI promptly on newly created TLLI in rcv_resource_request + * Fix typo in log message + * pdch: Drop unneeded notice log message in rcv pkt meas report + * Introduce log macro helper LOGPMS + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * pdch: rcv pkt meas rep: Allocate MS object early in path and use it + * Fix recent typo preventing MS from registering + * gitignore: Add __pychache__ dir + * tbf: Don't log rlcmac_diag() output in separate lines + * gprs_ms_storage.h: Set pointer to NULL instead of 0 + * Free all MS TBFs when receiving GPRS Suspension Request + * cosmetic: fix indentation alignment + * vty: Add 'show bts pdch' command + * cosmetic: Fix indentation of for loops + * cosmetic: Fix typo in comment + * Fix crash accessing NULL tbf->pdch[first_ts] + * contrib/jenkins: Enable parallel make in make distcheck + * Improve debug logging for alloc algos + * Fix several calls to LOGPAL + * Move gprs_rlcmac_ul_tbf::window to correct file + * Move constructor gprs_rlcmac_dl_tbf::BandWidth to correct file + * tbf: Make window() available to tbf base class + * tbf: Implement enable_egprs() once + * tbf: Set MS during constructor time + * Move ul_tbf allocation code to correct file + * Move dl_tbf allocation code to correct file + * tbf: Drop unused function disable_egprs() + * tests: ms: Pass correct pointer in constructor instead of NULL + * tbf: Clean up gprs_rlcmac_dl_tbf::handle() + * alloc_algo_b: Select TRX with least assigned TFIs during TBF alloc + * bts: define egprs_enabled as bool + * cosmetic: Fix ws between if keyword and parenthesis + * tbf_dl: Update (egprs_)ms_class for already known MS + * cosmetic: tests: pcu_emu: fix trailing whitespace + * gprs_ms: Use proper function to get CS + * Move BTS initial values inside bts.cpp + * pcuif: Improve BTS-supported CS/MCS handling + * Move EGPRS MS mode set to gprs_ms.cpp + * Take into account BTS supported (M)CS values when retrieving the maximum + * Enable egprs support through PCUIF from BTS/BSC + * pdch: Process received CS1-4 data blocks regardless of egprs_enabled + * tbf_dl: Don't fake EGPRS MS class when no related info is available + * tbf_ul: Allow non-egprs phones if EGPRS is enabled + * Get rid of bts->egprs_enabled + * Fix configuration of initial_(m)cs + * Fix mcs_is_valid(): UNKNOWN value is not a valid (M)CS + * gprs_ms: Avoid enabling EGPRS if no MCS are supported + * tbf_ul: Log mismatching TLLI on log message + * Fix ctr reports: Remove ctr description from already removed counter + * encoding: Fix duplicate word in log str + * sched: Fix sending GSMTAP DL data blocks with unset USF + * sched: Use correct GMSTAP category for EGPRS DL data blocks + * Support multiplexing of GPRS and EGPRS TBFs in one PDCH + * pdch: packet_paging_request: Put back non-fitting paging entry where where it was + * pdch: Log hexdump of decde failure for dl rlcmac block + * csn1: Fix readIndex pointer change in CSN_VARIABLE_ARRAY + * csn1: Log CSN_VARIABLE_ARRAY values as hex + * main: generate coredump and exit upon SIGABRT received + * tbf: Log previous TS when changing Control TS + * Implement downgrade to DL MCS1-4 when USF for GPRS_only MS + * Dl TBF: Get rid of LLC UI dummy blocks following other data + * rlcmac: Fix typo in MT_PACKET_CELL_CHANGE_NOTIFICATION value_string + * gprs_rlcmac_sched: Use helper structure to store several tbf pointer params + * sched: Convert code handling next_list array to be size independant + * Convert GprsMS and helpers classes to C + * tbf: Fix wrong verb used in log message + * .gitignore: ignore files ending with ~ + * doc: Improve CS/MCS GPRS/EGPRS considerations in User Manual + * tbf: remove 'software error' logs from tbf_free + * ms: Replace struct var with rate_ctr + * AllocTest: Avoid queuing tons of to-be-freed ms + * gprs_ms: Mark ms_ctrg_desc static + * Workaround ASan false positive runtime errors under some platforms + * Split PCU global PCU object from BTS object + * Move T_defs_pcu from BTS to PCU object + * Move force_two_phase field from BTS to PCU + * Move alpha,gamma fields from BTS to PCU + * Move dl_tbf_preemptive_retransmission field from BTS to PCU + * Move dl_arq_type field from BTS to PCU + * Move cs_adj* fields from BTS to PCU + * Move cs_downgrade_threshold field from BTS to PCU + * Move (m)cs_lqual_ranges fields from BTS to PCU + * Move ns_dialect field from BTS to PCU + * Move fc_* fields from BTS to PCU + * tests/tbf: Allocate PCU per test instead of globally + * Move ws_* fields from BTS to PCU + * Move llc_* fields from BTS to PCU + * Fix configuration mess of initial_cs/mcs between PCUIF and VTY + * Unify BTS into a C usable structure + * Get rid of bts singletons + * Rename 'bts_data' leftovers to 'bts' + * bts: combine bts_{init,cleanup} into consturctor/destructor methods + * Get rid of unused gsm_timer.{cpp,h} + * Convert gprs_bssgp_pcu.cpp to C + * Move tbf::free_all static methods to proper object files + * Convert osmo_bts_sock.cpp to C + * Allow multiple bts objects in PCU + * bts: Store RAC+CI from info_ind + * Get rid of singleton gprs_bssgp_pcu_current_bctx() + * Initial handling support for RIM messages + * gprs_pcu: Use libosmocore osmo_cgi_ps_cmp API + * ms: Drop always-false check + * sched: Check if egprs is enabled in TBF rather than MS being egprs capable + * tbf: Drop always-true condition checking for MS + * encoding: fix typos in comment + * ms: Set proper initial MCS values setting mode EGPRS_GMSK + * ms: Properly handle EGPRS_GMSK mode in ms_max_cs_dl/ul() + * Fix Dl EGPRS data blocks being generated occasionally on GPRS TBFs + * sched: Avoid picking TBF with nacked dl blocks when GMSK is required + * tbf: Make tbf_ms() param const + * Introduce NACC support + * NACC: Fix crash freeing struct if CTRL conn was refused during alloc + * NACC: delay CTRL conn socket init until it's needed + * NACC: allow setting keep time for entries in neigh and si cache + * NACC: Configure neighbor and SI resolution timeout values + * NACC: Send only Pkt Cell Chg Continue if SI retrieve fails + * doc: Mark PCU node red in network node diagram + * doc: Introduce section documenting NACC support + * nacc: Improve log line failing to establish CTRL neigh conn + * Update TS 04.60 references to new TS 44.060 + * Drop comment about an already implemented TODO + * Move src/tbf.txt to doc/ + * encoding: Fix comment description of S/P field + * tbf: Reuse stored result in variable in check_polling() + * tbf: Constify some methods + * nacc: Fix typo in function name + * nacc: Implement Pkt Cell Change Continue retransmission + * nacc: Avoid RIM procedures targeting cells under same PCU + * rlc.h: Fix struct bit fields on big endian systems + * cosmetic: fix typo in comment + * nacc_fsm: Move code filling struct to helper function + * nacc_fsm: Remove NACC_EV_RX_SI from in_event_mask of some states + * nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_RESOLVE_RAC_CI + * nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI + * nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states + * nacc_fsm: Improve log when sending RIM RAN-INFO to gather SI from remote cell + * vty: Write 'neighbor resolution' config to file + * cosmetic: fix line indentation + * sched: Avoid selecting TBF to tx NACC Dl msg if no TFI is assigned + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + * Use NULL as default value for pointer type + * find_multi_slots: Avoid calling mslot_class_get_tx() on each iteration + * find_multi_slots: Avoid multiple calls to mslot_class_get_rx() + * find_multi_slots: Mark mslot_class properties const + * find_multi_slots: Avoid multiple calls to mslot_class_get_type() + * Use ALPHA value received in SI13 from PCUIF + + [ Vadim Yanitskiy ] + * pcu_l1_if.cpp: fix NULL-pointer dereference in imsi2paging_group() + * gsm_timer: fix comparison of constant LONG_MAX with an integer + * encoding: fix log_alert_exit(): do not treat error as format string + * tests/alloc: fix implicit conversion from 'double' to 'int8_t' + * gprs_bssgp_pcu: fix invalid use of non-static data member 'frame' + * gprs_bssgp_pcu: fixup: fix length check in gprs_bssgp_pcu_rx_dl_ud() + * csn1: fix csnStreamDecoder(): avoid conditional calls to bitvec_read_field() + * VTY: get rid of pcu_vty_go_parent() / pcu_vty_is_config_node() + * VTY: install talloc context introspection commands + * pcu_sock: fix memleak, allocate pcu_sock_state on stack + * pcu_sock: cosmetic: fix typo in a comment message + * tbf: cosmetic: fix spacing in gprs_rlcmac_tbf::create_ul_ass() + * tbf: fix NULL pointer dereference in create_[ul|dl]_ass() + * encoding: assert return value of bitvec_set_u64() + * csn1: fix some mistaken CSN.1 error names + * csn1: fix csnStreamDecoder(): catch unknown CSN_CHOICE values + * tests/rlcmac: mark Packet Polling Request as malformed + * csn1: fix existNextElement(): use bitvec_get_bit_pos() + * tests/rlcmac: additionally match debug output of the CSN.1 codec + * csn1: get rid of C++ specific code, compile with GCC + * csn1: fix csnStreamDecoder(): do not subtract no_of_bits twice + * csn1: fix csnStreamDecoder(): always keep remaining_bits_len updated + * csn1: fix csnStreamDecoder(): update bit_offset in CSN_EXIST{_LH} + * csn1: bitvec_get_uint() may return a negative, use %d + * csn1: use proper format specifier for unsigned integers + * gsm_rlcmac: fix misleading LOGP statement in decode_gsm_ra_cap() + * tests/rlcmac: fix malformed MS RA capability in testRAcap() + * tests/rlcmac: also verify encoding of MS RA Capability + * tests/rlcmac: add a new test vector for Packet Resource Request + * csn1: fix csnStreamDecoder(): skip bits unhandled by serialize() + * tests/rlcmac: also enable logging for DRLCMACDATA category + * rlcmac: fix encode_gsm_*(): do not suppress encoding errors + * csn1: fix: do not return 0 if no bits left in the buffer + * BSSGP: cosmetic use OSMO_IMSI_BUF_SIZE from libosmocore + * BSSGP: fix: properly encode P-TMSI in RR Paging Request + * pdch: fix packet_paging_request(): properly print paging MI + * pdch: cosmetic: use GSM_MI_TYPE_* constants from libosmocore + * fix: properly include pure C headers from C++ code + * l1if: fix pcu_rx_rach_ind(): use proper format string specifiers + * sba: fix possible memleak in SBAController::alloc() + * TBF/UL: fix rcv_data_block_acknowledged(): print the actual TLLI + * fix egprs_mslot_class_from_ra(): multislot class may not be present + * l1if: fix: s/pcu_rx_rach_ind_pdtch/pcu_rx_rach_ind_ptcch/g + * csn1: fix M_CHOICE: restirct maximum length of the choice list + * csn1: fix csnStreamEncoder(): also check length of the choice list + * csn1: fix csnStreamEncoder(): always check the choice index + * csn1: fix: never use enumerated types in codec structures + * encoding: cosmetic: use RLC_MODE_ACKNOWLEDGED where possible + * RLC/MAC: implement decoding of EGPRS Packet Channel Request + * encoding: fix write_ia_rest_egprs_uplink_sba(): add missing CHECK(rc) + * doc/manuals: fix typo in overview.adoc: s/Omsocom/Osmocom/g + * bts: refactor handling and parsing of RACH.ind + * BTS::parse_rach_ind(): properly handle EGPRS Packet Channel Request + * bts: add send_gsmtap_rach(), also send PTCCH/U over GSMTAP + * bts: fix send_gsmtap_rach(): properly pack 11 bit RA + * bts: cosmetic: use DUMMY_VEC for padding where possible + * encoding: drop log_alert_exit(), use OSMO_ASSERT() instead + * encoding: assert() presence of Downlink TBF + * direct-phy: fix handle_ph_ra_ind(): handle PH-RA.ind on PRACH SAPI + * debian/control: change maintainer to the Osmocom team / mailing list + * pcu_l1_if: use proper format specifier for PCUIF version + * pcu_l1_if: constify the argument of pcu_rx_info_ind() + * pcu_l1_if: cosmetic: rename both 'trx'/'ts' to 'trx_nr'/'ts_nr' + * pcu_l1_if: cosmetic: move struct 'gprs_rlcmac_pdch' into the for loop + * pcu_l1_if: cosmetic: correct error message in pcu_rx_info_ind() + * gsm_rlcmac: use consistent naming for [Extended] Packet Timing Advance + * tbf: cosmetic: use GSM_MACBLOCK_LEN where possible + * tbf: allocate the bitvec on stack in create_{dl,ul}_ass() + * encoding: constify 'tbf' in UL/DL assignment functions + * encoding: do not encode out of range Timing Advance values + * encoding: fix RRBP field in write_packet_uplink_assignment() + * encoding: use bool for use_egprs in write_packet_uplink_assignment() + * encoding: pass pdch slot directly to encoding functions + * encoding: clarify docstring for write_packet_downlink_assignment() + * encoding: use CSN.1 codec to generate Packet Uplink Assignment + * encoding: implement handing of hopping parameters + * encoding: fix gen_freq_params(): do not check pdch twice + * pcuif_proto: version 10: add frequency hopping parameters + * pcu_l1_if: cosmetic: use ARRAY_SIZE() in pcu_rx_info_ind() + * pcu_l1_if: correct logging level in pcu_rx_info_ind() + * pcu_l1_if: cosmetic: make {local,remote}_sockaddr scoped variables + * pcu_l1_if: use proper format string specifiers: %d -> %u + * pcu_l1_if: print NSVC address in more common format + * gprs_bssgp_pcu: make osmo_sockaddr local/sgsn arguments const + * gprs_bssgp_pcu: fix possible memleak in gprs_nsvc_create_and_connect() + * struct gprs_rlcmac_bts: remove unused 'nsei' field + * gprs_bssgp_pcu: fix: do not crash on receipt of subsequent INFO.ind + * doc/manuals: (re-)generate XML VTY reference automatically + * fix tbf_select_slot_set(): use LOGP() instead of LOGPC() + * main: remove line breaks in print_help(), increase spacing + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * BSSGP: use tlvp_val8() in gprs_bssgp_pcu_rx_paging_cs() + * BSSGP: constify argument 'tp' of gprs_bssgp_pcu_rx_paging_{cs,ps} + * TLLI 0x00000000 is a valid TLLI, use 0xffffffff instead + * gprs_rlcmac_sched: fix incorrect SBA frame number assignment + * bts: fix uninitialized memaccess in BTS::send_gsmtap_rach() + * bts: fix uninitialized memaccess in BTS::send_gsmtap() + * tests/rlcmac: add more test vectors for Packet Resource Request + * contrib/osmo-pcu.spec.in: require libosmo* version 1.4.0 + * contrib/osmo-pcu.spec.in: add missing libosmoctrl dependency + * vty: register libosmocore's FSM introspection commands + + [ Anders Broman ] + * csn1: Update M_NULL CSN_DESCR to match wireshark + * csn1: packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function + * csn1: Fix warning with -Wmissing-prototypes + * csn1: Try to fix cast discards '__attribute__((const))' qualifier from pointer target type + * gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf. + + [ Jeff Morriss ] + * csn1: shuffle decrements of remaining_bits_len + + [ Pascal Quantin ] + * csn1: Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits + * gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure + * gsm_rlcmac: Enhance dissection of PSI1 + * gsm_rlcmac.cpp: Do not skip too many lines of the CSN_DESCR when the field is missing + * gsm_rlcmac.cpp: fix an out of bounds access + * gsm_rlcmac.cpp: fix another global-buffer-overflow error reported by ASAN + * gsm_rlcmac.cpp: fix global-buffer-overflow error reported by ASAN + + [ Guy Harris ] + * csn1: Don't cast away constness + + [ Alexis La Goutte ] + * csn1: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7 + + [ Bill Meier ] + * gsm_rlcmac.h: #if 0 unused stuff + + [ Gerald Combs ] + * gsm_rlcmac.h: Make sure we have a corresponding 'u' member to RlcMacDownlink_t for every call + + [ Vincent Helfre ] + * gsm_rlcmac: add dissection of NAS container + * gsm_rlcmac: improve dissection of MS RA Capability IE + + [ AndersBroman ] + * gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 + + [ Keith ] + * Send UL-CTRL Packet to GSMTAP even if we fail to decode. + * Don't check ul_control_block before decoding into it. + + [ Harald Welte ] + * csn1.c: Almost all of the logging is DEBUG, not NOTICE + * TODO: remove those that have obviously been implemented 5+ years ago + * bts.cpp: Increase constructor priority + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * gb manual: 08.16 -> 48.016 / 08.18 -> 48.018 + * gb manual: NS is implemented in libosmogb, not libosmocore + * manuals/gb/ns.adoc: Update documentation regarding SNS capability + * migrate to DLBSSGP as log sub-system for BSSGP + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + * tbf: add virtual destructor + + [ Philipp Maier ] + * gprs_debug: Use only LOGL_NOTICE as default loglevel + * vty: add attributes to VTY commands indicating when they apply + * pcu_main: add commandline option --vty-ref-xml + * gprs_bssgp_rim: add serving BSS NACC application + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Neels Hofmeyr ] + * use new osmo_mobile_identity api (avoid deprecation) + * paging: pass struct osmo_mobile_identity, not encoded IE bytes + + [ Alexander Couzens ] + * pcuif_proto: version 0xa: add support for IPv6 NSVCs + * Revert "pcuif_proto: version 0xa: add support for IPv6 NSVCs" + * pcuif_proto: version 10: add support for IPv6 NSVCs + * Use the new NS2 lib + * Rework NS configuration over the info indication + * pcu_l1_if: fix misaligned assignment of remote address + * NS2: follow the change of ownership + * gprs_bssgp_pcu: follow ns2 library changes + * NS2: rework handling of unknown primitive + * ns2: follow ns2 dialect changes + * ns2: follow changes to add a unique name to all binds + * ns2: follow ns2 sns api changes + * gprs_ns2: set default dialect to ipaccess + * gprs_rlcmac_sched: don't leak a sched_dummy() + * gprs_rlc_ts_alloc: ensure no rolling slots are allocated + * follow gprs_ns2 API enum changes + * gprs_ns2: migrate to the new vty syntax + * gprs_bssgp: rework and rename ns_create_nsvc -> ns_configure_nse + * gprs_bssgp: rename gprs_ns_config -> gprs_ns_update_config + * gprs_bssgp: use gprs_ns2_sns_add_bind() to allow the NSE to use the binds for IP-SNS configuration + + -- Pau Espin Pedrol Tue, 23 Feb 2021 14:41:00 +0100 + osmo-pcu (0.8.0) unstable; urgency=medium [ Alexander Couzens ] diff --git a/debian/control b/debian/control index 0d69a9a..a8eae93 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 1.4.0), - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Homepage: http://osmocom.org/projects/osmopcu Vcs-Git: git://git.osmocom.org/osmo-pcu -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4b9405df5f40e8f2724ba8aa8f88e2602c1e8374 Gerrit-Change-Number: 23042 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 14:53:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 14:53:00 +0000 Subject: Change in osmo-sgsn[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23043 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: I893fc869d5900eff8395bfded0c2fa3883c5a1e7 Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Related: SYS#5359 --- M src/sgsn/sgsn_main.c 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/43/23043/1 diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index c3a6061..6c57071 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -183,12 +183,43 @@ printf(" -s --disable-color\n"); printf(" -c --config-file\tThe config file to use [%s]\n", CONFIG_FILE_DEFAULT); printf(" -e --log-level number\tSet a global log level\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"debug", 1, 0, 'd'}, @@ -198,6 +229,8 @@ {"timestamp", 0, 0, 'T'}, { "version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {NULL, 0, 0, 0} }; @@ -207,6 +240,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': //print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I893fc869d5900eff8395bfded0c2fa3883c5a1e7 Gerrit-Change-Number: 23043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 14:53:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 14:53:00 +0000 Subject: Change in osmo-sgsn[master]: manuals: generate vty reference xml at build time References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Move 'doc' subdir further down to "make sure" the osmo-bsc binary is built before the docs Rremove sgsn_vty_reference from the source tree. In manuals//Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-sgsn --vty-ref-xml cmdline switch. Change-Id: Ied75fdd13283aa592350994fb4febce06c213d3a Depends: I613d692328050a036d05b49a436ab495fc2087ba --- M Makefile.am M doc/manuals/Makefile.am D doc/manuals/vty/sgsn_vty_reference.xml 3 files changed, 7 insertions(+), 2,678 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/23044/1 diff --git a/Makefile.am b/Makefile.am index 17b3fc6..023a470 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,11 +9,11 @@ $(NULL) SUBDIRS = \ - doc \ include \ src \ contrib \ tests \ + doc \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index bc34497..8fce741 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -12,6 +12,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosgsn-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/sgsn_vty_reference.xml + $(builddir)/vty/sgsn_vty_reference.xml: $(top_builddir)/src/sgsn/osmo-sgsn + mkdir -p $(builddir)/vty + $(top_builddir)/src/sgsn/osmo-sgsn --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-sgsn diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml deleted file mode 100644 index 8ffc607..0000000 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ /dev/null @@ -1,2677 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-bssgp - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-sgsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ied75fdd13283aa592350994fb4febce06c213d3a Gerrit-Change-Number: 23044 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:04:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:04:21 +0000 Subject: Change in osmo-sgsn[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23043 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I893fc869d5900eff8395bfded0c2fa3883c5a1e7 Gerrit-Change-Number: 23043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:04:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:04:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:04:51 +0000 Subject: Change in osmo-sgsn[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ied75fdd13283aa592350994fb4febce06c213d3a Gerrit-Change-Number: 23044 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:04:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:04:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:04:58 +0000 Subject: Change in osmo-sgsn[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23043 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: I893fc869d5900eff8395bfded0c2fa3883c5a1e7 Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Related: SYS#5359 --- M src/sgsn/sgsn_main.c 1 file changed, 36 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index c3a6061..6c57071 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -183,12 +183,43 @@ printf(" -s --disable-color\n"); printf(" -c --config-file\tThe config file to use [%s]\n", CONFIG_FILE_DEFAULT); printf(" -e --log-level number\tSet a global log level\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"debug", 1, 0, 'd'}, @@ -198,6 +229,8 @@ {"timestamp", 0, 0, 'T'}, { "version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {NULL, 0, 0, 0} }; @@ -207,6 +240,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': //print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I893fc869d5900eff8395bfded0c2fa3883c5a1e7 Gerrit-Change-Number: 23043 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:05:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:05:00 +0000 Subject: Change in osmo-sgsn[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Move 'doc' subdir further down to "make sure" the osmo-bsc binary is built before the docs Rremove sgsn_vty_reference from the source tree. In manuals//Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-sgsn --vty-ref-xml cmdline switch. Change-Id: Ied75fdd13283aa592350994fb4febce06c213d3a Depends: I613d692328050a036d05b49a436ab495fc2087ba --- M Makefile.am M doc/manuals/Makefile.am D doc/manuals/vty/sgsn_vty_reference.xml 3 files changed, 7 insertions(+), 2,678 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 17b3fc6..023a470 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,11 +9,11 @@ $(NULL) SUBDIRS = \ - doc \ include \ src \ contrib \ tests \ + doc \ $(NULL) BUILT_SOURCES = $(top_srcdir)/.version diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index bc34497..8fce741 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -12,6 +12,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosgsn-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/sgsn_vty_reference.xml + $(builddir)/vty/sgsn_vty_reference.xml: $(top_builddir)/src/sgsn/osmo-sgsn + mkdir -p $(builddir)/vty + $(top_builddir)/src/sgsn/osmo-sgsn --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-sgsn diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml deleted file mode 100644 index 8ffc607..0000000 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ /dev/null @@ -1,2677 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-bssgp - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-sgsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ied75fdd13283aa592350994fb4febce06c213d3a Gerrit-Change-Number: 23044 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:05:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 23 Feb 2021 15:05:32 +0000 Subject: Change in osmo-sgsn[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ied75fdd13283aa592350994fb4febce06c213d3a Gerrit-Change-Number: 23044 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:05:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:05:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:05:42 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E132-3b8f-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23040 ) Change subject: Bump version: 1.2.0.132-3b8f-dirty ? 1.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I92b99ebab1d54e9cbdc8469d76105c55bcb03f36 Gerrit-Change-Number: 23040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:05:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:05:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:05:47 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E132-3b8f-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23040 ) Change subject: Bump version: 1.2.0.132-3b8f-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.132-3b8f-dirty ? 1.3.0 Change-Id: I92b99ebab1d54e9cbdc8469d76105c55bcb03f36 --- M TODO-RELEASE M configure.ac M contrib/osmo-trx.spec.in M debian/changelog M debian/control M debian/patches/build-for-debian8.patch 6 files changed, 164 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index c916fb1..e69de29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +0,0 @@ -* update libosmocore dependency to > 1.3.x for osmo_sched_vty_init(), osmo_sched_vty_apply_localthread() -* update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. -* update libosmocore dependency to > 1.4.x for osmo_fd_{read,write}_{enable,disable}() -* update libosmocore dependency to > 1.4.2 for osmo_gettid() diff --git a/configure.ac b/configure.ac index 8067fa7..5706a39 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,10 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.5.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/contrib/osmo-trx.spec.in b/contrib/osmo-trx.spec.in index 8f4bb48..b80d8e2 100644 --- a/contrib/osmo-trx.spec.in +++ b/contrib/osmo-trx.spec.in @@ -34,10 +34,10 @@ BuildRequires: pkgconfig(usrp) >= 3.3 %endif BuildRequires: pkgconfig(fftw3f) -BuildRequires: pkgconfig(libosmocoding) >= 1.3.0 -BuildRequires: pkgconfig(libosmocore) >= 0.12.0 -BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0 -BuildRequires: pkgconfig(libosmovty) >= 0.12.0 +BuildRequires: pkgconfig(libosmocoding) >= 1.5.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(uhd) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index 0ec7b9f..f69b2d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,157 @@ +osmo-trx (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Make logging category DLMS generic and reusable for other backends + * uhd: Use DEVDRV log category and support UHD >=3.11 logging framework + * uhd: Improve some logging lines printing UHD pretty-print output + * doc: clarify number of channels on B210 with multi-arfcn enabled + * radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions + * doc: Update vty reference xml file + * lms: Move initialization of field started to constructor + * lms: Drop unused define + * smpl_buf: Fix str_code() param and print unknown error val + * lms: Improve smpl_buf error logging + * lms: Change radioDevice constructor arg name to avoid masking instance attr + * lms: Make reference to std::vector unambiguous + * lms: Move rx_buffers allocation to constructor + * lms: Store device type specific parameters in one place + * lms: Make ts_offset and smpl rate coefs device-specific + * lms: Initial multi-arfcn support + * contrib/jenkins.sh: Reorder sanity checks + * debug.h: Avoid printing pthread_t type + * debug.h: Fix print format of chan in CLOGCHAN + * cosmetic: fix several typos found by codespell + * radioDevice: Drop unused RSSI param from readSamples API + * radioDevice: Drop unused isControl param from WriteSamples API + * Use OSMO_FD_READ instead of deprecated BSC_FD_READ + * Transceiver: Fix extra space in RSP NOISELEV error + * Transceiver: Implement TRXC cmd NOMTXPOWER + * UHDDevice: Implement getNominalTxPower() based on TxFrequency + * radioInterface: Operate on real Tx power attenuation rather than on device specific gains + * UHDDevice: Compute TxGain on UHD API based on expected Tx output power + * proto_trxd: Fix UndefinedBehaviorSanitizer from ubsan + * Transceiver: Allow sending negative nominal tx power in RSP NOMTXPOWER + * LMSDevice: Compute TxGain on LimeSuite API based on expected Tx output power + * Drop old TxGain APIs from parent radioDevice abstract class + * {UHD,LMS}Dervice: Log expected resulting TxPower when setting device specific TxGain + * cosmetic: trx_rate_ctr: Fix whitespace + * trx_rate_ctr: Fix immediate rescheduling on per-sec thresholds + * Rename device specific rate counter multi-thread helpers + * Introduce rate counter tx_stale_bursts + * TransceiverState: Initialize ctrs field in constructor + * doc/manuals: Update thread documentation after dropping CTRL sock threads + * trx_rate_ctr: Fix locking wrong mutex + * Introduce rate counters to detect issues in received Dl bursts from TRXD + * Transceiver: Fix race condition obtaining Dl burst from Upper layer + * Add rate counter for missing Txbursts when scheduled towards the radioInterface + * Transceiver: Provide initial value for TransceiverState::mFiller in constructor + * Transceiver: Use already obtained value from Rx msg structure + * Transceiver: Restrict conditions where FN gaps are detected + * trx_rate_ctr: Lower some log levels + * Introduce CTR log category + * Transceiver: Lower some log levels which have an associated counter + * Transceiver: Check log level before generating burst str representation + * Transceiver: Add several rate_ctr for rx error conditions + * Use new libosmovty cpu sched config features + * debian: Update debian8 osmo-trx specific patch + * jenkins.sh: Verify distro-specific patches apply + * ipc: fix var declaration in for loop + * Add support for TRXC MUTE command + * arch: x86: Fix convolve optimizations breaking signal + * contrib/jenkins: Enable parallel make in make distcheck + * Transceiver: Pass config struct instead of large list of params + * Calculate RSSI offset based on RxGain configuration + * main: generate coredump and exit upon SIGABRT received + * ipc: Fix wrong reference to BTS in log line + * ipc-driver-test: Allow setting dir prefix for UD socket + * radioInterfaceMulti: Fix memory leak upon close() + * ChannelizerBase: Fix memory leak + * Threads.cpp: Use already existing gettid wrapper function + * Replace my_gettid with libosmocore osmo_gettid API + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Philipp Maier ] + * debug: use LOGL_NOTICE for log category DDEV + * doc: do not set the base-port of the trx + * doc: apply an rssi-offset of 28 by default. + * doc: switch log levels to notice + * Transceiver: Log when sending of CLK indications begins + * vty: add attributes to VTY commands indicating when they apply + * osmo-trx: add commandline option --vty-ref-xml + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + * transceiver: check the right vector + * transceiver: get rid of the ctrl threads + * add kernel style .clang-format with 120 chars per line limit + * devices: reset internal smart sample buffers upon stop + * transceiver: optimize code if optimizations are enabled + * transceiver: initialize reorder flag so we don't miscount + + [ Harald Welte ] + * PRBS tool sending PRBS sequence to TRX + * prbs-tool: Add error simulation capabilities + * utils: Ensure content of this directory is included in 'make dist' + * prbs-tool: Don't require C99 + * RPM spec file: Require uhd-firmware for osmo-trx-uhd + * osmo-trx.spec.in: Use %config(noreplace) to retain current config file + * Fix build on Debian8 + * [cosmetic] radioInterfaceMulti: More comments + * [cosmetic] radioIntefaceMulti: Fix whitespace / indent + * ipc: Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() wherever applicable + * Use osmo_fd_*_{disable,enable} + * README update + * manual: Fix typo OsmTRX -> OsmoTRX + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Vadim Yanitskiy ] + * UHDDevice: catch LookupError/IndexError in set{Rx,Tx}Antenna() + * debian/control: change maintainer to the Osmocom team / mailing list + * proto_trxd: cosmetic: 'if' is not a function, add space + * vty: add multi-ARFCN specific warning for chan N > 0 + * radioDevice: fix set_antennas(): consider MULTI_ARFCN mode + * device/lms: fix: 'trx_vty.h' header requires C linkage + * device/lms: fix missing semicolon in LMSDevice::assign_band_desc() + * device/lms: get rid of 'using namespace std' + * device/common/Makefile.am: remove $(LMS_CFLAGS) from AM_CXXFLAGS + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * device: drop unreasonable LIBOSMO{CTRL,VTY}_{CFLAGS,LIBS} + * Transceiver: use size_t and ARRAY_SIZE() in constructor + * Transceiver: explicitly init m{Rx,Tx}LowerLoopThread + * vty: fix documentation for 'swap-channels (disable|enable)' + * vty: fix documentation for 'egprs (disable|enable)' + * vty: fix documentation for 'rx-sps (1|4)' and 'tx-sps (1|4)' + * vty: cosmetic: use VTY_IPV4_CMD in 'bind-ip' / 'remote-ip' + * vty: fix documentation for 'multi-arfcn (disable|enable)' + * vty: remove groundless statement about filler type 'dummy' + * vty: auto-generate cmd and doc strings for cfg_filler_type_cmd + * vty: fix documentation for 'ext-rach (disable|enable)' + * main: use logging API to print SIMD info instead of printf() + * doc/manuals: generate XML VTY reference at build-time + * vty: fix swapped documentation for 'filler type' command + * Transceiver: fix integer division in addRadioVector() + * Transceiver: use proper factor for amplitude scaling + * Add a (hidden) VTY parameter for Rx/Tx freq. shifting + + [ Eric Wild ] + * osmo-trx-ipc + + [ Alexander Couzens ] + * osmo-trx.spec: move ipc-driver-test into package ipc-test + + [ Sylvain Munaut ] + * sigProcLib: fix C/I computation for 8-PSK modulated bursts + + -- Pau Espin Pedrol Tue, 23 Feb 2021 14:27:15 +0100 + osmo-trx (1.2.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index 12d9af5..d1532f2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ libtalloc-dev, libusrp-dev, liblimesuite-dev, - libosmocore-dev (>= 1.3.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-trx diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index ee3bd19..074dca9 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, - libosmocore-dev (>= 1.3.0), + libosmocore-dev (>= 1.5.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I92b99ebab1d54e9cbdc8469d76105c55bcb03f36 Gerrit-Change-Number: 23040 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:15:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:15:30 +0000 Subject: Change in libosmo-abis[master]: gitignore: Ignore autofoo files *~ References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23045 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... gitignore: Ignore autofoo files *~ Change-Id: I64e433f2425dbe2b22103f986354939c0ac9d9f9 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/45/23045/1 diff --git a/.gitignore b/.gitignore index 2eee9cd..5b742e7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ stamp-h1 #libosmo-abis-* tests/*_test +*~ # libtool and e.g. arm-poky-linux-gnueabi-libtool *libtool -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I64e433f2425dbe2b22103f986354939c0ac9d9f9 Gerrit-Change-Number: 23045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:22:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:22:25 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E34-2163-dirty_=E2=86=92_1=2E1=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23046 ) Change subject: Bump version: 1.0.0.34-2163-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.34-2163-dirty ? 1.1.0 Change-Id: Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 --- M configure.ac M contrib/libosmo-abis.spec.in M debian/changelog M debian/control R debian/libosmoabis10.install M src/Makefile.am 6 files changed, 69 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/46/23046/1 diff --git a/configure.ac b/configure.ac index 6a3bc4b..0becff9 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PROG_INSTALL LT_INIT([pic-only]) -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) @@ -66,10 +66,10 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_ARG_ENABLE([dahdi], diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in index d010099..2448564 100644 --- a/contrib/libosmo-abis.spec.in +++ b/contrib/libosmo-abis.spec.in @@ -27,10 +27,10 @@ BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: xz -BuildRequires: pkgconfig(libosmocore) >= 1.1.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.1.0 -BuildRequires: pkgconfig(libosmovty) >= 1.1.0 -BuildRequires: pkgconfig(libosmocodec) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.5.0 BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(talloc) @@ -39,12 +39,12 @@ BSC. This interface allows control of the radio equipment and radio frequency allocation in the BTS. -%package -n libosmoabis9 +%package -n libosmoabis10 Summary: Osmocom GSM A-bis interface library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmoabis9 +%description -n libosmoabis10 In the GSM system architecture, A-bis is a Base Station System-internal interface linking the Base Transceiver Stations (BTS) and Base Station Controller (BSC). This interface allows control of @@ -58,7 +58,7 @@ Summary: Development files for the Osmocom GSM A-bis library License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmoabis9 = %version +Requires: libosmoabis10 = %version Requires: libosmocore-devel >= 0.3.0 Requires: libosmogsm-devel >= 0.3.10 @@ -120,12 +120,12 @@ %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) -%post -n libosmoabis9 -p /sbin/ldconfig -%postun -n libosmoabis9 -p /sbin/ldconfig +%post -n libosmoabis10 -p /sbin/ldconfig +%postun -n libosmoabis10 -p /sbin/ldconfig %post -n libosmotrau2 -p /sbin/ldconfig %postun -n libosmotrau2 -p /sbin/ldconfig -%files -n libosmoabis9 +%files -n libosmoabis10 %defattr(-,root,root) %_libdir/libosmoabis.so.9* diff --git a/debian/changelog b/debian/changelog index b839ed9..d5e9e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +libosmo-abis (1.1.0) unstable; urgency=medium + + [ Harald Welte ] + * trau_frame: New API + * trau_frame: Introduce support for Downlink Time Alignment + * osmo_trau_frame_encode(): Check for sufficiently sized output buffer + * Add new TRAU frame sync code + * TRAU frame RTP conversion + * Add 'trau2rtp' demo program illustrating the use of new TRAU code + * Add missing build dependency to libosmocodec-dev + * trau_frame: Fix computation of odd parity while encoding HR frames + * trau_sync: Check return value of osmo_fsm_register() + * trau_frame: Add missing break statement in osmo_trau_frame_encode() + * Fix RPM spec file (.so.6 -> .so.9) + * debian: Build libosmo-abis with osmo-e1d support + * Revert "debian: Build libosmo-abis with osmo-e1d support" + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() wherever applicable + * e1_input: Support I.460 timeslot type + * osmo_ortp: Don't print ERROR message for every missing RTP frame + * migrate to osmo_fd_{read,write}_{enable,disable}() + + [ Philipp Maier ] + * trau_sync: prevent false positive synchronization on startup + * trau_sync: make sync pattern configurable + * vty: add attributes to VTY commands indicating when they apply + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + * cosmetic: fix spelling in logging messages: existAnt -> existEnt + * ipaccess: fix verbosive logging in __handle_ts1_write() + + [ Pau Espin Pedrol ] + * tests: Disable stderr log color in trau_sync_test + * contrib/jenkins: Enable parallel make in make distcheck + * ipaccess: Use LOGPITS macro in __handle_ts1_write + * ipaccess: Fix log error printed on wrong conditional branch + * ipaccess: Fix wrong assertion in ipaccess_drop() when used by BTS code + * tests: trau_sync: Explicitly drop category from log + * gitignore: Ignore autofoo files *~ + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:21:49 +0100 + libosmo-abis (1.0.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index c304139..4608ad6 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ dh-autoreconf, libdpkg-perl, git, - libosmocore-dev (>= 1.4.0), + libosmocore-dev (>= 1.5.0), pkg-config, libortp-dev Standards-Version: 3.9.7 @@ -22,13 +22,13 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis9 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis10 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one package per DSO. -Package: libosmoabis9 +Package: libosmoabis10 Section: libs Architecture: any Multi-Arch: same @@ -60,7 +60,7 @@ Section: libdevel Depends: ${misc:Depends}, libosmotrau2 (= ${binary:Version}), - libosmoabis9 (= ${binary:Version}) + libosmoabis10 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis interface between GSM BTS and BSC. This package in particular contains the @@ -72,7 +72,7 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libosmoabis9 (= ${binary:Version}), +Depends: libosmoabis10 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface diff --git a/debian/libosmoabis9.install b/debian/libosmoabis10.install similarity index 100% rename from debian/libosmoabis9.install rename to debian/libosmoabis10.install diff --git a/src/Makefile.am b/src/Makefile.am index 24a7c26..346e67b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=9:0:0 -TRAU_LIBVERSION=5:0:3 +ABIS_LIBVERSION=10:0:0 +TRAU_LIBVERSION=6:0:4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 Gerrit-Change-Number: 23046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:22:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:22:32 +0000 Subject: Change in libosmo-abis[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23045 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I64e433f2425dbe2b22103f986354939c0ac9d9f9 Gerrit-Change-Number: 23045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:22:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:22:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:22:37 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E34-2163-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23046 ) Change subject: Bump version: 1.0.0.34-2163-dirty ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 Gerrit-Change-Number: 23046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 15:22:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:26:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:26:09 +0000 Subject: Change in libosmo-abis[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23045 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... gitignore: Ignore autofoo files *~ Change-Id: I64e433f2425dbe2b22103f986354939c0ac9d9f9 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 2eee9cd..5b742e7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ stamp-h1 #libosmo-abis-* tests/*_test +*~ # libtool and e.g. arm-poky-linux-gnueabi-libtool *libtool -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I64e433f2425dbe2b22103f986354939c0ac9d9f9 Gerrit-Change-Number: 23045 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:26:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:26:21 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E34-2163-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23046 ) Change subject: Bump version: 1.0.0.34-2163-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.34-2163-dirty ? 1.1.0 Change-Id: Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 --- M configure.ac M contrib/libosmo-abis.spec.in M debian/changelog M debian/control R debian/libosmoabis10.install M src/Makefile.am 6 files changed, 69 insertions(+), 22 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 6a3bc4b..0becff9 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PROG_INSTALL LT_INIT([pic-only]) -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) @@ -66,10 +66,10 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_ARG_ENABLE([dahdi], diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in index d010099..2448564 100644 --- a/contrib/libosmo-abis.spec.in +++ b/contrib/libosmo-abis.spec.in @@ -27,10 +27,10 @@ BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: xz -BuildRequires: pkgconfig(libosmocore) >= 1.1.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.1.0 -BuildRequires: pkgconfig(libosmovty) >= 1.1.0 -BuildRequires: pkgconfig(libosmocodec) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.5.0 BuildRequires: pkgconfig(ortp) >= 0.22 BuildRequires: pkgconfig(talloc) @@ -39,12 +39,12 @@ BSC. This interface allows control of the radio equipment and radio frequency allocation in the BTS. -%package -n libosmoabis9 +%package -n libosmoabis10 Summary: Osmocom GSM A-bis interface library License: AGPL-3.0-or-later Group: System/Libraries -%description -n libosmoabis9 +%description -n libosmoabis10 In the GSM system architecture, A-bis is a Base Station System-internal interface linking the Base Transceiver Stations (BTS) and Base Station Controller (BSC). This interface allows control of @@ -58,7 +58,7 @@ Summary: Development files for the Osmocom GSM A-bis library License: AGPL-3.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmoabis9 = %version +Requires: libosmoabis10 = %version Requires: libosmocore-devel >= 0.3.0 Requires: libosmogsm-devel >= 0.3.10 @@ -120,12 +120,12 @@ %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) -%post -n libosmoabis9 -p /sbin/ldconfig -%postun -n libosmoabis9 -p /sbin/ldconfig +%post -n libosmoabis10 -p /sbin/ldconfig +%postun -n libosmoabis10 -p /sbin/ldconfig %post -n libosmotrau2 -p /sbin/ldconfig %postun -n libosmotrau2 -p /sbin/ldconfig -%files -n libosmoabis9 +%files -n libosmoabis10 %defattr(-,root,root) %_libdir/libosmoabis.so.9* diff --git a/debian/changelog b/debian/changelog index b839ed9..d5e9e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +libosmo-abis (1.1.0) unstable; urgency=medium + + [ Harald Welte ] + * trau_frame: New API + * trau_frame: Introduce support for Downlink Time Alignment + * osmo_trau_frame_encode(): Check for sufficiently sized output buffer + * Add new TRAU frame sync code + * TRAU frame RTP conversion + * Add 'trau2rtp' demo program illustrating the use of new TRAU code + * Add missing build dependency to libosmocodec-dev + * trau_frame: Fix computation of odd parity while encoding HR frames + * trau_sync: Check return value of osmo_fsm_register() + * trau_frame: Add missing break statement in osmo_trau_frame_encode() + * Fix RPM spec file (.so.6 -> .so.9) + * debian: Build libosmo-abis with osmo-e1d support + * Revert "debian: Build libosmo-abis with osmo-e1d support" + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() wherever applicable + * e1_input: Support I.460 timeslot type + * osmo_ortp: Don't print ERROR message for every missing RTP frame + * migrate to osmo_fd_{read,write}_{enable,disable}() + + [ Philipp Maier ] + * trau_sync: prevent false positive synchronization on startup + * trau_sync: make sync pattern configurable + * vty: add attributes to VTY commands indicating when they apply + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + * cosmetic: fix spelling in logging messages: existAnt -> existEnt + * ipaccess: fix verbosive logging in __handle_ts1_write() + + [ Pau Espin Pedrol ] + * tests: Disable stderr log color in trau_sync_test + * contrib/jenkins: Enable parallel make in make distcheck + * ipaccess: Use LOGPITS macro in __handle_ts1_write + * ipaccess: Fix log error printed on wrong conditional branch + * ipaccess: Fix wrong assertion in ipaccess_drop() when used by BTS code + * tests: trau_sync: Explicitly drop category from log + * gitignore: Ignore autofoo files *~ + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:21:49 +0100 + libosmo-abis (1.0.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index c304139..4608ad6 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ dh-autoreconf, libdpkg-perl, git, - libosmocore-dev (>= 1.4.0), + libosmocore-dev (>= 1.5.0), pkg-config, libortp-dev Standards-Version: 3.9.7 @@ -22,13 +22,13 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis9 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis10 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one package per DSO. -Package: libosmoabis9 +Package: libosmoabis10 Section: libs Architecture: any Multi-Arch: same @@ -60,7 +60,7 @@ Section: libdevel Depends: ${misc:Depends}, libosmotrau2 (= ${binary:Version}), - libosmoabis9 (= ${binary:Version}) + libosmoabis10 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis interface between GSM BTS and BSC. This package in particular contains the @@ -72,7 +72,7 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libosmoabis9 (= ${binary:Version}), +Depends: libosmoabis10 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface diff --git a/debian/libosmoabis9.install b/debian/libosmoabis10.install similarity index 100% rename from debian/libosmoabis9.install rename to debian/libosmoabis10.install diff --git a/src/Makefile.am b/src/Makefile.am index 24a7c26..346e67b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -ABIS_LIBVERSION=9:0:0 -TRAU_LIBVERSION=5:0:3 +ABIS_LIBVERSION=10:0:0 +TRAU_LIBVERSION=6:0:4 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 Gerrit-Change-Number: 23046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:33:34 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Feb 2021 15:33:34 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 3: (6 comments) I'm pushing my current version now. Unfortunately there's a regression, I still need to figure out. When building the kernel from the kernel config (fragment), the GTP tunnel device can't get created anymore in osmo-ggsn. https://gerrit.osmocom.org/c/docker-playground/+/23005/3/osmo-ggsn-latest/Dockerfile File osmo-ggsn-latest/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/osmo-ggsn-latest/Dockerfile at 22 PS3, Line 22: RUN ln -s /bin/true /usr/local/bin/update-initramfs && \ > Some description about this would be welcome Done https://gerrit.osmocom.org/c/docker-playground/+/23005/3/scripts/kernel-test/qemu-ifup.sh File scripts/kernel-test/qemu-ifup.sh: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/scripts/kernel-test/qemu-ifup.sh at 5 PS3, Line 5: echo "[host] qemu-ifup: $br, $1, $docker_if" > maybe store $1 to some variable explaining the name instead of using $1 several times. Done https://gerrit.osmocom.org/c/docker-playground/+/23005/3/scripts/kernel-test/qemu-ifup.sh at 11 PS3, Line 11: ethtool -K $br gro off gso off tso off tx off rx off sg off >/dev/null 2>&1 > I don't think we need the ethtool lines here and below. Done https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/initrd-ggsn.sh File ttcn3-ggsn-test/initrd-ggsn.sh: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/initrd-ggsn.sh at 18 PS3, Line 18: > Not sure what do we win by creating a separate initrd instead of simply sharing the docker rootfs in [?] It is required to run the stock debian kernel. To share the docker rootfs inside qemu (as it was in the PoC), we need NET_9P_VIRTIO. In debian's kernel, this is built with =m and so we need to make the kernel module available before we can mount the docker rootfs over virtio. Before implementing it like it is now, I considered creating an initramfs with just that kernel module, and then mounting the entire rootfs over virtio in a second step and doing switch_root... but that just adds more complexity. https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/jenkins.sh File ttcn3-ggsn-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23005/3/ttcn3-ggsn-test/jenkins.sh at 24 PS3, Line 24: cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ > This line can be moved to the else condition below. Done https://gerrit.osmocom.org/c/docker-playground/+/23005/2/ttcn3-ggsn-test/kernel-config File ttcn3-ggsn-test/kernel-config: https://gerrit.osmocom.org/c/docker-playground/+/23005/2/ttcn3-ggsn-test/kernel-config at 5 PS2, Line 5: CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" > Agree with laforge, I'd prefer using config fragments with the relevant configs to enable. Done. I've diffed Pau's config against defconfig, that gave the smallest diff (vs allnoconfig or tinyconfig). The README explains how to generate kernel config fragments now. There is probably still a lot that could be removed from the fragment, but rebuilding the kernel to test that it still works after each change is time consuming so I didn't optimize it further yet. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 15:33:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:33:47 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Feb 2021 15:33:47 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: Hello laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23001 to look at the new patch set (#3). Change subject: jenkins-common.sh: add common clean up trap ...................................................................... jenkins-common.sh: add common clean up trap Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning of the jenkins.sh files. Move the common clean up code from the end of every jenkins.sh file into clean_up_common(), which gets called by the trap. Add a custom clean_up() function to those jenkins.sh files that need additional clean up. Replace explicit container stop commands (for containers attached to the docker network) with one call to network_clean() in clean_up_common(). It kills all containers attached to the docker network. The motivation for this change is the upcoming optional build of initrd and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a short smoke test will be performed to make sure we can boot the kernel and initrd, before continuing to run the entire testsuite against it. If building or the smoke test fails, we must do a proper clean up of the network and fix permissions. Related: OS#3208 Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 24 files changed, 98 insertions(+), 171 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/23001/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:33:47 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 23 Feb 2021 15:33:47 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23005 to look at the new patch set (#4). Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... ttcn3-ggsn-test: add kernel test Make it possible to run ttcn3-ggsn-test against osmo-ggsn with the GTP kernel module. This feature is enabled by environment variables explained in ttcn3-ggsn-test/jenkins.sh, and can either use the pre-built kernel from Debian, or build a kernel from source. The kernel runs inside QEMU inside the usual osmo-ggsn-master docker image. Thanks to Pau for providing the kernel config and kernel-test scripts that this patch is based on! I ended up modifying them quite a bit to fit the docker use case, and to build the initrd (so we can use the stock debian kernel). Related: OS#3208 Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d --- M .gitignore M README.md M jenkins-common.sh M osmo-ggsn-latest/Dockerfile M osmo-ggsn-master/Dockerfile A scripts/kernel-test/initrd-build.sh A scripts/kernel-test/initrd-init.sh A scripts/kernel-test/kernel-build.sh A scripts/kernel-test/prepare.sh A scripts/kernel-test/qemu-ifdown.sh A scripts/kernel-test/qemu-ifup.sh A scripts/kernel-test/run-qemu.sh A ttcn3-ggsn-test/fragment.config A ttcn3-ggsn-test/initrd-ggsn.sh M ttcn3-ggsn-test/jenkins.sh A ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 16 files changed, 771 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/23005/4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:36:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:36:10 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E444-8777-dirty_=E2=86=92_1=2E3=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/23047 ) Change subject: Bump version: 1.2.0.444-8777-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.444-8777-dirty ? 1.3.0 Change-Id: I206af3596a714e5e9038b22e84ae6c20dc360e13 --- M TODO-RELEASE M configure.ac M contrib/osmo-bts.spec.in M debian/changelog M debian/control 5 files changed, 491 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/23047/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 66a9bb3..e69de29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,2 +0,0 @@ -* update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. -* update libosmocore dependency for osmo_fd_{read,write}_{enable,disable}() diff --git a/configure.ac b/configure.ac index 249a81a..2b5a316 100644 --- a/configure.ac +++ b/configure.ac @@ -69,14 +69,14 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.1.0) AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) AC_ARG_ENABLE(sysmobts-calib, diff --git a/contrib/osmo-bts.spec.in b/contrib/osmo-bts.spec.in index 1b7a9e5..a6d5e86 100644 --- a/contrib/osmo-bts.spec.in +++ b/contrib/osmo-bts.spec.in @@ -27,14 +27,14 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocodec) >= 1.2.0 -BuildRequires: pkgconfig(libosmocoding) >= 1.2.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmotrau) >= 0.6.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.5.0 +BuildRequires: pkgconfig(libosmocoding) >= 1.5.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmotrau) >= 1.1.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 ### FIXME: DependencyHACK to include osmocom/gprs/protocol/gsm_04_60.h BuildRequires: pkgconfig(libosmogb) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index aa3269b..bc44837 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,475 @@ +osmo-bts (1.3.0) unstable; urgency=medium + + [ Michael McTernan ] + * measurement: use signed integer for division of ta256b_sum + + [ Vadim Yanitskiy ] + * common/vty.c: get rid of generic exit / end commands + * common/abis.c: make use of RSL TEI from OML IPA RSL Connect + * L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() + * osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS + * vty: fix left shift by 31 cannot be represented in type 'int' + * common/sysinfo: reduce criticality of a logging message + * osmo-bts-virtual: fix wrong endianness in gsmtap_hdr_stringify() + * osmo-bts-virtual: do not print redundant info in tx_to_virt_um() + * osmo-bts-virtual: do not log GSMTAP message sending failure twice + * l1sap: fix gsmtap_ph_rach(): properly pack 8-bit and 11-bit RA + * osmo-bts-{sysmo,oc2g,lc15}: fix segfault on 'dsp-trace-flag' + * osmo-bts-trx/scheduler: remove a left-over from UL TCH handlers + * oml: fix oml_mo_tx_sw_act_rep(): do not allocate FOM header twice + * fix typo in osmo_bts_variant_names: s/omso/osmo/g + * doc/manuals: fix typo in interfaces.adoc: s/Omsocom/Osmocom/g + * osmo-bts-omldummy: print a brief usage statement if argc < 3 + * osmo-bts-omldummy: make number of transceivers configurable + * vty: get rid of unused ournode_{exit,end}_cmd declarations + * vty: cosmetic: make an error message more informative + * vty: use gsm48_chan_mode_name() from libosmocore + * gsm_data_shared: drop unused supports_egprs_11bit_rach + * gsm_data_shared: drop unused enum bts_gprs_mode + * gsm_data_shared: drop unused channel request reason definitions + * gsm_data_shared: get rid of unused HARDCODED_{ARFCN,BSIC} + * gsm_data_shared: get rid of unused HARDCODED_BTS{0,1,2}_TS + * gsm_data_shared: get rid of unused enum gsm_hooks + * gsm_data_shared: drop declaration of non-existing gsm_parse_reg() + * gsm_data_shared: drop unused A38_XOR_{MIN,MAX,COMP128}_KEY_LEN + * gsm_data_shared: drop unused MAX_EARFCN_LIST + * gsm_data_shared: drop unused LCHAN_SAPI_{UNUSED,MS,NET,REL} + * gsm_data_shared: drop unused struct bts_codec_conf + * gsm_data_shared: drop meaningless comments + * gsm_data_shared: drop unused sacch_deact from struct gsm_lchan + * gsm_data_shared: drop forward declaration of struct vty + * gsm_data_shared: drop unused *nmh from struct gsm_bts + * gsm_data_shared: drop unused dtxu from struct gsm_bts + * gsm_data_shared: drop unused ctrl_ack_type_use_block & net_ctrl_ord + * gsm_data_shared: drop unused rach_b_thresh & rach_ldavg_slots + * gsm_data_shared: drop force_combined_si & bcch_change_mark + * scheduler: drop non-existing extern declarations + * vty: fix bts_dump_vty(): properly print OML stream ID (TEI) + * rsl: refactor handling of RSL_IE_MR_CONFIG + * osmo-bts-trx: prettify Makefile.am: make it git friendly + * osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST + * osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros + * doc/examples: remove virtual/openbsc-virtual.cfg + * common/scheduler: fix unreachable code in trx_sched_set_lchan() + * common/scheduler: use boolean for channel activation state + * osmo-bts-trx/trx_if: fix memleak in trx_ctrl_cmd_cb() + * osmo-bts-trx/trx_if: cosmetic: s/ocommand/command/ + * oml: fix TL16V length calculation in add_bts_feat() + * osmo-bts-trx: indicate BTS_FEAT_EGPRS support to BSC + * gsm_data_shared: use bitvec API to allocate the feature vector + * Do not mix public and private BTS features, use libosmocore's API + * osmo-bts-trx/scheduler: properly handle NOPE.ind during handover + * osmo-bts-trx: use osmo_store32be() in trx_if_send_burst() + * osmo-bts-trx: move logical channel handlers to separate files + * osmo-bts-trx: introduce and use struct trx_dl_burst_req + * osmo-bts-trx: store pointer to gsm_lchan in l1sched_chan_state + * osmo-bts-trx: include BS Power reduction in Downlink bursts + * A-bis/RSL: refactor handling of BS Power IE (power reduction) + * A-bis/OML: fix logging: do not print A-bis MO name twice + * Use libosmocore's TDMA frame number API (constatns & arithmetic) + * osmo-bts-trx: fix trx_sched_fn(): properly advance frame number + * osmo-bts-trx/scheduler: make mark trx_sched_fn() return void + * vty: fix missing separator in help for power ramp commands + * osmo-bts-trx/scheduler: get rid of _sched_fcch_burst + * A-bis/OML: handle hopping params in Set Channel Attributes + * osmo-bts-trx/scheduler: cosmetic: move trx_if_powered() check + * osmo-bts-trx/scheduler: get rid of unused 'meas' in l1sched_chan_state + * l1sap: do not print redundant info in l1sap_chan_act() + * Constify the 'trx' argument of trx_get_hlayer1() everywhere + * common: constify the argument of trx_ms_pwr_ctrl_is_osmo() + * pcu_sock: constify the argument of ts_should_be_pdch() + * osmo-bts-trx/scheduler: fix CLCK.ind handling during ramping down + * osmo-bts-trx/scheduler: refactor dummy burst scheduling + * oml: fix ARFCN range check in oml_rx_set_radio_attr() + * oml: fix ARFCN range check in oml_rx_set_bts_attr() + * pcu_sock: use a 'switch' statement in ts_should_be_pdch() + * pcu_sock: warn about maximum transceiver number constraints + * pcu_sock: separate trx / ts filling from pcu_tx_info_ind() + * pcu_sock: use LOGPTRX() in info_ind_fill_trx() + * osmo-bts-trx/scheduler: implement baseband frequency hopping + * osmo-bts-trx: indicate support of BTS_FEAT_HOPPING + * l1sap: radio_link_timeout(): clarify logging messages + * l1sap: radio_link_timeout(): use LOGPLCHAN() macro + * l1sap: radio_link_timeout(): bad_frame is a boolean + * rsl: constify the 'lchan' argument of rsl_tx_conn_fail() + * debian/control: change maintainer to the Osmocom team / mailing list + * osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support + * vty: clarify documentation of '[no] gsmtap-sapi' command + * vty: add 'gsmtap-sapi (enable-all|disable-all)' command + * osmo-bts-trx/trx_provision_fsm: fix misleading comment in header + * osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function + * osmo-bts-trx/l1_if: drop redundant logging message + * osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly + * osmo-bts-trx/trx_provision_fsm: add missing default labels + * osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() + * struct gsm_bts_trx: remove unused per-TRX OML Link pointer + * struct gsm_bts_trx[_ts]: remove unused parsed NM attribute list + * gsm_data: rename hopping.{ma,ma_len} to hopping.arfcn_{list,num} + * pcuif_proto: version 10: add frequency hopping parameters + * osmo-bts-trx/scheduler: refactor UL burst measurement processing + * vty: fix bts_dump_vty_features(): properly check BTS model flags + * bts: cosmetic: make param 'net' of gsm_bts_num() const + * vty: cosmetic: use osmo_talloc_replace_string() + * tx_power: make trx/lchan struct pointers const where possible + * vty: make most struct pointers const in show/write commands + * osmo-bts-omldummy: fix: do not crash on OML connection drop/failure + * osmo-bts-omldummy: suppress 'Unimplemented bts_model_trx_deact_rf' + * vty: fix 'show bts' command: print proper BTS variant + * vty: fix 'show bts' command: BTS number is optional + * pcu_sock: cosmetic: use ARRAY_SIZE() in pcu_tx_info_ind() + * pcu_sock: cosmetic: make *nsvc a scoped and const variable + * pcu_sock: use llist_for_each_entry() in pcu_sock_close() + * pcu_sock: fix pcu_sock_close(): deactivate dynamic timeslots too + * oml: fix handling of NSVC local port in oml_ipa_mo_set_attr_nsvc() + * pcu_sock: fix {local,remote}_port byte ordering in pcu_tx_info_ind() + * pcu_sock: support handling multiple BTS instances in pcu_rx() + * gsm_data: check in and use enum lchan_rel_act_kind + * tests/power_test: also match stderr, not only stdout + * tests/power_test: move bts/trx/ts/lchan init to init_test() + * tests/power_test: do not assert in apply_power_test() + * power_control: clarify argument names of lchan_ms_pwr_ctrl() + * power_control: implement EWMA based Uplink power filtering + * fix pcu_if_signal_cb(): do not send INFO.ind if PCU is not connected + * scheduler: ensure PRIM_OP_REQUEST when adding to the queue + * scheduler: _sched_dequeue_prim(): make 'l1sap' a scoped pointer + * scheduler: use RSL_CHAN_NR_MASK in trx_sched_set_lchan() + * measurement: remove redundant 'break' statements in modulus_by_lchan() + * measurement: use LOGPLCHAN() macro in lchan_meas_check_compute() + * power_test: fix incorrect line termination in init_test() + * power_control: do nothing if 'rx-current' equals 'rx-target' + * power_control: tolerate small deviations from 'rx-target' + * scheduler: use RSL_CHAN_NR_MASK in trx_sched_set_cipher() + * scheduler: drop meaningless check in trx_sched_set_lchan() + * scheduler: drop redundant check in trx_sched_set_cipher() + * scheduler: get rid of useless TRX_CHAN_FLAG_PDCH + * scheduler: reduce nesting in trx_sched_set_lchan() + * scheduler: treat subsequent lchan (de)activation as error + * scheduler: join conditions in trx_sched_set_lchan() + * scheduler: remove pending Tx prims on lchan deactivation + * power_control: fix default EWMA smoothing coefficient (80% -> 50%) + * main: do not print deprecated '-r' / '--realtime' in help + * main: increase spacing between commands and description + * main: separate model-specific arguments in help + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * osmo-bts-trx/scheduler: fix comments related to FACCH/H and BFI + * main: register VTY commands before handle_options() + * main: move general options from bts_vty_init() + * vty: fix double '%' in description of some commands + * vty: fix missing / wrong documentation for some commands + * vty: call bts_model_vty_init() from bts_vty_init() + * fixup: vty: call bts_model_vty_init() from bts_vty_init() + * main: do not print asciiart to stdout, use stderr instead + * osmo-bts-lc15: use consistent name for containing directory + * doc/manuals: generate XML VTY reference at build-time + * doc/manuals: also generate VTY reference for osmo-bts-virtual + * doc/manuals: move osmobts-vty-reference.xml to vty/ + * osmo-bts-trx/scheduler: ensure no DL power attenuation on C0 + * struct gsm_bts: move ul_power_{target,hysteresis} to ul_power_ctrl + * bts: rename MS_UL_PF_ALGO_{NONE,EWMA} to BTS_PF_ALGO_{NONE,EWMA} + * bts: generalize a struct for UL/DL power control parameters + * bts: add Downlink power control parameters + * l1sap: make sure that UL SACCH is always 23 octets long + * tests/power: rename s/power_test/ms_power_loop_test/ + * power_control: generalize power control state structure + * power_control: lchan_ul_pf_ewma(): do not use lchan->meas.res_nr + * power_control: lchan_ms_pwr_ctrl(): use existing 'trx' pointer + * power_control: generalize and rename lchan_ul_pf_ewma() + * power_control: lchan_ms_pwr_ctrl(): make use of params/state pointers + * power_control: remove a logging statement and early return + * power_control: do not log averaged RSSI values as 'rx-current' + * power_control: derive calc_delta() from lchan_ms_pwr_ctrl() + * power_control: implement BS (Downlink) Power Control + * power_control: cosmetic: fix weird spacing + * power_control: clarify units in 'struct bts_power_ctrl_params' + * power_control: clarify units in 'struct lchan_power_ctrl_state' + * rsl: properly initialize MS/BS Power Control state + * power_control: make raise/lower step limitation configurable + * vty: resurrect per-lchan BS/MS Power Control information + * vty: fix dump_lchan_trx_ts(): dump dedicated channels only + * rsl: remove redundant boolean flag in rsl_rx_chan_activ() + * power_control: check-in new parameters and default values + * power_control: add VTY introspection commands for MS/BS params + * l1sap: fix: enable UL SACCH repetition if RxQual threshold is 0 + * sysinfo: fix less-than-zero comparison of an unsigned value + * osmo-bts-trx: vty: clarify and improve some deprecation messages + * power_control: vty: re-use cfg_bts_ul_power_target() + * power_control: vty: deprecate 'uplink-power-control' commands + * power_control: handle MS/BS Power control params on A-bis/RSL + * vty: add a command to show GPRS related info + * power_control: migrate MS/BS control loops to the new params + * power_control: generalize measurement pre-processing state + * power_control: properly track the first initial state + * power_control: use more reasonable reduce step size + * power_control: rework handling of DL RxQual measurements + * power_control: BS power shall not be reduced on C0 + * paging: refactor and optimize fill_paging_type_1() + * power_control: print current RxLev and lower/upper thresholds + * power_control: fix: properly print 'delta' applied to attenuation + * vty: fix error messages in lchan specific commands + * vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>' + * vty: extend trx / lchan number range in BTS_T_T_L_CMD + * vty: make commands related to the loopback mode hidden + * vty: add expert commands for MS/BS power control + * power_control: add test for inc / red step size limitations + * l1sap: fix gsmtap_ph_{data,pdch,rach}(): use 'const' + * l1sap: include Uplink RSSI in GSMTAP packets + * power_control: clarify the meaning of 'delta' in logging messages + * pcu_sock: pcu_tx_si_all(): make 'si_types' const + * pcu_sock: pcu_tx_si_all(): cosmetic coding style change + * pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc + * osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() + * oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() + * vty: register libosmocore's FSM introspection commands + * oml: avoid redundant ntohl() / htonl() conversion + * oml: make 'struct tlv_parsed' pointer const where possible + * oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() + * power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments + * power_control: implement handling of P_Con_INTERVAL parameter + * oml: reuse the given msgb in oml_fom_ack_nack() + * oml: ensure that IPA RSL Connect ACK/NACK contains all IEs + * main: cosmetic: tweak deprecation warning messages + * GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c + * GSMTAP: fix wrong naming of per-BTS SAPI commands + * GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' + * ta_control: cosmetic: use correct naming for MIN/MAX constraints + * ta_control: make 'struct bts_ul_meas' parameters const + * ta_control: fix Timing Advance control for SDCCH channels + + [ Harald Welte ] + * rsl.c: Fix compiler error on gcc-9.2.1 + * virtual: Fix VTY commands to specify GSMTAP multicast groups + * l1sap: Use msgb_pull_l2() and unify l1sap_tch_ind + l1sap_ph_data_ind + * osmo-bts-virtual: implement GSMTAP_CHANNEL_VOICE + * osmo-bts-virtual: Add "virtual-um ttl <0-255>" VTY option + * osmo-bts-virtual: Fix "virtual-um net-device NETDEV" + * cosmetic: remove dead code from logging.c + * fix compilation with gcc-10 + * osmo-bts-virtual: Avoid rejecting AMR in uplink + * virtual/scheduler: log unknown GSMTAP chan + * Ensure we include lchan name in all LAPDm log lines + * osmo-bts.spec.in: Use %config(noreplace) to retain current config file + * bts: Add VTY command to manually override Radio Link Timeout + * sysinfo: Only send SI13 if PCU is connected + * sysinfo: Don't broadcast SI4 GPRS INDICATOR if PCU is disconnected + * use osmo_fd_setup() everywhere + * remove dead oml_router code + * sysinfo.c: Fix SI4 GPRS patching which overwrote CBCH IE + * fix-up missed review comment in CBCH SI4 patching fix + * major README uppdate + * Use osmo_fd_*_{disable,enable} + * add support for sysmoBTS 1003 aka "1002 with GPS and PoE" + + [ Philipp Maier ] + * ta_control: move timing advance code from osmo-bts-trx to common + * measurment: write irssi_full_sum variable correctly + * l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH + * Do not depend on pcu_direct flag when populating ph_data_ind + * osmo-bts-sysmo: merge measurement data and payload + * osmo-bts-trx: do not set rx-gain to 1 by default + * scheduler: always call Uplink burst handler on NOPE.ind + * logging: use only LOGL_NOTICE as defualt loglevel + * dtx: add detection of AMR DTX frames for osmo-bts-trx + * measurement: remove unecessary is_amr_sid_update parameter + * measurement: make measurements more debugable + * measurement: expect at least 1 SUB frame for AMR + * osmo-bts-trx/scheduler: fix measurement handling for SUB frames + * vty: add attributes to VTY commands indicating when they apply + * sched_lchan_tchh: initialize meas_avg with zeros + * main: add commandline option --vty-ref-xml + * cosmetic: add missing semicolon after OSMO_ASSERT() + * sched_lchan_tchf: count measurements for FACCH/F only once + * measurement: count all blocks as SUB for TCH/F in signalling mode + * measurement: fix expected number of measurements + * measurement.c: fix integer overflow problem + * rsl.adoc: add info about RSL_IE_OSMO_REP_ACCH_CAP + * l1sap: pre-initalize pointer with NULL to avoid gcc warning + * l1sap: add repeated downlink FACCH + * rsl.adoc: update documentation for RSL_IE_OSMO_REP_ACCH_CAP + * l1sap: also include SRR bit in RSL l1 info field. + * l1sap: add repeated downlink SACCH + * l1sap: add repeated uplink SACCH + * l1sap: acch_repetition fix hysthereis threshold table + * l1sap: use rxlev_full when no DTX was used + * pcu_sock: send SI1, SI3 and SI13 via PCUIF + * pcu_sock: fix uninitalized returncode value + * l1sap: fix repeated_dl_facch_active_decision() + * l1sap.c: be sure that FACCH repetition is turned off + * l1sap: be sure that UL-SACCH repetition is turned off + * l1sap: fix comment: sapi number is missing + * vty: dont put a colon after vty_out in cfg_out macro + * gsm_data: handle l1_info with structs + + [ Pau Espin Pedrol ] + * l1_if: Fix strange formatting of Meas info logging + * l1sap: Change loglevel of Rx TCH.ind INFO->DEBUG + * bts-trx: trx_if.c: Fix some printf formats + * cosmetic: Fix some typos with codespell + * lc15: Fix returning values on void function + * lc15: Fix mismatching signature in callback provided + * oc2g: Fix returning values on void function + * oc2g: Fix mismatching signature in callback provided + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * l1_utils.h: Avoid redefinition of global vars defined in l1_utils.c + * vty: Fix misleading define name + * tests/tx_power: Speed up test + * doc: Update vty reference xml file + * bts-trx: vty: Add 'nominal-tx-power' cmd + * bts-trx: phy_link: Improve logging fmt in phy_link_state_set() + * oml.c: Fix whitespace in log line + * oml.c: Log ADM STATE change locked/unlocked + * scheduler.c: Fix trailing whitespace + * pcu_sock: Change log about tx PCH confirm INFO->DEBUG + * bts-trx: Implement power ramping during BTS bring up + * bts-trx: Rename setpower TRXC functions to describe they use power attenuation + * bts-trx: Introduce helper func l1if_trx_set_nominal_power + * bts-trx: Use TRXC cmd NOMTXPOWER to retrieve nominal tx power from osmo-trx + * bts-trx: Re-apply tx power if nominal power is received after POWERON + * scheduler: Fix reading out of buffer during tx of dummy burst on PDCH TS with EGPRS enabled + * abis.c: Grab reference to e1inp_line_get if already created + * doc: Fix typos in bts-models.adoc + * scheduler: Improve logging about prim being out of range + * scheduler: Early return in _sched_dequeue_prim() and clarify FN cases + * scheduler: _sched_dequeue_prim(): Refactor goto paths + * scheduler: _sched_dequeue_prim(): Refactor found_msg goto path + * cosmetic: common/Makefile.am: split each source file in one line + * cosmetic: include/osmo-bts/Makefile.am: split each header file in one line + * Merge gsm_data_shared.h into gsm_data.h + * scheduler: Add rate_ctr informing about too low rts-advance + * scheduler: Add rate_ctr informing about Dl block not found + * handover_tests: Avoid redefining all bts_model stubs + * meas_tests: Avoid redefining all bts_model stubs + * tests/stubs.c: Add missing stub for bts_model_change_power + * cosmetic: {oc2g,lc15}bts_bty.c: Fix trailing whitespace + * Fix missing bts_model implementations in stubs.c and bts_model.c + * Introduce LOGPTRX macro and use it in tx_power.c + * power_ramp: Add support to get callback when ramping process completes + * bts-trx: Instruct user to set manually nominal-tx-power if NOMTXPOWER not supported + * tx_power: Log bypass param in power_ramp_start + * phy_link.h: Drop unimplemented function definition + * bts.c: Fix typo in log line and improve it + * abis.c: Use LOGPIL when logging signalling link down + * Introduce bts_shutdown FSM + * Implement tx power ramp down during BTS shutdown + * bts-trx: Split part of bts_model_trx_close() steps into bts_model_deact_rf + * bts_shutdown: First deact RF on all TRX, finally close them + * bts_model: Convert bts_model_trx_close() to return asynchronously + * bts_shutdown: Wait until all TRX are closed + * bts-virtual: Implement bts_model_trx_close + * bts-trx: Mark 'osmotrx power' VTY cmd as deprecated + * Fix shutdown in osmo-bts-{omldummy,virtual} + * bts-omldummy: Implement bts_model_trx_close + * bts-omldummy: Speed up shutdown (instantaneous ramp) + * tx_power: Support controlling BTS with nominal tx pwr < 0dBm + * bts-trx: Introduce rate counter for scheduler timerfd missed FNs + * bts_shutdown: Speed up shutdown if no TRX is operational + * pcu_sock: Avoid presenting TS from disabled TRX as available to PCU + * bts-trx: Implement ramp up/down during ADM state change + * gsm_data.h: Use enum type for NM state fields + * Move nm_state and Mo related code gsm_data.* => oml.* + * Move gsm_bts code gsm-data.* => bts.* + * bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN + * Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* + * bts-trx: Don't set OPSTATE enabled during trx_init + * common: Avoid changing OPSTATE to Enabled upon RSL up + * bts-trx: Remove unused function l1if_provision_transceiver() + * bts-trx: introduce TRX provisioning FSM + * tx_power_test: Disable using color in log output + * bts-trx: Use bool type for on/off state variables + * bts-trx: Integrate TRX provisioning logic more tightly into the FSM + * bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned + * rsl: Fix wrong param passed to gsm_pchan_name() in log line + * bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock + * bts-trx: prov_fsm: Fix mess with 1 event having 2 names + * bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED + * common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change + * bts-trx: Fix handling ADM state change while previous one WIP + * vty: Allow setting power-ramp max-initial to negative values + * bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH + * tx_power: Take into account max-initial when ramping up bigger power lvl intervals + * doc: configuration.adoc: Document ramping down feature + * common: Support setting rt prio through new libosmovty sched VTY cmds + * tests: tx_power: Extend and add extra power_ramp buggy case + * common: tx_power: Fix bug in power ramp up below max-initial value + * Update dependency on libosmocore 1.4.0 + * configure.ac: Fix trailing whitespace + * pcu_sock: Fix typo in log message + * bts-trx: Use TRXC RFMUTE instead of resetting the scheduler + * bts-trx: Ensure RFMUTE state is set properly at startup + * scheduler: Drop unused function trx_sched_reset() + * Fix RadioCarrier OML Operative State Change report not sent on some scenarios + * Improve logging around failing to (de)activate chan_nr + * Improve error handling and logging in gsm_pchan2chan_nr() + * Improve logging and error handling receiving act_req for dyn TS not yet configured + * pcu_sock: Only announce dyn TS already configured by lower layers + * Avoid sending RSL RF REL ACK if PDCH chan is disabled by administrative lock + * oml: Set RadioChannel operational state to Enabled only during OPSTART + * gsm_data.h: Drop unused struct field + * contrib/jenkins: Enable parallel make in make distcheck + * Drop unused param in oml_init() + * Change NM Channel availability Dependency->Offline when RadioCarrier becomes enabled + * Introduce NM BTS Site Manager FSM + * Introduce NM BTS FSM + * Introduce NM Radio Carrier and Baseband Transceiver FSMs + * Introduce NM Channel FSM + * bts_trx.c: Dispatch missing NM_EV_RSL_UP/DOWN to the bb_transc object + * oml: Set NM_OPSTATE_DISABLED by default + * common: Enable SIGABRT signal handler + * common: generate coredump and exit upon SIGABRT received + * sysmobts-mgr: generate coredump and exit upon SIGABRT received + * oc2g-mgr: generate coredump and exit upon SIGABRT received + * lc15-mgr: generate coredump and exit upon SIGABRT received + * nm_channel_fsm: Fix several FSM internal transitions not being made + * cosmetic: sysmobts-mgr: fix whitespace indentation + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * rsl: make IP DSCP configurable + * VTY: add "test send-failure-event-report" + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + * common/measurement.c: fix gcc 4 + -std=gnu11 error + + [ Harld Welte ] + * trx: Fix reported BER for TCH/H + * trx: Use NOPE indications from OsmoTRX for TCH/F and TCH/H + * trx: Use NOPE indications on SDCCH + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Rafael Diniz ] + * osmo-bts-litecell15: Implement missing features. + + [ Alexander Couzens ] + * measurement: replace u_int64_t with uint64_t + * pcuif_proto: version 0xa: add support for IPv6 NSVCs + * pcuif_proto: fix typo in comment + * Revert "pcuif_proto: version 0xa: add support for IPv6 NSVCs" + * pcuif_proto: version 10: add support for IPv6 NSVCs + * Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU + * common/bts: set feature IPV6_NSVC + * OML: correct parse the NM_ATT_OSMO_NS_LINK_CFG field address_family + + [ Daniel Willmann ] + * osmo-bts-trx: Use much lower clock advance values towards PCU and TRX + + [ Neels Hofmeyr ] + * rename to release_sapi_ul_rach(), simplify + * part 1 of: fix SAPIs for handover to match 48.058 4.1.{3,4} + * part 2 of: fix SAPIs for handover, osmo-bts-sysmo + * part 3 of: fix SAPIs for handover, osmo-bts-trx + * part 4 of: fix SAPIs for handover, osmo-bts-lc15 + * part 5 of: fix SAPIs for handover, osmo-bts-oc2g + * log: rsl_rx_chan_activ: show chan type as human readable string + * chan activ: activate DL SACCH only when TA is known + * GSMTAP: make remote host for Um logging configurable via VTY + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:35:17 +0100 + osmo-bts (1.2.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 8559400..5a42d19 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,11 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 1.4.0), - libosmo-abis-dev, + libosmocore-dev (>= 1.5.0), + libosmo-abis-dev (>= 1.1.0), libgps-dev, txt2man, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Browser: http://git.osmocom.org/osmo-bts/ Vcs-Git: git://git.osmocom.org/osmo-bts -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I206af3596a714e5e9038b22e84ae6c20dc360e13 Gerrit-Change-Number: 23047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:43:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 15:43:43 +0000 Subject: Change in osmo-sgsn[master]: main: change initialization order References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 ) Change subject: main: change initialization order ...................................................................... main: change initialization order We must have initialized e.g. the NS protocol stack before calling handle_options(), as that might want to dumpy the VTY XML, and it can obviously only dump those nodes that are registered at that point. Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 --- M src/sgsn/sgsn_main.c 1 file changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/48/23048/1 diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 6c57071..2cabbf3 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -407,23 +407,6 @@ osmo_sccp_vty_init(); #endif - handle_options(argc, argv); - - /* Backwards compatibility: for years, the default config file name was - * osmo_sgsn.cfg. All other Osmocom programs use osmo-*.cfg with a - * dash. To be able to use the new config file name without breaking - * previous setups that might rely on the legacy default config file - * name, we need to look for the old config file if no -c option was - * passed AND no file exists with the new default file name. */ - if (!sgsn->config_file) { - /* No -c option was passed */ - if (file_exists(CONFIG_FILE_LEGACY) - && !file_exists(CONFIG_FILE_DEFAULT)) - osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_LEGACY); - else - osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_DEFAULT); - } - rate_ctr_init(tall_sgsn_ctx); logging_vty_add_deprecated_subsys(tall_sgsn_ctx, "bssgp"); @@ -448,6 +431,23 @@ sgsn_auth_init(sgsn); sgsn_cdr_init(sgsn); + handle_options(argc, argv); + + /* Backwards compatibility: for years, the default config file name was + * osmo_sgsn.cfg. All other Osmocom programs use osmo-*.cfg with a + * dash. To be able to use the new config file name without breaking + * previous setups that might rely on the legacy default config file + * name, we need to look for the old config file if no -c option was + * passed AND no file exists with the new default file name. */ + if (!sgsn->config_file) { + /* No -c option was passed */ + if (file_exists(CONFIG_FILE_LEGACY) + && !file_exists(CONFIG_FILE_DEFAULT)) + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_LEGACY); + else + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_DEFAULT); + } + rc = sgsn_parse_config(sgsn->config_file); if (rc < 0) { LOGP(DGPRS, LOGL_FATAL, "Error in config file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 Gerrit-Change-Number: 23048 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:45:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:45:47 +0000 Subject: Change in osmo-sgsn[master]: main: change initialization order In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 ) Change subject: main: change initialization order ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 Gerrit-Change-Number: 23048 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 15:45:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:45:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:45:48 +0000 Subject: Change in osmo-sgsn[master]: main: change initialization order In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 ) Change subject: main: change initialization order ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 Gerrit-Change-Number: 23048 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 15:45:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:46:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 23 Feb 2021 15:46:43 +0000 Subject: Change in osmo-sgsn[master]: main: change initialization order In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 ) Change subject: main: change initialization order ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 Gerrit-Change-Number: 23048 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 15:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:47:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:47:57 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E14-3e65-dirty_=E2=86=92_1=2E1=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/23049 ) Change subject: Bump version: 1.0.0.14-3e65-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.14-3e65-dirty ? 1.1.0 Change-Id: I8e3be883113444251f5008c407e9f722d0dcd422 --- M TODO-RELEASE M configure.ac M contrib/libosmo-netif.spec.in M debian/changelog M debian/control M src/Makefile.am M tests/osmo-pcap-test/configure.ac 7 files changed, 37 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/49/23049/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index c89dec9..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif ipv6 Depends on libosmocore > 1.4.0 for IPv6 osmo_sock_inti2_multiaddr AF_UNSPEC (IPv6) support. diff --git a/configure.ac b/configure.ac index 1b2a459..31b7181 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ LT_INIT AC_PROG_LIBTOOL -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) @@ -89,8 +89,8 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) AC_ARG_ENABLE([lapd_examples], [AS_HELP_STRING( @@ -99,7 +99,7 @@ )], [lapd_examples=$enableval], [lapd_examples="no"]) AS_IF([test "x$lapd_examples" = "xyes"], [ - PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) + PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples]) ]) AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes") diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in index 95690a7..4b25378 100644 --- a/contrib/libosmo-netif.spec.in +++ b/contrib/libosmo-netif.spec.in @@ -24,8 +24,8 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 %description Network interface demuxer library for OsmoCom projects. diff --git a/debian/changelog b/debian/changelog index 1aa3ea1..eaa5dda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +libosmo-netif (1.1.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * stream: add missing Doxygen \return statements to non-void functions + + [ Pau Espin Pedrol ] + * stream: Support creating sockets with IPv6 addresses + * stream: Fix log of IPv6 during accept() + * contrib/jenkins: Enable parallel make in make distcheck + * tests: Explicitly drop category from log + * gitignore: Ignore autfoo *~ churn + * tests: Replace deprecated API log_set_print_filename + + [ Daniel Willmann ] + * examples: Use osmo_stream_*_set_nodelay in ipa examples + + [ Harald Welte ] + * Use osmo_fd_setup() wherever applicable + * cosmetic: Fix whitespace (use tab instead of 8x space) + * migrate to osmo_fd_{read,write}_{enable,disable}() + * Don't depend on libosmo-abis (by default) + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:47:37 +0100 + libosmo-netif (1.0.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 8b76089..e4d0f74 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ libdpkg-perl, git, doxygen, - libosmocore-dev (>= 1.3.0), + libosmocore-dev (>= 1.5.0), pkg-config, libpcap0.8-dev, libsctp-dev diff --git a/src/Makefile.am b/src/Makefile.am index 64fd1d4..7e71c71 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=9:0:1 +LIBVERSION=9:1:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) diff --git a/tests/osmo-pcap-test/configure.ac b/tests/osmo-pcap-test/configure.ac index 47fbfe2..7cb31b0 100644 --- a/tests/osmo-pcap-test/configure.ac +++ b/tests/osmo-pcap-test/configure.ac @@ -16,7 +16,7 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) AC_PROG_CC AC_DISABLE_STATIC -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/23049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I8e3be883113444251f5008c407e9f722d0dcd422 Gerrit-Change-Number: 23049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:48:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:48:21 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E444-8777-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23047 ) Change subject: Bump version: 1.2.0.444-8777-dirty ? 1.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I206af3596a714e5e9038b22e84ae6c20dc360e13 Gerrit-Change-Number: 23047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:48:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:48:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:48:23 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E444-8777-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23047 ) Change subject: Bump version: 1.2.0.444-8777-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.444-8777-dirty ? 1.3.0 Change-Id: I206af3596a714e5e9038b22e84ae6c20dc360e13 --- M TODO-RELEASE M configure.ac M contrib/osmo-bts.spec.in M debian/changelog M debian/control 5 files changed, 491 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 66a9bb3..e69de29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,2 +0,0 @@ -* update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include. -* update libosmocore dependency for osmo_fd_{read,write}_{enable,disable}() diff --git a/configure.ac b/configure.ac index 249a81a..2b5a316 100644 --- a/configure.ac +++ b/configure.ac @@ -69,14 +69,14 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.1.0) AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) AC_ARG_ENABLE(sysmobts-calib, diff --git a/contrib/osmo-bts.spec.in b/contrib/osmo-bts.spec.in index 1b7a9e5..a6d5e86 100644 --- a/contrib/osmo-bts.spec.in +++ b/contrib/osmo-bts.spec.in @@ -27,14 +27,14 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocodec) >= 1.2.0 -BuildRequires: pkgconfig(libosmocoding) >= 1.2.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmotrau) >= 0.6.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.5.0 +BuildRequires: pkgconfig(libosmocoding) >= 1.5.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmotrau) >= 1.1.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 ### FIXME: DependencyHACK to include osmocom/gprs/protocol/gsm_04_60.h BuildRequires: pkgconfig(libosmogb) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index aa3269b..bc44837 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,475 @@ +osmo-bts (1.3.0) unstable; urgency=medium + + [ Michael McTernan ] + * measurement: use signed integer for division of ta256b_sum + + [ Vadim Yanitskiy ] + * common/vty.c: get rid of generic exit / end commands + * common/abis.c: make use of RSL TEI from OML IPA RSL Connect + * L1SAP: use LOGL_DEBUG for logging from rach_pass_filter() + * osmo-bts-sysmo/Makefile.am: fix: do not overwrite bin_PROGRAMS + * vty: fix left shift by 31 cannot be represented in type 'int' + * common/sysinfo: reduce criticality of a logging message + * osmo-bts-virtual: fix wrong endianness in gsmtap_hdr_stringify() + * osmo-bts-virtual: do not print redundant info in tx_to_virt_um() + * osmo-bts-virtual: do not log GSMTAP message sending failure twice + * l1sap: fix gsmtap_ph_rach(): properly pack 8-bit and 11-bit RA + * osmo-bts-{sysmo,oc2g,lc15}: fix segfault on 'dsp-trace-flag' + * osmo-bts-trx/scheduler: remove a left-over from UL TCH handlers + * oml: fix oml_mo_tx_sw_act_rep(): do not allocate FOM header twice + * fix typo in osmo_bts_variant_names: s/omso/osmo/g + * doc/manuals: fix typo in interfaces.adoc: s/Omsocom/Osmocom/g + * osmo-bts-omldummy: print a brief usage statement if argc < 3 + * osmo-bts-omldummy: make number of transceivers configurable + * vty: get rid of unused ournode_{exit,end}_cmd declarations + * vty: cosmetic: make an error message more informative + * vty: use gsm48_chan_mode_name() from libosmocore + * gsm_data_shared: drop unused supports_egprs_11bit_rach + * gsm_data_shared: drop unused enum bts_gprs_mode + * gsm_data_shared: drop unused channel request reason definitions + * gsm_data_shared: get rid of unused HARDCODED_{ARFCN,BSIC} + * gsm_data_shared: get rid of unused HARDCODED_BTS{0,1,2}_TS + * gsm_data_shared: get rid of unused enum gsm_hooks + * gsm_data_shared: drop declaration of non-existing gsm_parse_reg() + * gsm_data_shared: drop unused A38_XOR_{MIN,MAX,COMP128}_KEY_LEN + * gsm_data_shared: drop unused MAX_EARFCN_LIST + * gsm_data_shared: drop unused LCHAN_SAPI_{UNUSED,MS,NET,REL} + * gsm_data_shared: drop unused struct bts_codec_conf + * gsm_data_shared: drop meaningless comments + * gsm_data_shared: drop unused sacch_deact from struct gsm_lchan + * gsm_data_shared: drop forward declaration of struct vty + * gsm_data_shared: drop unused *nmh from struct gsm_bts + * gsm_data_shared: drop unused dtxu from struct gsm_bts + * gsm_data_shared: drop unused ctrl_ack_type_use_block & net_ctrl_ord + * gsm_data_shared: drop unused rach_b_thresh & rach_ldavg_slots + * gsm_data_shared: drop force_combined_si & bcch_change_mark + * scheduler: drop non-existing extern declarations + * vty: fix bts_dump_vty(): properly print OML stream ID (TEI) + * rsl: refactor handling of RSL_IE_MR_CONFIG + * osmo-bts-trx: prettify Makefile.am: make it git friendly + * osmo-bts-trx: fix: use noinst_HEADERS instead of EXTRA_DIST + * osmo-bts-virtual: cosmetic: use LID_{SACCH,DEDIC} macros + * doc/examples: remove virtual/openbsc-virtual.cfg + * common/scheduler: fix unreachable code in trx_sched_set_lchan() + * common/scheduler: use boolean for channel activation state + * osmo-bts-trx/trx_if: fix memleak in trx_ctrl_cmd_cb() + * osmo-bts-trx/trx_if: cosmetic: s/ocommand/command/ + * oml: fix TL16V length calculation in add_bts_feat() + * osmo-bts-trx: indicate BTS_FEAT_EGPRS support to BSC + * gsm_data_shared: use bitvec API to allocate the feature vector + * Do not mix public and private BTS features, use libosmocore's API + * osmo-bts-trx/scheduler: properly handle NOPE.ind during handover + * osmo-bts-trx: use osmo_store32be() in trx_if_send_burst() + * osmo-bts-trx: move logical channel handlers to separate files + * osmo-bts-trx: introduce and use struct trx_dl_burst_req + * osmo-bts-trx: store pointer to gsm_lchan in l1sched_chan_state + * osmo-bts-trx: include BS Power reduction in Downlink bursts + * A-bis/RSL: refactor handling of BS Power IE (power reduction) + * A-bis/OML: fix logging: do not print A-bis MO name twice + * Use libosmocore's TDMA frame number API (constatns & arithmetic) + * osmo-bts-trx: fix trx_sched_fn(): properly advance frame number + * osmo-bts-trx/scheduler: make mark trx_sched_fn() return void + * vty: fix missing separator in help for power ramp commands + * osmo-bts-trx/scheduler: get rid of _sched_fcch_burst + * A-bis/OML: handle hopping params in Set Channel Attributes + * osmo-bts-trx/scheduler: cosmetic: move trx_if_powered() check + * osmo-bts-trx/scheduler: get rid of unused 'meas' in l1sched_chan_state + * l1sap: do not print redundant info in l1sap_chan_act() + * Constify the 'trx' argument of trx_get_hlayer1() everywhere + * common: constify the argument of trx_ms_pwr_ctrl_is_osmo() + * pcu_sock: constify the argument of ts_should_be_pdch() + * osmo-bts-trx/scheduler: fix CLCK.ind handling during ramping down + * osmo-bts-trx/scheduler: refactor dummy burst scheduling + * oml: fix ARFCN range check in oml_rx_set_radio_attr() + * oml: fix ARFCN range check in oml_rx_set_bts_attr() + * pcu_sock: use a 'switch' statement in ts_should_be_pdch() + * pcu_sock: warn about maximum transceiver number constraints + * pcu_sock: separate trx / ts filling from pcu_tx_info_ind() + * pcu_sock: use LOGPTRX() in info_ind_fill_trx() + * osmo-bts-trx/scheduler: implement baseband frequency hopping + * osmo-bts-trx: indicate support of BTS_FEAT_HOPPING + * l1sap: radio_link_timeout(): clarify logging messages + * l1sap: radio_link_timeout(): use LOGPLCHAN() macro + * l1sap: radio_link_timeout(): bad_frame is a boolean + * rsl: constify the 'lchan' argument of rsl_tx_conn_fail() + * debian/control: change maintainer to the Osmocom team / mailing list + * osmo-bts-omldummy: enable BTS_FEAT_{CBCH,HOPPING} support + * vty: clarify documentation of '[no] gsmtap-sapi' command + * vty: add 'gsmtap-sapi (enable-all|disable-all)' command + * osmo-bts-trx/trx_provision_fsm: fix misleading comment in header + * osmo-bts-trx/trx_provision_fsm: cosmetic: switch is not a function + * osmo-bts-trx/l1_if: drop redundant logging message + * osmo-bts-trx: fix trx_init(): do not send OPSTART ACK blindly + * osmo-bts-trx/trx_provision_fsm: add missing default labels + * osmo-bts-trx: also print 'txtune-ack' in st_open_poweroff() + * struct gsm_bts_trx: remove unused per-TRX OML Link pointer + * struct gsm_bts_trx[_ts]: remove unused parsed NM attribute list + * gsm_data: rename hopping.{ma,ma_len} to hopping.arfcn_{list,num} + * pcuif_proto: version 10: add frequency hopping parameters + * osmo-bts-trx/scheduler: refactor UL burst measurement processing + * vty: fix bts_dump_vty_features(): properly check BTS model flags + * bts: cosmetic: make param 'net' of gsm_bts_num() const + * vty: cosmetic: use osmo_talloc_replace_string() + * tx_power: make trx/lchan struct pointers const where possible + * vty: make most struct pointers const in show/write commands + * osmo-bts-omldummy: fix: do not crash on OML connection drop/failure + * osmo-bts-omldummy: suppress 'Unimplemented bts_model_trx_deact_rf' + * vty: fix 'show bts' command: print proper BTS variant + * vty: fix 'show bts' command: BTS number is optional + * pcu_sock: cosmetic: use ARRAY_SIZE() in pcu_tx_info_ind() + * pcu_sock: cosmetic: make *nsvc a scoped and const variable + * pcu_sock: use llist_for_each_entry() in pcu_sock_close() + * pcu_sock: fix pcu_sock_close(): deactivate dynamic timeslots too + * oml: fix handling of NSVC local port in oml_ipa_mo_set_attr_nsvc() + * pcu_sock: fix {local,remote}_port byte ordering in pcu_tx_info_ind() + * pcu_sock: support handling multiple BTS instances in pcu_rx() + * gsm_data: check in and use enum lchan_rel_act_kind + * tests/power_test: also match stderr, not only stdout + * tests/power_test: move bts/trx/ts/lchan init to init_test() + * tests/power_test: do not assert in apply_power_test() + * power_control: clarify argument names of lchan_ms_pwr_ctrl() + * power_control: implement EWMA based Uplink power filtering + * fix pcu_if_signal_cb(): do not send INFO.ind if PCU is not connected + * scheduler: ensure PRIM_OP_REQUEST when adding to the queue + * scheduler: _sched_dequeue_prim(): make 'l1sap' a scoped pointer + * scheduler: use RSL_CHAN_NR_MASK in trx_sched_set_lchan() + * measurement: remove redundant 'break' statements in modulus_by_lchan() + * measurement: use LOGPLCHAN() macro in lchan_meas_check_compute() + * power_test: fix incorrect line termination in init_test() + * power_control: do nothing if 'rx-current' equals 'rx-target' + * power_control: tolerate small deviations from 'rx-target' + * scheduler: use RSL_CHAN_NR_MASK in trx_sched_set_cipher() + * scheduler: drop meaningless check in trx_sched_set_lchan() + * scheduler: drop redundant check in trx_sched_set_cipher() + * scheduler: get rid of useless TRX_CHAN_FLAG_PDCH + * scheduler: reduce nesting in trx_sched_set_lchan() + * scheduler: treat subsequent lchan (de)activation as error + * scheduler: join conditions in trx_sched_set_lchan() + * scheduler: remove pending Tx prims on lchan deactivation + * power_control: fix default EWMA smoothing coefficient (80% -> 50%) + * main: do not print deprecated '-r' / '--realtime' in help + * main: increase spacing between commands and description + * main: separate model-specific arguments in help + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * osmo-bts-trx/scheduler: fix comments related to FACCH/H and BFI + * main: register VTY commands before handle_options() + * main: move general options from bts_vty_init() + * vty: fix double '%' in description of some commands + * vty: fix missing / wrong documentation for some commands + * vty: call bts_model_vty_init() from bts_vty_init() + * fixup: vty: call bts_model_vty_init() from bts_vty_init() + * main: do not print asciiart to stdout, use stderr instead + * osmo-bts-lc15: use consistent name for containing directory + * doc/manuals: generate XML VTY reference at build-time + * doc/manuals: also generate VTY reference for osmo-bts-virtual + * doc/manuals: move osmobts-vty-reference.xml to vty/ + * osmo-bts-trx/scheduler: ensure no DL power attenuation on C0 + * struct gsm_bts: move ul_power_{target,hysteresis} to ul_power_ctrl + * bts: rename MS_UL_PF_ALGO_{NONE,EWMA} to BTS_PF_ALGO_{NONE,EWMA} + * bts: generalize a struct for UL/DL power control parameters + * bts: add Downlink power control parameters + * l1sap: make sure that UL SACCH is always 23 octets long + * tests/power: rename s/power_test/ms_power_loop_test/ + * power_control: generalize power control state structure + * power_control: lchan_ul_pf_ewma(): do not use lchan->meas.res_nr + * power_control: lchan_ms_pwr_ctrl(): use existing 'trx' pointer + * power_control: generalize and rename lchan_ul_pf_ewma() + * power_control: lchan_ms_pwr_ctrl(): make use of params/state pointers + * power_control: remove a logging statement and early return + * power_control: do not log averaged RSSI values as 'rx-current' + * power_control: derive calc_delta() from lchan_ms_pwr_ctrl() + * power_control: implement BS (Downlink) Power Control + * power_control: cosmetic: fix weird spacing + * power_control: clarify units in 'struct bts_power_ctrl_params' + * power_control: clarify units in 'struct lchan_power_ctrl_state' + * rsl: properly initialize MS/BS Power Control state + * power_control: make raise/lower step limitation configurable + * vty: resurrect per-lchan BS/MS Power Control information + * vty: fix dump_lchan_trx_ts(): dump dedicated channels only + * rsl: remove redundant boolean flag in rsl_rx_chan_activ() + * power_control: check-in new parameters and default values + * power_control: add VTY introspection commands for MS/BS params + * l1sap: fix: enable UL SACCH repetition if RxQual threshold is 0 + * sysinfo: fix less-than-zero comparison of an unsigned value + * osmo-bts-trx: vty: clarify and improve some deprecation messages + * power_control: vty: re-use cfg_bts_ul_power_target() + * power_control: vty: deprecate 'uplink-power-control' commands + * power_control: handle MS/BS Power control params on A-bis/RSL + * vty: add a command to show GPRS related info + * power_control: migrate MS/BS control loops to the new params + * power_control: generalize measurement pre-processing state + * power_control: properly track the first initial state + * power_control: use more reasonable reduce step size + * power_control: rework handling of DL RxQual measurements + * power_control: BS power shall not be reduced on C0 + * paging: refactor and optimize fill_paging_type_1() + * power_control: print current RxLev and lower/upper thresholds + * power_control: fix: properly print 'delta' applied to attenuation + * vty: fix error messages in lchan specific commands + * vty: add macro for 'bts <0-0> trx <0-0> ts <0-7> lchan <0-1>' + * vty: extend trx / lchan number range in BTS_T_T_L_CMD + * vty: make commands related to the loopback mode hidden + * vty: add expert commands for MS/BS power control + * power_control: add test for inc / red step size limitations + * l1sap: fix gsmtap_ph_{data,pdch,rach}(): use 'const' + * l1sap: include Uplink RSSI in GSMTAP packets + * power_control: clarify the meaning of 'delta' in logging messages + * pcu_sock: pcu_tx_si_all(): make 'si_types' const + * pcu_sock: pcu_tx_si_all(): cosmetic coding style change + * pcu_sock: pcu_tx_si_all(): fix returning ununitialized rc + * osmo-bts-trx/scheduler: use DMEAS in trx_sched_meas_avg() + * oml: cosmetic code style changes in rx_oml_ipa_rsl_connect() + * vty: register libosmocore's FSM introspection commands + * oml: avoid redundant ntohl() / htonl() conversion + * oml: make 'struct tlv_parsed' pointer const where possible + * oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() + * power_control: cosmetic: fix swapped {L,U}_RXQUAL_XX_P comments + * power_control: implement handling of P_Con_INTERVAL parameter + * oml: reuse the given msgb in oml_fom_ack_nack() + * oml: ensure that IPA RSL Connect ACK/NACK contains all IEs + * main: cosmetic: tweak deprecation warning messages + * GSMTAP: move 'gsmtap_sapi_names' from l1sap.c to vty.c + * GSMTAP: fix wrong naming of per-BTS SAPI commands + * GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts' + * ta_control: cosmetic: use correct naming for MIN/MAX constraints + * ta_control: make 'struct bts_ul_meas' parameters const + * ta_control: fix Timing Advance control for SDCCH channels + + [ Harald Welte ] + * rsl.c: Fix compiler error on gcc-9.2.1 + * virtual: Fix VTY commands to specify GSMTAP multicast groups + * l1sap: Use msgb_pull_l2() and unify l1sap_tch_ind + l1sap_ph_data_ind + * osmo-bts-virtual: implement GSMTAP_CHANNEL_VOICE + * osmo-bts-virtual: Add "virtual-um ttl <0-255>" VTY option + * osmo-bts-virtual: Fix "virtual-um net-device NETDEV" + * cosmetic: remove dead code from logging.c + * fix compilation with gcc-10 + * osmo-bts-virtual: Avoid rejecting AMR in uplink + * virtual/scheduler: log unknown GSMTAP chan + * Ensure we include lchan name in all LAPDm log lines + * osmo-bts.spec.in: Use %config(noreplace) to retain current config file + * bts: Add VTY command to manually override Radio Link Timeout + * sysinfo: Only send SI13 if PCU is connected + * sysinfo: Don't broadcast SI4 GPRS INDICATOR if PCU is disconnected + * use osmo_fd_setup() everywhere + * remove dead oml_router code + * sysinfo.c: Fix SI4 GPRS patching which overwrote CBCH IE + * fix-up missed review comment in CBCH SI4 patching fix + * major README uppdate + * Use osmo_fd_*_{disable,enable} + * add support for sysmoBTS 1003 aka "1002 with GPS and PoE" + + [ Philipp Maier ] + * ta_control: move timing advance code from osmo-bts-trx to common + * measurment: write irssi_full_sum variable correctly + * l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH + * Do not depend on pcu_direct flag when populating ph_data_ind + * osmo-bts-sysmo: merge measurement data and payload + * osmo-bts-trx: do not set rx-gain to 1 by default + * scheduler: always call Uplink burst handler on NOPE.ind + * logging: use only LOGL_NOTICE as defualt loglevel + * dtx: add detection of AMR DTX frames for osmo-bts-trx + * measurement: remove unecessary is_amr_sid_update parameter + * measurement: make measurements more debugable + * measurement: expect at least 1 SUB frame for AMR + * osmo-bts-trx/scheduler: fix measurement handling for SUB frames + * vty: add attributes to VTY commands indicating when they apply + * sched_lchan_tchh: initialize meas_avg with zeros + * main: add commandline option --vty-ref-xml + * cosmetic: add missing semicolon after OSMO_ASSERT() + * sched_lchan_tchf: count measurements for FACCH/F only once + * measurement: count all blocks as SUB for TCH/F in signalling mode + * measurement: fix expected number of measurements + * measurement.c: fix integer overflow problem + * rsl.adoc: add info about RSL_IE_OSMO_REP_ACCH_CAP + * l1sap: pre-initalize pointer with NULL to avoid gcc warning + * l1sap: add repeated downlink FACCH + * rsl.adoc: update documentation for RSL_IE_OSMO_REP_ACCH_CAP + * l1sap: also include SRR bit in RSL l1 info field. + * l1sap: add repeated downlink SACCH + * l1sap: add repeated uplink SACCH + * l1sap: acch_repetition fix hysthereis threshold table + * l1sap: use rxlev_full when no DTX was used + * pcu_sock: send SI1, SI3 and SI13 via PCUIF + * pcu_sock: fix uninitalized returncode value + * l1sap: fix repeated_dl_facch_active_decision() + * l1sap.c: be sure that FACCH repetition is turned off + * l1sap: be sure that UL-SACCH repetition is turned off + * l1sap: fix comment: sapi number is missing + * vty: dont put a colon after vty_out in cfg_out macro + * gsm_data: handle l1_info with structs + + [ Pau Espin Pedrol ] + * l1_if: Fix strange formatting of Meas info logging + * l1sap: Change loglevel of Rx TCH.ind INFO->DEBUG + * bts-trx: trx_if.c: Fix some printf formats + * cosmetic: Fix some typos with codespell + * lc15: Fix returning values on void function + * lc15: Fix mismatching signature in callback provided + * oc2g: Fix returning values on void function + * oc2g: Fix mismatching signature in callback provided + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * l1_utils.h: Avoid redefinition of global vars defined in l1_utils.c + * vty: Fix misleading define name + * tests/tx_power: Speed up test + * doc: Update vty reference xml file + * bts-trx: vty: Add 'nominal-tx-power' cmd + * bts-trx: phy_link: Improve logging fmt in phy_link_state_set() + * oml.c: Fix whitespace in log line + * oml.c: Log ADM STATE change locked/unlocked + * scheduler.c: Fix trailing whitespace + * pcu_sock: Change log about tx PCH confirm INFO->DEBUG + * bts-trx: Implement power ramping during BTS bring up + * bts-trx: Rename setpower TRXC functions to describe they use power attenuation + * bts-trx: Introduce helper func l1if_trx_set_nominal_power + * bts-trx: Use TRXC cmd NOMTXPOWER to retrieve nominal tx power from osmo-trx + * bts-trx: Re-apply tx power if nominal power is received after POWERON + * scheduler: Fix reading out of buffer during tx of dummy burst on PDCH TS with EGPRS enabled + * abis.c: Grab reference to e1inp_line_get if already created + * doc: Fix typos in bts-models.adoc + * scheduler: Improve logging about prim being out of range + * scheduler: Early return in _sched_dequeue_prim() and clarify FN cases + * scheduler: _sched_dequeue_prim(): Refactor goto paths + * scheduler: _sched_dequeue_prim(): Refactor found_msg goto path + * cosmetic: common/Makefile.am: split each source file in one line + * cosmetic: include/osmo-bts/Makefile.am: split each header file in one line + * Merge gsm_data_shared.h into gsm_data.h + * scheduler: Add rate_ctr informing about too low rts-advance + * scheduler: Add rate_ctr informing about Dl block not found + * handover_tests: Avoid redefining all bts_model stubs + * meas_tests: Avoid redefining all bts_model stubs + * tests/stubs.c: Add missing stub for bts_model_change_power + * cosmetic: {oc2g,lc15}bts_bty.c: Fix trailing whitespace + * Fix missing bts_model implementations in stubs.c and bts_model.c + * Introduce LOGPTRX macro and use it in tx_power.c + * power_ramp: Add support to get callback when ramping process completes + * bts-trx: Instruct user to set manually nominal-tx-power if NOMTXPOWER not supported + * tx_power: Log bypass param in power_ramp_start + * phy_link.h: Drop unimplemented function definition + * bts.c: Fix typo in log line and improve it + * abis.c: Use LOGPIL when logging signalling link down + * Introduce bts_shutdown FSM + * Implement tx power ramp down during BTS shutdown + * bts-trx: Split part of bts_model_trx_close() steps into bts_model_deact_rf + * bts_shutdown: First deact RF on all TRX, finally close them + * bts_model: Convert bts_model_trx_close() to return asynchronously + * bts_shutdown: Wait until all TRX are closed + * bts-virtual: Implement bts_model_trx_close + * bts-trx: Mark 'osmotrx power' VTY cmd as deprecated + * Fix shutdown in osmo-bts-{omldummy,virtual} + * bts-omldummy: Implement bts_model_trx_close + * bts-omldummy: Speed up shutdown (instantaneous ramp) + * tx_power: Support controlling BTS with nominal tx pwr < 0dBm + * bts-trx: Introduce rate counter for scheduler timerfd missed FNs + * bts_shutdown: Speed up shutdown if no TRX is operational + * pcu_sock: Avoid presenting TS from disabled TRX as available to PCU + * bts-trx: Implement ramp up/down during ADM state change + * gsm_data.h: Use enum type for NM state fields + * Move nm_state and Mo related code gsm_data.* => oml.* + * Move gsm_bts code gsm-data.* => bts.* + * bts-virt: Don't rely on gsmtap_makemsg() returning NULL for GSMTAP_CHANNEL_UNKNOWN + * Move struct gsm_bts_trx: gsm_data.* & bts.* => bts_trx.* + * bts-trx: Don't set OPSTATE enabled during trx_init + * common: Avoid changing OPSTATE to Enabled upon RSL up + * bts-trx: Remove unused function l1if_provision_transceiver() + * bts-trx: introduce TRX provisioning FSM + * tx_power_test: Disable using color in log output + * bts-trx: Use bool type for on/off state variables + * bts-trx: Integrate TRX provisioning logic more tightly into the FSM + * bts-trx: Delay TRXC POWERON cmd until all TRXs are provisioned + * rsl: Fix wrong param passed to gsm_pchan_name() in log line + * bts-trx: Fix osmocom dyn ts assert hit during Adm State Unlock + * bts-trx: prov_fsm: Fix mess with 1 event having 2 names + * bts_shutdown_fsm: Fix switching too quickly to state WAIT_TRX_CLOSED + * common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change + * bts-trx: Fix handling ADM state change while previous one WIP + * vty: Allow setting power-ramp max-initial to negative values + * bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH + * tx_power: Take into account max-initial when ramping up bigger power lvl intervals + * doc: configuration.adoc: Document ramping down feature + * common: Support setting rt prio through new libosmovty sched VTY cmds + * tests: tx_power: Extend and add extra power_ramp buggy case + * common: tx_power: Fix bug in power ramp up below max-initial value + * Update dependency on libosmocore 1.4.0 + * configure.ac: Fix trailing whitespace + * pcu_sock: Fix typo in log message + * bts-trx: Use TRXC RFMUTE instead of resetting the scheduler + * bts-trx: Ensure RFMUTE state is set properly at startup + * scheduler: Drop unused function trx_sched_reset() + * Fix RadioCarrier OML Operative State Change report not sent on some scenarios + * Improve logging around failing to (de)activate chan_nr + * Improve error handling and logging in gsm_pchan2chan_nr() + * Improve logging and error handling receiving act_req for dyn TS not yet configured + * pcu_sock: Only announce dyn TS already configured by lower layers + * Avoid sending RSL RF REL ACK if PDCH chan is disabled by administrative lock + * oml: Set RadioChannel operational state to Enabled only during OPSTART + * gsm_data.h: Drop unused struct field + * contrib/jenkins: Enable parallel make in make distcheck + * Drop unused param in oml_init() + * Change NM Channel availability Dependency->Offline when RadioCarrier becomes enabled + * Introduce NM BTS Site Manager FSM + * Introduce NM BTS FSM + * Introduce NM Radio Carrier and Baseband Transceiver FSMs + * Introduce NM Channel FSM + * bts_trx.c: Dispatch missing NM_EV_RSL_UP/DOWN to the bb_transc object + * oml: Set NM_OPSTATE_DISABLED by default + * common: Enable SIGABRT signal handler + * common: generate coredump and exit upon SIGABRT received + * sysmobts-mgr: generate coredump and exit upon SIGABRT received + * oc2g-mgr: generate coredump and exit upon SIGABRT received + * lc15-mgr: generate coredump and exit upon SIGABRT received + * nm_channel_fsm: Fix several FSM internal transitions not being made + * cosmetic: sysmobts-mgr: fix whitespace indentation + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * rsl: make IP DSCP configurable + * VTY: add "test send-failure-event-report" + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + * common/measurement.c: fix gcc 4 + -std=gnu11 error + + [ Harld Welte ] + * trx: Fix reported BER for TCH/H + * trx: Use NOPE indications from OsmoTRX for TCH/F and TCH/H + * trx: Use NOPE indications on SDCCH + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Rafael Diniz ] + * osmo-bts-litecell15: Implement missing features. + + [ Alexander Couzens ] + * measurement: replace u_int64_t with uint64_t + * pcuif_proto: version 0xa: add support for IPv6 NSVCs + * pcuif_proto: fix typo in comment + * Revert "pcuif_proto: version 0xa: add support for IPv6 NSVCs" + * pcuif_proto: version 10: add support for IPv6 NSVCs + * Introduce the new OML NM_ATT_OSMO_NS_LINK_CFG to configure IPv6 NSVC for PCU + * common/bts: set feature IPV6_NSVC + * OML: correct parse the NM_ATT_OSMO_NS_LINK_CFG field address_family + + [ Daniel Willmann ] + * osmo-bts-trx: Use much lower clock advance values towards PCU and TRX + + [ Neels Hofmeyr ] + * rename to release_sapi_ul_rach(), simplify + * part 1 of: fix SAPIs for handover to match 48.058 4.1.{3,4} + * part 2 of: fix SAPIs for handover, osmo-bts-sysmo + * part 3 of: fix SAPIs for handover, osmo-bts-trx + * part 4 of: fix SAPIs for handover, osmo-bts-lc15 + * part 5 of: fix SAPIs for handover, osmo-bts-oc2g + * log: rsl_rx_chan_activ: show chan type as human readable string + * chan activ: activate DL SACCH only when TA is known + * GSMTAP: make remote host for Um logging configurable via VTY + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:35:17 +0100 + osmo-bts (1.2.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 8559400..5a42d19 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,11 @@ dh-systemd (>= 1.5), autotools-dev, pkg-config, - libosmocore-dev (>= 1.4.0), - libosmo-abis-dev, + libosmocore-dev (>= 1.5.0), + libosmo-abis-dev (>= 1.1.0), libgps-dev, txt2man, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Browser: http://git.osmocom.org/osmo-bts/ Vcs-Git: git://git.osmocom.org/osmo-bts -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I206af3596a714e5e9038b22e84ae6c20dc360e13 Gerrit-Change-Number: 23047 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:49:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:49:24 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E14-3e65-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/23049 ) Change subject: Bump version: 1.0.0.14-3e65-dirty ? 1.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/23049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I8e3be883113444251f5008c407e9f722d0dcd422 Gerrit-Change-Number: 23049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 15:49:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:49:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:49:26 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E14-3e65-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/23049 ) Change subject: Bump version: 1.0.0.14-3e65-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.14-3e65-dirty ? 1.1.0 Change-Id: I8e3be883113444251f5008c407e9f722d0dcd422 --- M TODO-RELEASE M configure.ac M contrib/libosmo-netif.spec.in M debian/changelog M debian/control M src/Makefile.am M tests/osmo-pcap-test/configure.ac 7 files changed, 37 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index c89dec9..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-netif ipv6 Depends on libosmocore > 1.4.0 for IPv6 osmo_sock_inti2_multiaddr AF_UNSPEC (IPv6) support. diff --git a/configure.ac b/configure.ac index 1b2a459..31b7181 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ LT_INIT AC_PROG_LIBTOOL -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) @@ -89,8 +89,8 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) AC_ARG_ENABLE([lapd_examples], [AS_HELP_STRING( @@ -99,7 +99,7 @@ )], [lapd_examples=$enableval], [lapd_examples="no"]) AS_IF([test "x$lapd_examples" = "xyes"], [ - PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) + PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples]) ]) AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes") diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in index 95690a7..4b25378 100644 --- a/contrib/libosmo-netif.spec.in +++ b/contrib/libosmo-netif.spec.in @@ -24,8 +24,8 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 %description Network interface demuxer library for OsmoCom projects. diff --git a/debian/changelog b/debian/changelog index 1aa3ea1..eaa5dda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +libosmo-netif (1.1.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * stream: add missing Doxygen \return statements to non-void functions + + [ Pau Espin Pedrol ] + * stream: Support creating sockets with IPv6 addresses + * stream: Fix log of IPv6 during accept() + * contrib/jenkins: Enable parallel make in make distcheck + * tests: Explicitly drop category from log + * gitignore: Ignore autfoo *~ churn + * tests: Replace deprecated API log_set_print_filename + + [ Daniel Willmann ] + * examples: Use osmo_stream_*_set_nodelay in ipa examples + + [ Harald Welte ] + * Use osmo_fd_setup() wherever applicable + * cosmetic: Fix whitespace (use tab instead of 8x space) + * migrate to osmo_fd_{read,write}_{enable,disable}() + * Don't depend on libosmo-abis (by default) + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:47:37 +0100 + libosmo-netif (1.0.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 8b76089..e4d0f74 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ libdpkg-perl, git, doxygen, - libosmocore-dev (>= 1.3.0), + libosmocore-dev (>= 1.5.0), pkg-config, libpcap0.8-dev, libsctp-dev diff --git a/src/Makefile.am b/src/Makefile.am index 64fd1d4..7e71c71 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=9:0:1 +LIBVERSION=9:1:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) diff --git a/tests/osmo-pcap-test/configure.ac b/tests/osmo-pcap-test/configure.ac index 47fbfe2..7cb31b0 100644 --- a/tests/osmo-pcap-test/configure.ac +++ b/tests/osmo-pcap-test/configure.ac @@ -16,7 +16,7 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) AC_PROG_CC AC_DISABLE_STATIC -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/23049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I8e3be883113444251f5008c407e9f722d0dcd422 Gerrit-Change-Number: 23049 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 15:52:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 15:52:39 +0000 Subject: =?UTF-8?Q?Change_in_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E32=2E4-c0d4_=E2=86=92_0=2E9=2E33?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libasn1c/+/23050 ) Change subject: Bump version: 0.9.32.4-c0d4 ? 0.9.33 ...................................................................... Bump version: 0.9.32.4-c0d4 ? 0.9.33 Change-Id: I8643f527238202149ef2fceb7c7c98cfe8dc9563 --- M debian/changelog 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/50/23050/1 diff --git a/debian/changelog b/debian/changelog index d6987b6..10fa9b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libasn1c (0.9.33) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Pau Espin Pedrol ] + * contrib/jenkins: Enable parallel make in make distcheck + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:52:29 +0100 + libasn1c (0.9.32) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/23050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I8643f527238202149ef2fceb7c7c98cfe8dc9563 Gerrit-Change-Number: 23050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:01:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:01:55 +0000 Subject: =?UTF-8?Q?Change_in_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E32=2E4-c0d4_=E2=86=92_0=2E9=2E33?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/23050 ) Change subject: Bump version: 0.9.32.4-c0d4 ? 0.9.33 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/23050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I8643f527238202149ef2fceb7c7c98cfe8dc9563 Gerrit-Change-Number: 23050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:01:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:02:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:02:03 +0000 Subject: =?UTF-8?Q?Change_in_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E32=2E4-c0d4_=E2=86=92_0=2E9=2E33?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libasn1c/+/23050 ) Change subject: Bump version: 0.9.32.4-c0d4 ? 0.9.33 ...................................................................... Bump version: 0.9.32.4-c0d4 ? 0.9.33 Change-Id: I8643f527238202149ef2fceb7c7c98cfe8dc9563 --- M debian/changelog 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index d6987b6..10fa9b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libasn1c (0.9.33) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Pau Espin Pedrol ] + * contrib/jenkins: Enable parallel make in make distcheck + + -- Pau Espin Pedrol Tue, 23 Feb 2021 16:52:29 +0100 + libasn1c (0.9.32) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/23050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I8643f527238202149ef2fceb7c7c98cfe8dc9563 Gerrit-Change-Number: 23050 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:08:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:08:38 +0000 Subject: Change in osmo-ggsn[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23051 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: I966715ab2a430497bbccf26c50aef72d0901997f Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Related: OS#5041 --- M ggsn/ggsn_main.c 1 file changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/51/23051/1 diff --git a/ggsn/ggsn_main.c b/ggsn/ggsn_main.c index d19b359..88c3f68 100644 --- a/ggsn/ggsn_main.c +++ b/ggsn/ggsn_main.c @@ -107,17 +107,49 @@ " -c --config-file filename The config file to use\n" " -V --version Print the version of OsmoGGSN\n" ); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { { "help", 0, 0, 'h' }, { "daemonize", 0, 0, 'D' }, { "config-file", 1, 0, 'c' }, { "version", 0, 0, 'V' }, + { "vty-ref-mode", 1, &long_option, 1 }, + { "vty-ref-xml", 0, &long_option, 2 }, { 0, 0, 0, 0 } }; @@ -126,6 +158,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I966715ab2a430497bbccf26c50aef72d0901997f Gerrit-Change-Number: 23051 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:08:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:08:38 +0000 Subject: Change in osmo-ggsn[master]: manuals: generate vty reference xml at build time References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23052 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Remove ggsn_vty_reference from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-ggsn --vty-ref-xml cmdline switch. Change-Id: I772293cc78a6c95e07565a7048c1c8dadf87d2fc Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M doc/manuals/Makefile.am D doc/manuals/vty/ggsn_vty_reference.xml 2 files changed, 6 insertions(+), 1,639 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/52/23052/1 diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index f9f47fb..cbaf41a 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -11,6 +11,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmoggsn-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/ggsn_vty_reference.xml + $(builddir)/vty/ggsn_vty_reference.xml: $(top_builddir)/ggsn/osmo-ggsn + mkdir -p $(builddir)/vty + $(top_builddir)/ggsn/osmo-ggsn --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY=osmo-ggsn diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml deleted file mode 100644 index bbc8471..0000000 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ /dev/null @@ -1,1639 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-ggsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-ggsn-apn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I772293cc78a6c95e07565a7048c1c8dadf87d2fc Gerrit-Change-Number: 23052 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:11:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:11:22 +0000 Subject: Change in osmo-ggsn[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23051 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I966715ab2a430497bbccf26c50aef72d0901997f Gerrit-Change-Number: 23051 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:11:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:11:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:11:34 +0000 Subject: Change in osmo-ggsn[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23052 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I772293cc78a6c95e07565a7048c1c8dadf87d2fc Gerrit-Change-Number: 23052 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:11:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:17:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:17:12 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Remove test backward compatibility with older osmo-* versions These changes are no longer needed since master versions of whole CNI have been recently released. Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 14 files changed, 0 insertions(+), 145 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/23053/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ab8c06d..c040a0a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -19,13 +19,6 @@ SUBNET=12 network_create $SUBNET -# Disable stats testing until libosmocore release > 1.4.0 -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg -fi - echo Starting container with BSC docker run --rm \ $(docker_network_params $SUBNET 20) \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index cba378e..a807c49 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -19,30 +19,6 @@ mkdir $VOL_BASE_DIR/bts-omldummy -# Disable MSC pooling features until osmo-bsc.git release > 1.6.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg -fi - -# Disable stats testing until libosmocore release > 1.4.0 -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg -fi - -# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg - sed "/fd02:db8/d" -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg - sed -i "s/^BSC_Tests.mp_media_mgw_offer_ipv6.*/BSC_Tests.mp_media_mgw_offer_ipv6 := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi - -# Disable LCS tests until osmo-bsc > 1.6.0 -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i 's/^BSC_Tests.mp_enable_lcs_tests.*/BSC_Tests.mp_enable_lcs_tests := false;/' $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi - SUBNET=2 network_create $SUBNET diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 87e2896..8381a8b 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -114,16 +114,6 @@ mkdir $VOL_BASE_DIR/bts-tester-hopping cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/ -# TODO: revisit this section every time we tag a new release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # Work around for a bug in osmo-bts causing all transceivers to use IPAC_PROTO_RSL_TRX0 - sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" \ - -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" - # PCUIFv10 is not yet supported in the latest release - sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ - -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" -fi - cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index faf8170..9402006 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -17,11 +17,6 @@ mkdir $VOL_BASE_DIR/frnet cp FRNET_Tests.cfg $VOL_BASE_DIR/frnet/ -# Disable features not in latest yet -if [ "$IMAGE_SUFFIX" = "latest" ]; then - true; -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with FRNET diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 4ef2ace..352731f 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -30,11 +30,6 @@ mkdir $VOL_BASE_DIR/gbproxy cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ -# Disable features not in latest yet -if [ "$IMAGE_SUFFIX" = "latest" ]; then - true; -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with gbproxy diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index b063c7f..cc29a3c 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -18,11 +18,6 @@ mkdir $VOL_BASE_DIR/gbproxy cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ -# Disable features not in latest yet -if [ "$IMAGE_SUFFIX" = "latest" ]; then - true; -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with gbproxy diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 93ba6c3..51a33e8 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -12,12 +12,6 @@ mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ -# Disable D-GSM tests until osmo-hlr.git release > 1.2.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/HLR_Tests.mp_hlr_supports_dgsm := true/HLR_Tests.mp_hlr_supports_dgsm := false/g" -i \ - "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index c49096b..c704005 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -15,15 +15,6 @@ SUBNET=4 network_create $SUBNET -# Disable e1 config options until osmo-mgw >= 1.8.0 release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i "s/e1_line.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg - sed -i "s/e1_input.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg - sed -i "s/line 0.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg - # Disable IPv6 until osmo-mgw .git release > 1.7.0 is available - sed "/fd02:db8/d" -i $VOL_BASE_DIR/mgw/osmo-mgw.cfg -fi - # start container with mgw in background docker run --rm \ $(docker_network_params $SUBNET 180) \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index c67fb5e..90770cb 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -14,18 +14,6 @@ mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -# Disable verification of VLR and conn Cell ID until osmo-msc.git release > 1.6.1 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MSC_Tests.mp_enable_cell_id_test := true/MSC_Tests.mp_enable_cell_id_test := false/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - sed "s/BSC_ConnectionHandler.mp_expect_common_id := true/BSC_ConnectionHandler.mp_expect_common_id := false/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - sed "s/MSC_Tests.mp_enable_crashing_tests := true/MSC_Tests.mp_enable_crashing_tests := false/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - sed "s/MNCC_Emulation.mp_mncc_version := 7/MNCC_Emulation.mp_mncc_version := 6/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ @@ -33,12 +21,6 @@ mkdir $VOL_BASE_DIR/msc/unix cp osmo-msc.cfg $VOL_BASE_DIR/msc/ -# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg - sed "/fd02:db8/d" -i $VOL_BASE_DIR/msc/osmo-msc.cfg -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with STP diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index ee0b08a..9428776 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -19,22 +19,6 @@ mkdir $VOL_BASE_DIR/unix -# TODO: revisit this section every time we tag a new release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # PCUIFv10 is not yet supported in the latest release - sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - # Tolerate CellId IE in BVC-RESET for BVCO=0 - sed -e "/\[MODULE_PARAMETERS\]/ a BSSGP_Emulation.mp_tolerate_bvc_reset_cellid := true;" \ - -e "/\[MODULE_PARAMETERS\]/ a PCU_Tests_NS.mp_tolerate_bvc_reset_cellid := true;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - - # Disable stats testing until libosmocore release > 1.4.0 - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg -fi - echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index c2ef0d5..5dedec7 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -19,25 +19,6 @@ mkdir $VOL_BASE_DIR/unix -# TODO: revisit this section every time we tag a new release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # PCUIFv10 is not yet supported in the latest release - sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - # Tolerate CellId IE in BVC-RESET for BVCO=0 - sed -e "/\[MODULE_PARAMETERS\]/ a BSSGP_Emulation.mp_tolerate_bvc_reset_cellid := true;" \ - -e "/\[MODULE_PARAMETERS\]/ a PCU_Tests_NS.mp_tolerate_bvc_reset_cellid := true;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - - # Disable stats testing until libosmocore release > 1.4.0 - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg - - # neighbor resolution only available in osmo-pcu > 0.8.0 - sed "/neighbor resolution/d" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg -fi - echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 35eaf2e..9e16c3e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -19,14 +19,6 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available - sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg - - # latest doesn't use yet the NS2 code - cp osmo-sgsn.latest.cfg "$VOL_BASE_DIR/sgsn/osmo-sgsn.cfg" -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with STP diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index af5e40b..36252b0 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -13,12 +13,6 @@ mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ -# Can be removed once osmo-sip-connector > 1.4.1 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MNCC_Emulation.mp_mncc_version := 7/MNCC_Emulation.mp_mncc_version := 6/" -i \ - "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 9ea97cb..1b20c3f 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,13 +12,6 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "/fd02:db8/d" -i "$VOL_BASE_DIR/stp/osmo-stp.cfg" - sed 's/, "fd02:db8:19::203"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" - sed 's/, "fd02:db8:19::200"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" -fi - SUBNET=19 network_create $SUBNET -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:17:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:17:45 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: Code-Review-2 Don't merge this until all projects have been released (hopefully today). -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:17:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:20:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:20:35 +0000 Subject: Change in libosmo-sccp[master]: Add osmo_ss7_pointcode_print_buf() to API References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23054 ) Change subject: Add osmo_ss7_pointcode_print_buf() to API ...................................................................... Add osmo_ss7_pointcode_print_buf() to API Like osmo_ss7_pointcode_print(), but prints into an user-supplied buffer. Change-Id: I5fc7d7746eb90a9d404b6b50bf9ded6789a1c33c --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/54/23054/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index a2263a2..b717d53 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -24,6 +24,7 @@ bool osmo_ss7_pc_is_local(struct osmo_ss7_instance *inst, uint32_t pc); int osmo_ss7_pointcode_parse(struct osmo_ss7_instance *inst, const char *str); int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in); +const char *osmo_ss7_pointcode_print_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *inst, uint32_t pc); const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc); const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index a801cc9..5ff4ca4 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -260,7 +260,7 @@ return -EINVAL; } -const char *_osmo_ss7_pointcode_print(char *buf, size_t len, const struct osmo_ss7_instance *inst, uint32_t pc) +const char *osmo_ss7_pointcode_print_buf(char *buf, size_t len, const struct osmo_ss7_instance *inst, uint32_t pc) { const struct osmo_ss7_pc_fmt *pc_fmt; unsigned int num_comp_exp; @@ -287,7 +287,7 @@ const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc) { static char buf[MAX_PC_STR_LEN]; - return _osmo_ss7_pointcode_print(buf, sizeof(buf), inst, pc); + return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc); } /* same as osmo_ss7_pointcode_print() but using a separate buffer, useful for multiple point codes in the @@ -295,7 +295,7 @@ const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc) { static char buf[MAX_PC_STR_LEN]; - return _osmo_ss7_pointcode_print(buf, sizeof(buf), inst, pc); + return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc); } int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5fc7d7746eb90a9d404b6b50bf9ded6789a1c33c Gerrit-Change-Number: 23054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:20:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:20:47 +0000 Subject: Change in libosmo-sccp[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23055 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a Related: OS#5041 Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 --- M stp/stp_main.c 1 file changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/23055/1 diff --git a/stp/stp_main.c b/stp/stp_main.c index 42f7108..c7a6272 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -89,17 +89,49 @@ printf(" -D --daemonize Fork the process into a background daemon\n"); printf(" -c --config-file filename The config file to use. Default: ./osmo-stp.cfg\n"); printf(" -V --version Print the version of OsmoSTP\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static const struct option long_options[] = { { "help", 0, 0, 'h' }, { "daemonize", 0, 0, 'D' }, { "config-file", 1, 0, 'c' }, { "version", 0, 0, 'V' }, + { "vty-ref-mode", 1, &long_option, 1 }, + { "vty-ref-xml", 0, &long_option, 2 }, { NULL, 0, 0, 0 } }; @@ -108,6 +140,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': print_help(); exit(0); @@ -176,11 +211,6 @@ vty_info.tall_ctx = tall_stp_ctx; vty_init(&vty_info); - handle_options(argc, argv); - - fputs(stp_copyright, stdout); - fputs("\n", stdout); - OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); logging_vty_add_cmds(); @@ -191,6 +221,11 @@ osmo_fsm_vty_add_cmds(); osmo_talloc_vty_add_cmds(); + handle_options(argc, argv); + + fputs(stp_copyright, stdout); + fputs("\n", stdout); + rc = vty_read_config_file(cmdline_config.config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to parse the config file '%s'\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a Gerrit-Change-Number: 23055 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:20:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:20:53 +0000 Subject: Change in libosmo-sccp[master]: manuals: generate vty reference xml at build time References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23056 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Rremove osmo-stp_vty_reference from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-stp --vty-ref-xml cmdline switch. Change-Id: I5bcbbdf7b737d2ce36ea877bc78c8cf191a64e1b Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M doc/manuals/Makefile.am A doc/manuals/vty/osmo-stp_additions.xml D doc/manuals/vty/osmo-stp_vty_reference.xml 3 files changed, 8 insertions(+), 1,939 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/56/23056/1 diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 6707f07..4fd7677 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -12,6 +12,12 @@ aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc VTY_REFERENCE = osmostp-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/osmo-stp_vty_reference.xml + $(builddir)/vty/osmo-stp_vty_reference.xml: $(top_builddir)/stp/osmo-stp + mkdir -p $(builddir)/vty + $(top_builddir)/stp/osmo-stp --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY=osmo-stp diff --git a/doc/manuals/vty/osmo-stp_additions.xml b/doc/manuals/vty/osmo-stp_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/doc/manuals/vty/osmo-stp_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/doc/manuals/vty/osmo-stp_vty_reference.xml b/doc/manuals/vty/osmo-stp_vty_reference.xml deleted file mode 100644 index ff8103a..0000000 --- a/doc/manuals/vty/osmo-stp_vty_reference.xml +++ /dev/null @@ -1,1939 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-listen - - - - - - - - - - - - - - - - - config-cs7-rt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5bcbbdf7b737d2ce36ea877bc78c8cf191a64e1b Gerrit-Change-Number: 23056 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:22:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:22:01 +0000 Subject: Change in libosmo-sccp[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23055 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a Gerrit-Change-Number: 23055 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 16:22:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:23:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:23:35 +0000 Subject: Change in libosmo-sccp[master]: Add osmo_ss7_pointcode_print_buf() to API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23054 ) Change subject: Add osmo_ss7_pointcode_print_buf() to API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5fc7d7746eb90a9d404b6b50bf9ded6789a1c33c Gerrit-Change-Number: 23054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:23:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:24:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:24:17 +0000 Subject: Change in libosmo-sccp[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23056 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5bcbbdf7b737d2ce36ea877bc78c8cf191a64e1b Gerrit-Change-Number: 23056 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:24:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:27:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:27:38 +0000 Subject: Change in osmo-hlr[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23057 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: I939f75d6c03145dbe185d849b95b2dd99782f35c Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Related: OS#5041 --- M src/hlr.c 1 file changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/23057/1 diff --git a/src/hlr.c b/src/hlr.c index ac5c1ec..45d0b90 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -577,6 +577,10 @@ printf(" -U --db-upgrade Allow HLR database schema upgrades.\n"); printf(" -C --db-check Quit after opening (and upgrading) the database.\n"); printf(" -V --version Print the version of OsmoHLR.\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } static struct { @@ -592,10 +596,37 @@ .db_upgrade = false, }; +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } + +} + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"config-file", 1, 0, 'c'}, @@ -608,6 +639,8 @@ {"db-upgrade", 0, 0, 'U' }, {"db-check", 0, 0, 'C' }, {"version", 0, 0, 'V' }, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; @@ -617,6 +650,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': print_usage(); print_help(); @@ -730,10 +766,10 @@ osmo_stats_init(hlr_ctx); vty_init(&vty_info); ctrl_vty_init(hlr_ctx); - handle_options(argc, argv); hlr_vty_init(); dgsm_vty_init(); osmo_cpu_sched_vty_init(hlr_ctx); + handle_options(argc, argv); rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I939f75d6c03145dbe185d849b95b2dd99782f35c Gerrit-Change-Number: 23057 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:27:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:27:39 +0000 Subject: Change in osmo-hlr[master]: manuals: generate vty reference xml at build time References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23058 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Move 'doc' subdir further down to "make sure" the osmo-hlr binary is built before the docs Remove hlr_vty_reference from the source tree. In manuals//Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-hlr --vty-ref-xml cmdline switch. Change-Id: I02c9862ced48ce4271b328a0963d5f09086b295c Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M Makefile.am M doc/manuals/Makefile.am D doc/manuals/vty/hlr_vty_reference.xml 3 files changed, 7 insertions(+), 1,778 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/23058/1 diff --git a/Makefile.am b/Makefile.am index 9a92f2f..e6ba26d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,9 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ - doc \ src \ include \ + doc \ sql \ contrib \ tests \ diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 8a47f8a..e3a76ad 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -14,6 +14,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohlr-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/hlr_vty_reference.xml + $(builddir)/vty/hlr_vty_reference.xml: $(top_builddir)/src/osmo-hlr + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-hlr --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-hlr diff --git a/doc/manuals/vty/hlr_vty_reference.xml b/doc/manuals/vty/hlr_vty_reference.xml deleted file mode 100644 index 7a9eb03..0000000 --- a/doc/manuals/vty/hlr_vty_reference.xml +++ /dev/null @@ -1,1777 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-hlr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hlr-gsup - - - - - - - - - - - - - - - - config-hlr-euse - - - config-mslookup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mslookup-server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mslookup-server-msc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mslookup-client - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I02c9862ced48ce4271b328a0963d5f09086b295c Gerrit-Change-Number: 23058 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:29:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:29:02 +0000 Subject: Change in osmo-hlr[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23057 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I939f75d6c03145dbe185d849b95b2dd99782f35c Gerrit-Change-Number: 23057 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 16:29:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:29:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:29:28 +0000 Subject: Change in osmo-hlr[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23058 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I02c9862ced48ce4271b328a0963d5f09086b295c Gerrit-Change-Number: 23058 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 16:29:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:30:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:30:36 +0000 Subject: Change in osmo-ggsn[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23051 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: I966715ab2a430497bbccf26c50aef72d0901997f Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Related: OS#5041 --- M ggsn/ggsn_main.c 1 file changed, 35 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ggsn/ggsn_main.c b/ggsn/ggsn_main.c index d19b359..88c3f68 100644 --- a/ggsn/ggsn_main.c +++ b/ggsn/ggsn_main.c @@ -107,17 +107,49 @@ " -c --config-file filename The config file to use\n" " -V --version Print the version of OsmoGGSN\n" ); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { { "help", 0, 0, 'h' }, { "daemonize", 0, 0, 'D' }, { "config-file", 1, 0, 'c' }, { "version", 0, 0, 'V' }, + { "vty-ref-mode", 1, &long_option, 1 }, + { "vty-ref-xml", 0, &long_option, 2 }, { 0, 0, 0, 0 } }; @@ -126,6 +158,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I966715ab2a430497bbccf26c50aef72d0901997f Gerrit-Change-Number: 23051 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:30:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:30:38 +0000 Subject: Change in osmo-ggsn[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23052 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Remove ggsn_vty_reference from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-ggsn --vty-ref-xml cmdline switch. Change-Id: I772293cc78a6c95e07565a7048c1c8dadf87d2fc Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M doc/manuals/Makefile.am D doc/manuals/vty/ggsn_vty_reference.xml 2 files changed, 6 insertions(+), 1,639 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index f9f47fb..cbaf41a 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -11,6 +11,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmoggsn-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/ggsn_vty_reference.xml + $(builddir)/vty/ggsn_vty_reference.xml: $(top_builddir)/ggsn/osmo-ggsn + mkdir -p $(builddir)/vty + $(top_builddir)/ggsn/osmo-ggsn --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY=osmo-ggsn diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml deleted file mode 100644 index bbc8471..0000000 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ /dev/null @@ -1,1639 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-ggsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-ggsn-apn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I772293cc78a6c95e07565a7048c1c8dadf87d2fc Gerrit-Change-Number: 23052 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:31:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:31:40 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E7=2E0=2E2-17ce_=E2=86=92_1=2E7=2E1?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23059 ) Change subject: Bump version: 1.7.0.2-17ce ? 1.7.1 ...................................................................... Bump version: 1.7.0.2-17ce ? 1.7.1 Change-Id: Ideca49e0762eb20799375a33a04469673dfeb168 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/59/23059/1 diff --git a/debian/changelog b/debian/changelog index f65aaa8..29f9d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +osmo-ggsn (1.7.1) unstable; urgency=medium + + [ Harald Welte ] + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + -- Pau Espin Pedrol Tue, 23 Feb 2021 17:31:24 +0100 + osmo-ggsn (1.7.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ideca49e0762eb20799375a33a04469673dfeb168 Gerrit-Change-Number: 23059 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:34:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:34:29 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E7=2E0=2E2-17ce_=E2=86=92_1=2E7=2E1?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23059 ) Change subject: Bump version: 1.7.0.2-17ce ? 1.7.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ideca49e0762eb20799375a33a04469673dfeb168 Gerrit-Change-Number: 23059 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:34:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:34:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:34:32 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E7=2E0=2E2-17ce_=E2=86=92_1=2E7=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/23059 ) Change subject: Bump version: 1.7.0.2-17ce ? 1.7.1 ...................................................................... Bump version: 1.7.0.2-17ce ? 1.7.1 Change-Id: Ideca49e0762eb20799375a33a04469673dfeb168 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index f65aaa8..29f9d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +osmo-ggsn (1.7.1) unstable; urgency=medium + + [ Harald Welte ] + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + -- Pau Espin Pedrol Tue, 23 Feb 2021 17:31:24 +0100 + osmo-ggsn (1.7.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/23059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ideca49e0762eb20799375a33a04469673dfeb168 Gerrit-Change-Number: 23059 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:35:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:35:55 +0000 Subject: Change in libosmo-sccp[master]: Add osmo_ss7_pointcode_print_buf() to API In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23054 ) Change subject: Add osmo_ss7_pointcode_print_buf() to API ...................................................................... Add osmo_ss7_pointcode_print_buf() to API Like osmo_ss7_pointcode_print(), but prints into an user-supplied buffer. Change-Id: I5fc7d7746eb90a9d404b6b50bf9ded6789a1c33c --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index a2263a2..b717d53 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -24,6 +24,7 @@ bool osmo_ss7_pc_is_local(struct osmo_ss7_instance *inst, uint32_t pc); int osmo_ss7_pointcode_parse(struct osmo_ss7_instance *inst, const char *str); int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in); +const char *osmo_ss7_pointcode_print_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *inst, uint32_t pc); const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc); const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index a801cc9..5ff4ca4 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -260,7 +260,7 @@ return -EINVAL; } -const char *_osmo_ss7_pointcode_print(char *buf, size_t len, const struct osmo_ss7_instance *inst, uint32_t pc) +const char *osmo_ss7_pointcode_print_buf(char *buf, size_t len, const struct osmo_ss7_instance *inst, uint32_t pc) { const struct osmo_ss7_pc_fmt *pc_fmt; unsigned int num_comp_exp; @@ -287,7 +287,7 @@ const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc) { static char buf[MAX_PC_STR_LEN]; - return _osmo_ss7_pointcode_print(buf, sizeof(buf), inst, pc); + return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc); } /* same as osmo_ss7_pointcode_print() but using a separate buffer, useful for multiple point codes in the @@ -295,7 +295,7 @@ const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc) { static char buf[MAX_PC_STR_LEN]; - return _osmo_ss7_pointcode_print(buf, sizeof(buf), inst, pc); + return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc); } int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5fc7d7746eb90a9d404b6b50bf9ded6789a1c33c Gerrit-Change-Number: 23054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:35:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:35:57 +0000 Subject: Change in libosmo-sccp[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23055 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a Related: OS#5041 Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 --- M stp/stp_main.c 1 file changed, 40 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/stp_main.c b/stp/stp_main.c index 42f7108..c7a6272 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -89,17 +89,49 @@ printf(" -D --daemonize Fork the process into a background daemon\n"); printf(" -c --config-file filename The config file to use. Default: ./osmo-stp.cfg\n"); printf(" -V --version Print the version of OsmoSTP\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static const struct option long_options[] = { { "help", 0, 0, 'h' }, { "daemonize", 0, 0, 'D' }, { "config-file", 1, 0, 'c' }, { "version", 0, 0, 'V' }, + { "vty-ref-mode", 1, &long_option, 1 }, + { "vty-ref-xml", 0, &long_option, 2 }, { NULL, 0, 0, 0 } }; @@ -108,6 +140,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': print_help(); exit(0); @@ -176,11 +211,6 @@ vty_info.tall_ctx = tall_stp_ctx; vty_init(&vty_info); - handle_options(argc, argv); - - fputs(stp_copyright, stdout); - fputs("\n", stdout); - OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); logging_vty_add_cmds(); @@ -191,6 +221,11 @@ osmo_fsm_vty_add_cmds(); osmo_talloc_vty_add_cmds(); + handle_options(argc, argv); + + fputs(stp_copyright, stdout); + fputs("\n", stdout); + rc = vty_read_config_file(cmdline_config.config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to parse the config file '%s'\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a Gerrit-Change-Number: 23055 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:35:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:35:58 +0000 Subject: Change in libosmo-sccp[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23056 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Rremove osmo-stp_vty_reference from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-stp --vty-ref-xml cmdline switch. Change-Id: I5bcbbdf7b737d2ce36ea877bc78c8cf191a64e1b Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M doc/manuals/Makefile.am A doc/manuals/vty/osmo-stp_additions.xml D doc/manuals/vty/osmo-stp_vty_reference.xml 3 files changed, 8 insertions(+), 1,939 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 6707f07..4fd7677 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -12,6 +12,12 @@ aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc VTY_REFERENCE = osmostp-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/osmo-stp_vty_reference.xml + $(builddir)/vty/osmo-stp_vty_reference.xml: $(top_builddir)/stp/osmo-stp + mkdir -p $(builddir)/vty + $(top_builddir)/stp/osmo-stp --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY=osmo-stp diff --git a/doc/manuals/vty/osmo-stp_additions.xml b/doc/manuals/vty/osmo-stp_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/doc/manuals/vty/osmo-stp_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/doc/manuals/vty/osmo-stp_vty_reference.xml b/doc/manuals/vty/osmo-stp_vty_reference.xml deleted file mode 100644 index ff8103a..0000000 --- a/doc/manuals/vty/osmo-stp_vty_reference.xml +++ /dev/null @@ -1,1939 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-listen - - - - - - - - - - - - - - - - - config-cs7-rt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I5bcbbdf7b737d2ce36ea877bc78c8cf191a64e1b Gerrit-Change-Number: 23056 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:36:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:36:59 +0000 Subject: Change in libosmo-sccp[master]: stp: generate coredump and exit upon SIGABRT received References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 ) Change subject: stp: generate coredump and exit upon SIGABRT received ...................................................................... stp: generate coredump and exit upon SIGABRT received Previous code relied on abort() switching sigaction to SIG_FDL + retriggering SIGABRT in case the signal handler returns, which would then generate the coredump + terminate the process. However, if a SIGABRT is received from somewhere else (kill -SIGABRT), then the process would print the talloc report and continue running, which is not desired. Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Fixes: OS#4865 --- M stp/stp_main.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/60/23060/1 diff --git a/stp/stp_main.c b/stp/stp_main.c index c7a6272..8518d45 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -185,8 +185,17 @@ break; case SIGABRT: osmo_generate_backtrace(); - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_stp_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_stp_ctx, stderr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Gerrit-Change-Number: 23060 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:41:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:41:11 +0000 Subject: Change in libosmo-sccp[master]: stp: generate coredump and exit upon SIGABRT received In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 to look at the new patch set (#2). Change subject: stp: generate coredump and exit upon SIGABRT received ...................................................................... stp: generate coredump and exit upon SIGABRT received Previous code relied on abort() switching sigaction to SIG_FDL + retriggering SIGABRT in case the signal handler returns, which would then generate the coredump + terminate the process. However, if a SIGABRT is received from somewhere else (kill -SIGABRT), then the process would print the talloc report and continue running, which is not desired. Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Fixes: OS#4865 --- M stp/stp_main.c 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/60/23060/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Gerrit-Change-Number: 23060 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:42:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:42:13 +0000 Subject: Change in libosmo-sccp[master]: stp: generate coredump and exit upon SIGABRT received In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 ) Change subject: stp: generate coredump and exit upon SIGABRT received ...................................................................... Patch Set 2: I'm merging this one now before release, I somehow forgot to push it a while ago while applying same fix to all other projects. I had it dangling on a local branch. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Gerrit-Change-Number: 23060 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 23 Feb 2021 16:42:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:43:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:43:47 +0000 Subject: Change in libosmo-sccp[master]: stp: generate coredump and exit upon SIGABRT received In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 ) Change subject: stp: generate coredump and exit upon SIGABRT received ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Gerrit-Change-Number: 23060 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 16:43:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:43:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:43:49 +0000 Subject: Change in libosmo-sccp[master]: stp: generate coredump and exit upon SIGABRT received In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 ) Change subject: stp: generate coredump and exit upon SIGABRT received ...................................................................... stp: generate coredump and exit upon SIGABRT received Previous code relied on abort() switching sigaction to SIG_FDL + retriggering SIGABRT in case the signal handler returns, which would then generate the coredump + terminate the process. However, if a SIGABRT is received from somewhere else (kill -SIGABRT), then the process would print the talloc report and continue running, which is not desired. Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Fixes: OS#4865 --- M stp/stp_main.c 1 file changed, 14 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/stp/stp_main.c b/stp/stp_main.c index c7a6272..1e83615 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -170,11 +170,11 @@ } } -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stdout, "signal %u received\n", signal); + fprintf(stdout, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: case SIGTERM: /* FIXME: handle the signal somewhere else and gracefully shut down @@ -185,8 +185,17 @@ break; case SIGABRT: osmo_generate_backtrace(); - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_stp_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_stp_ctx, stderr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idca8e360968cb6998591737348ce520954e251b2 Gerrit-Change-Number: 23060 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:44:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:44:57 +0000 Subject: Change in osmo-iuh[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23061 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: If07b00e928fbecc596a7f75fc55e811bd9199b72 Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Relates: OS#5041 --- M src/hnbgw.c 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/23061/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index a6e0d29..5e01b63 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -415,12 +415,42 @@ printf(" -T --timestamp Prefix every log line with a timestamp.\n"); printf(" -V --version Print the version of OsmoHNBGW.\n"); printf(" -e --log-level number Set a global loglevel.\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"debug", 1, 0, 'd'}, @@ -430,6 +460,8 @@ {"timestamp", 0, 0, 'T'}, {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; @@ -439,6 +471,8 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); case 'h': print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If07b00e928fbecc596a7f75fc55e811bd9199b72 Gerrit-Change-Number: 23061 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:44:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:44:58 +0000 Subject: Change in osmo-iuh[master]: manuals: generate vty reference xml at build time References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23062 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Remove hnbgw_vty_reference from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-hnbgw --vty-ref-xml cmdline switch. Change-Id: Ia1e978ad9139c41368cd2720c339e1738d345c4a Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M doc/manuals/Makefile.am D doc/manuals/vty/hnbgw_vty_reference.xml 2 files changed, 6 insertions(+), 1,535 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/62/23062/1 diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 7a76e90..595f157 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -12,6 +12,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohnbgw-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/hnbgw_vty_reference.xml + $(builddir)/vty/hnbgw_vty_reference.xml: $(top_builddir)/src/osmo-hnbgw + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-hnbgw --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-hnbgw diff --git a/doc/manuals/vty/hnbgw_vty_reference.xml b/doc/manuals/vty/hnbgw_vty_reference.xml deleted file mode 100644 index 4046636..0000000 --- a/doc/manuals/vty/hnbgw_vty_reference.xml +++ /dev/null @@ -1,1535 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hnbgw - - - - - - - - - - - - - - - - - - - - - - - - config-hnbgw-iuh - - - - - - - - - - - - - - - - - - - - - - config-hnbgw-iucs - - - - - - - - - config-hnbgw-iups - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia1e978ad9139c41368cd2720c339e1738d345c4a Gerrit-Change-Number: 23062 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:48:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:48:36 +0000 Subject: Change in osmo-hlr[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23057 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: I939f75d6c03145dbe185d849b95b2dd99782f35c Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Related: OS#5041 --- M src/hlr.c 1 file changed, 37 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr.c b/src/hlr.c index ac5c1ec..45d0b90 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -577,6 +577,10 @@ printf(" -U --db-upgrade Allow HLR database schema upgrades.\n"); printf(" -C --db-check Quit after opening (and upgrading) the database.\n"); printf(" -V --version Print the version of OsmoHLR.\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } static struct { @@ -592,10 +596,37 @@ .db_upgrade = false, }; +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } + +} + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"config-file", 1, 0, 'c'}, @@ -608,6 +639,8 @@ {"db-upgrade", 0, 0, 'U' }, {"db-check", 0, 0, 'C' }, {"version", 0, 0, 'V' }, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; @@ -617,6 +650,9 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); + break; case 'h': print_usage(); print_help(); @@ -730,10 +766,10 @@ osmo_stats_init(hlr_ctx); vty_init(&vty_info); ctrl_vty_init(hlr_ctx); - handle_options(argc, argv); hlr_vty_init(); dgsm_vty_init(); osmo_cpu_sched_vty_init(hlr_ctx); + handle_options(argc, argv); rc = vty_read_config_file(cmdline_opts.config_file, NULL); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I939f75d6c03145dbe185d849b95b2dd99782f35c Gerrit-Change-Number: 23057 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:48:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:48:37 +0000 Subject: Change in osmo-hlr[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23058 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Move 'doc' subdir further down to "make sure" the osmo-hlr binary is built before the docs Remove hlr_vty_reference from the source tree. In manuals//Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-hlr --vty-ref-xml cmdline switch. Change-Id: I02c9862ced48ce4271b328a0963d5f09086b295c Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M Makefile.am M doc/manuals/Makefile.am D doc/manuals/vty/hlr_vty_reference.xml 3 files changed, 7 insertions(+), 1,778 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 9a92f2f..e6ba26d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,9 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ - doc \ src \ include \ + doc \ sql \ contrib \ tests \ diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 8a47f8a..e3a76ad 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -14,6 +14,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohlr-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/hlr_vty_reference.xml + $(builddir)/vty/hlr_vty_reference.xml: $(top_builddir)/src/osmo-hlr + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-hlr --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-hlr diff --git a/doc/manuals/vty/hlr_vty_reference.xml b/doc/manuals/vty/hlr_vty_reference.xml deleted file mode 100644 index 7a9eb03..0000000 --- a/doc/manuals/vty/hlr_vty_reference.xml +++ /dev/null @@ -1,1777 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-cpu-sched - - - - - - - - - - - - - - - - - - - - - config-hlr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hlr-gsup - - - - - - - - - - - - - - - - config-hlr-euse - - - config-mslookup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mslookup-server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mslookup-server-msc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mslookup-client - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I02c9862ced48ce4271b328a0963d5f09086b295c Gerrit-Change-Number: 23058 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:48:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 16:48:55 +0000 Subject: Change in osmo-sgsn[master]: main: change initialization order In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 ) Change subject: main: change initialization order ...................................................................... main: change initialization order We must have initialized e.g. the NS protocol stack before calling handle_options(), as that might want to dumpy the VTY XML, and it can obviously only dump those nodes that are registered at that point. Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 --- M src/sgsn/sgsn_main.c 1 file changed, 17 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 6c57071..2cabbf3 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -407,23 +407,6 @@ osmo_sccp_vty_init(); #endif - handle_options(argc, argv); - - /* Backwards compatibility: for years, the default config file name was - * osmo_sgsn.cfg. All other Osmocom programs use osmo-*.cfg with a - * dash. To be able to use the new config file name without breaking - * previous setups that might rely on the legacy default config file - * name, we need to look for the old config file if no -c option was - * passed AND no file exists with the new default file name. */ - if (!sgsn->config_file) { - /* No -c option was passed */ - if (file_exists(CONFIG_FILE_LEGACY) - && !file_exists(CONFIG_FILE_DEFAULT)) - osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_LEGACY); - else - osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_DEFAULT); - } - rate_ctr_init(tall_sgsn_ctx); logging_vty_add_deprecated_subsys(tall_sgsn_ctx, "bssgp"); @@ -448,6 +431,23 @@ sgsn_auth_init(sgsn); sgsn_cdr_init(sgsn); + handle_options(argc, argv); + + /* Backwards compatibility: for years, the default config file name was + * osmo_sgsn.cfg. All other Osmocom programs use osmo-*.cfg with a + * dash. To be able to use the new config file name without breaking + * previous setups that might rely on the legacy default config file + * name, we need to look for the old config file if no -c option was + * passed AND no file exists with the new default file name. */ + if (!sgsn->config_file) { + /* No -c option was passed */ + if (file_exists(CONFIG_FILE_LEGACY) + && !file_exists(CONFIG_FILE_DEFAULT)) + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_LEGACY); + else + osmo_talloc_replace_string(sgsn, &sgsn->config_file, CONFIG_FILE_DEFAULT); + } + rc = sgsn_parse_config(sgsn->config_file); if (rc < 0) { LOGP(DGPRS, LOGL_FATAL, "Error in config file\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icd1b8fb3f466cdace67ff0d4f7c85183d8266c41 Gerrit-Change-Number: 23048 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 16:58:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 16:58:09 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E51-6858-dirty_=E2=86=92_1=2E4=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23063 ) Change subject: Bump version: 1.3.0.51-6858-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.51-6858-dirty ? 1.4.0 Change-Id: I017147905ffb69829d010f3e8416c8c5d80e7040 --- M TODO-RELEASE M configure.ac M contrib/libosmo-sccp.spec.in M debian/changelog M debian/control M src/Makefile.am 6 files changed, 81 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/63/23063/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index b274427..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-stp update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include diff --git a/configure.ac b/configure.ac index cd79231..4367b8a 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [ diff --git a/contrib/libosmo-sccp.spec.in b/contrib/libosmo-sccp.spec.in index d393318..f792f69 100644 --- a/contrib/libosmo-sccp.spec.in +++ b/contrib/libosmo-sccp.spec.in @@ -34,10 +34,10 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: xz -BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index 5c9b71e..57964a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,72 @@ +libosmo-sccp (1.4.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + + [ Pau Espin Pedrol ] + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * configure.ac: Fix trailing whitespace + * Introduce SS7 IPv6 support + * Fix finding ASP on IPv6 connections + * vty: log and return warning if adding ss7 host to set fails + * Revert "Revert "Introduce SS7 IPv6 support"" + * Fix change in ss7 server default listen addr, keeps backward-compatibility behavior + * Validate correctly against IPv6 addresses in osmo_ss7_asp_peer_set_hosts() + * Fix matching IPv6 anyaddr :: in osmo_ss7_asp_find_by_socket_addr + * Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior + * Fix default ASP local addr if remote addr contains only IPv4 + * sua: Support SUA_IEI_IPv6 + * xua_msg: Get Rid of confusing double network byte order swap + * sccp_helpers: Support printing IPV6 SCCP addresses + * contrib/jenkins: Enable parallel make in make distcheck + * tests: Explicitly drop category from log + * gitignore: Ignore autofoo *~ churn + * tests: Replace deprecated API log_set_print_filename + * stp: generate coredump and exit upon SIGABRT received + + [ neels ] + * Revert "Introduce SS7 IPv6 support" + + [ Neels Hofmeyr ] + * enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE + * add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() + * add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c + * add osmo_sccp_addr_to_id_c() + + [ Philipp Maier ] + * vty: add attributes to VTY commands indicating when they apply + + [ Harald Welte ] + * update VTY / copyright message + * xua_msg_add_data() Mark input argument as 'const' + * xua_msg: const-ify input arguments to xua_*_get_u32() + * osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() + * sccp_sap: Fix string for N-PCSTATE primitive + * xua_msg: Add xua_msg*_get_str() to obtain string IE + * Introduce osmo_ss7_asp_get_log_subsys() + * m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup + * m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() + * SUA: Verify routing context IE of incoming CL and CO messages + * xua: Implement SNM availability/unavailability messaging + * sccp: Notify users of point code available/unavailable + * sccp: Add minimalistic SCMG implementation + * xua: introduce xua_msg_get_u32p() helper + * sua: per-ssn DUNA/DAVA notification + * sccp: more SCMG handling: SSA and SSP message handling + * xua_snm: Implement handling of DUPU messages + * Add osmo_ss7_pointcode_print_buf() to API + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Oliver Smith ] + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + * xua_test: fix gcc 4 + -std=gnu11 error + + -- Pau Espin Pedrol Tue, 23 Feb 2021 17:57:33 +0100 + libosmo-sccp (1.3.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index f8d25f6..b12e247 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev (>= 1.4.0), + libosmocore-dev (>= 1.5.0), autoconf, automake, libtool, @@ -13,9 +13,9 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev (>= 0.7.0), + libosmo-netif-dev (>= 1.1.0), libsctp-dev, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git Vcs-Browser: http://git.osmocom.org/libosmo-sccp/ diff --git a/src/Makefile.am b/src/Makefile.am index 4558810..aee7fd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=5:0:0 +LIBVERSION=6:0:1 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I017147905ffb69829d010f3e8416c8c5d80e7040 Gerrit-Change-Number: 23063 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:01:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:01:01 +0000 Subject: =?UTF-8?Q?Change_in_libsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E14=2E0=2E6-1e60_=E2=86=92_1=2E14=2E1?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/23064 ) Change subject: Bump version: 1.14.0.6-1e60 ? 1.14.1 ...................................................................... Bump version: 1.14.0.6-1e60 ? 1.14.1 Change-Id: Ifdb8f2b5a528f4c70a51322fc2ee66c99d0a68d2 --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/64/23064/1 diff --git a/debian/changelog b/debian/changelog index 3c07045..24dcead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +libsmpp34 (1.14.1) unstable; urgency=medium + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Pau Espin Pedrol ] + * .gitignore: Ignore new autofoo tmp files + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:00:48 +0100 + libsmpp34 (1.14.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/23064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ifdb8f2b5a528f4c70a51322fc2ee66c99d0a68d2 Gerrit-Change-Number: 23064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:02:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:02:47 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E51-6858-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23063 ) Change subject: Bump version: 1.3.0.51-6858-dirty ? 1.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I017147905ffb69829d010f3e8416c8c5d80e7040 Gerrit-Change-Number: 23063 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 17:02:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:02:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:02:49 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E51-6858-dirty_=E2=86=92_1=2E4=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/23063 ) Change subject: Bump version: 1.3.0.51-6858-dirty ? 1.4.0 ...................................................................... Bump version: 1.3.0.51-6858-dirty ? 1.4.0 Change-Id: I017147905ffb69829d010f3e8416c8c5d80e7040 --- M TODO-RELEASE M configure.ac M contrib/libosmo-sccp.spec.in M debian/changelog M debian/control M src/Makefile.am 6 files changed, 81 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index b274427..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-stp update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include diff --git a/configure.ac b/configure.ac index cd79231..4367b8a 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.7.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [ diff --git a/contrib/libosmo-sccp.spec.in b/contrib/libosmo-sccp.spec.in index d393318..f792f69 100644 --- a/contrib/libosmo-sccp.spec.in +++ b/contrib/libosmo-sccp.spec.in @@ -34,10 +34,10 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: xz -BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index 5c9b71e..57964a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,72 @@ +libosmo-sccp (1.4.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + + [ Pau Espin Pedrol ] + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * configure.ac: Fix trailing whitespace + * Introduce SS7 IPv6 support + * Fix finding ASP on IPv6 connections + * vty: log and return warning if adding ss7 host to set fails + * Revert "Revert "Introduce SS7 IPv6 support"" + * Fix change in ss7 server default listen addr, keeps backward-compatibility behavior + * Validate correctly against IPv6 addresses in osmo_ss7_asp_peer_set_hosts() + * Fix matching IPv6 anyaddr :: in osmo_ss7_asp_find_by_socket_addr + * Fix (2) change in ss7 server default listen addr, keeps backward-compatibility behavior + * Fix default ASP local addr if remote addr contains only IPv4 + * sua: Support SUA_IEI_IPv6 + * xua_msg: Get Rid of confusing double network byte order swap + * sccp_helpers: Support printing IPV6 SCCP addresses + * contrib/jenkins: Enable parallel make in make distcheck + * tests: Explicitly drop category from log + * gitignore: Ignore autofoo *~ churn + * tests: Replace deprecated API log_set_print_filename + * stp: generate coredump and exit upon SIGABRT received + + [ neels ] + * Revert "Introduce SS7 IPv6 support" + + [ Neels Hofmeyr ] + * enum osmo_sccp_ssn: rename to OSMO_SCCP_SSN_SMLC_BSSAP_LE + * add OSMO_SCCP_ADDR_T_MASK for osmo_sccp_addr_cmp() + * add osmo_sccp_addr_to_str_c osmo_sccp_inst_addr_to_str_c + * add osmo_sccp_addr_to_id_c() + + [ Philipp Maier ] + * vty: add attributes to VTY commands indicating when they apply + + [ Harald Welte ] + * update VTY / copyright message + * xua_msg_add_data() Mark input argument as 'const' + * xua_msg: const-ify input arguments to xua_*_get_u32() + * osmo_ss7: const-ify input arguments to osmo_ss7_as_has_asp() + * sccp_sap: Fix string for N-PCSTATE primitive + * xua_msg: Add xua_msg*_get_str() to obtain string IE + * Introduce osmo_ss7_asp_get_log_subsys() + * m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup + * m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() + * SUA: Verify routing context IE of incoming CL and CO messages + * xua: Implement SNM availability/unavailability messaging + * sccp: Notify users of point code available/unavailable + * sccp: Add minimalistic SCMG implementation + * xua: introduce xua_msg_get_u32p() helper + * sua: per-ssn DUNA/DAVA notification + * sccp: more SCMG handling: SSA and SSP message handling + * xua_snm: Implement handling of DUPU messages + * Add osmo_ss7_pointcode_print_buf() to API + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Oliver Smith ] + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + * xua_test: fix gcc 4 + -std=gnu11 error + + -- Pau Espin Pedrol Tue, 23 Feb 2021 17:57:33 +0100 + libosmo-sccp (1.3.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index f8d25f6..b12e247 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev (>= 1.4.0), + libosmocore-dev (>= 1.5.0), autoconf, automake, libtool, @@ -13,9 +13,9 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev (>= 0.7.0), + libosmo-netif-dev (>= 1.1.0), libsctp-dev, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git Vcs-Browser: http://git.osmocom.org/libosmo-sccp/ diff --git a/src/Makefile.am b/src/Makefile.am index 4558810..aee7fd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=5:0:0 +LIBVERSION=6:0:1 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/23063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I017147905ffb69829d010f3e8416c8c5d80e7040 Gerrit-Change-Number: 23063 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:03:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:03:36 +0000 Subject: =?UTF-8?Q?Change_in_libsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E14=2E0=2E6-1e60_=E2=86=92_1=2E14=2E1?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/23064 ) Change subject: Bump version: 1.14.0.6-1e60 ? 1.14.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/23064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ifdb8f2b5a528f4c70a51322fc2ee66c99d0a68d2 Gerrit-Change-Number: 23064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 17:03:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:03:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:03:38 +0000 Subject: =?UTF-8?Q?Change_in_libsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E14=2E0=2E6-1e60_=E2=86=92_1=2E14=2E1?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/23064 ) Change subject: Bump version: 1.14.0.6-1e60 ? 1.14.1 ...................................................................... Bump version: 1.14.0.6-1e60 ? 1.14.1 Change-Id: Ifdb8f2b5a528f4c70a51322fc2ee66c99d0a68d2 --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 3c07045..24dcead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +libsmpp34 (1.14.1) unstable; urgency=medium + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + + [ Pau Espin Pedrol ] + * .gitignore: Ignore new autofoo tmp files + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:00:48 +0100 + libsmpp34 (1.14.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/23064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ifdb8f2b5a528f4c70a51322fc2ee66c99d0a68d2 Gerrit-Change-Number: 23064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:14:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:14:21 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E78-8c90-dirty_=E2=86=92_1=2E3=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23065 ) Change subject: Bump version: 1.2.0.78-8c90-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.78-8c90-dirty ? 1.3.0 Change-Id: Iffdee17c1f70f472fb9cfe722b77967c2634ea37 --- M TODO-RELEASE M configure.ac M contrib/osmo-hlr.spec.in M debian/changelog M debian/control M src/gsupclient/Makefile.am 6 files changed, 115 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/65/23065/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 810a346..cbfda24 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-hlr update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include diff --git a/configure.ac b/configure.ac index 748ca56..c496409 100644 --- a/configure.ac +++ b/configure.ac @@ -41,11 +41,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/contrib/osmo-hlr.spec.in b/contrib/osmo-hlr.spec.in index bd1b278..c4029be 100644 --- a/contrib/osmo-hlr.spec.in +++ b/contrib/osmo-hlr.spec.in @@ -29,11 +29,11 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(talloc) >= 2.0.1 # only needed for populate_hlr_db.pl diff --git a/debian/changelog b/debian/changelog index 1b02a20..0ac618d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,103 @@ +osmo-hlr (1.3.0) unstable; urgency=medium + + [ Alexander Couzens ] + * hlr: respect the num_auth_vectors requested + * hlr: remove unused internal USSD list + + [ Oliver Smith ] + * add libosmo-mslookup abstract client + * add mDNS lookup method to libosmo-mslookup + * Makefile.am: fix pkgconfig_DATA + * add mDNS lookup method to libosmo-mslookup (#2) + * contrib/dgsm/ add example esme and dialplan + * mslookup_client.c: fix dereferencing null pointer + * mdns_msg.c: always call va_end + * mslookup_client_mdns.c: fix dereferencing null + * osmo-mslookup-client.c: fix dereferencing null + * osmo-mslookup-client: fix dereferencing null + * mdns_sock.c: fix resource leak of sock + * mdns_rfc.c: fix possible access of uninit. mem + * mslookup_client_mdns_test: disable by default + * mslookup_client_mdns_test: no automatic skip + * Cosmetic: mention OS#4491 in location cancel code + * hlr_vty_subscr: prettier output for last LU seen + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Neels Hofmeyr ] + * add osmo-mslookup-client program + * add osmo-mslookup-client program (#2) + * fix missing braces in LOGP_GSUP_FWD + * gsup_client.c: fix deprecation for client create func + * 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name + * 2/2: wrap ipa_name in osmo_cni_peer_id with type enum and union + * gsup client: add up_down_cb(), add osmo_gsup_client_create3() + * db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy + * enlarge the GSUP message headroom + * test_nodes.vty: remove cruft + * D-GSM 1/n: add mslookup server in osmo-hlr + * D-GSM 2/n: implement mDNS method of mslookup server + * D-GSM 3/n: implement roaming by mslookup in osmo-hlr + * gsup_server: send routing error back to the correct peer + * adoc: add D-GSM chapter to osmohlr-usermanual + * drop error log for when a subscriber does not exist + * vty: show subscriber: change format of 'last LU seen' + * vty: show subscriber: show lu d,h,m,s ago, not just seconds + * auc3g: officially wrap IND around IND_bitlen space + * make osmo_cni_peer_id_cmp() NULL safe + * osmo_gsup_req_new(): require from_peer != NULL + * gsup_server.c: properly handle negative rc from osmo_gsup_conn_ccm_get() + * osmo_mslookup_server_mdns_rx(): handle read() rc == 0 + * hlr_subscr_nam(): fix condition to fix nam=false notifications + * esme_dgsm.py: add --always-fail option for debugging SMPP + * osmo-mslookup-client: fix segfault for respond_error() caller + * manual: describe subscriber import by SQL + + [ Harald Welte ] + * Revert "add osmo-mslookup-client program" + * Revert "add mDNS lookup method to libosmo-mslookup" + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * support the XOR algorithm for UMTS AKA + * auc_test.c: Add some comments on what the test cases actually do + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Vadim Yanitskiy ] + * db: fix possible SQLite3 allocated memory leak in db_open() + * gsup_server: fix typo: s/omso_gsup_message/osmo_gsup_message/ + * debian/control: change maintainer to the Osmocom team / mailing list + * cosmetic: fix spelling in logging message: existAnt -> existEnt + * doc/manuals: fix s/There/The/ in 'USSD Configuration' + * doc/manuals: re-organize description of internal USSD handlers + * USSD: fix handle_ussd(): do not free() unconditionally + * USSD: add special 'idle' handler to IUSE for testing + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Philipp Maier ] + * doc: do not use loglevel info for log category ss + + [ Pau Espin Pedrol ] + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * Set TCP NODELAY sockopt to GSUP cli and srv connections + * contrib/jenkins: Enable parallel make in make distcheck + * .gitignore: Ignore new autofoo tmp files + * tests: Replace deprecated API log_set_print_filename + + [ Keith ] + * osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" + * Correct vty inline help for show subscriber + * Add vty command to show summary of all or filtered subscribers + * Fix Coverity Warnings + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:13:53 +0100 + osmo-hlr (1.2.0) unstable; urgency=medium [ Ruben Undheim ] diff --git a/debian/control b/debian/control index 68d789e..104799b 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,12 @@ dh-systemd (>= 1.5), autotools-dev, python3-minimal, - libosmocore-dev (>= 1.4.0), - libosmo-abis-dev, - libosmo-netif-dev, + libosmocore-dev (>= 1.5.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), libsqlite3-dev, sqlite3, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-hlr Vcs-Git: git://git.osmocom.org/osmo-hlr diff --git a/src/gsupclient/Makefile.am b/src/gsupclient/Makefile.am index 3412c40..a627ccc 100644 --- a/src/gsupclient/Makefile.am +++ b/src/gsupclient/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include \ $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iffdee17c1f70f472fb9cfe722b77967c2634ea37 Gerrit-Change-Number: 23065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:26:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:26:32 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E78-8c90-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23065 ) Change subject: Bump version: 1.2.0.78-8c90-dirty ? 1.3.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iffdee17c1f70f472fb9cfe722b77967c2634ea37 Gerrit-Change-Number: 23065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 17:26:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:26:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:26:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E78-8c90-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23065 ) Change subject: Bump version: 1.2.0.78-8c90-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.78-8c90-dirty ? 1.3.0 Change-Id: Iffdee17c1f70f472fb9cfe722b77967c2634ea37 --- M TODO-RELEASE M configure.ac M contrib/osmo-hlr.spec.in M debian/changelog M debian/control M src/gsupclient/Makefile.am 6 files changed, 115 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 810a346..cbfda24 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -osmo-hlr update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include diff --git a/configure.ac b/configure.ac index 748ca56..c496409 100644 --- a/configure.ac +++ b/configure.ac @@ -41,11 +41,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/contrib/osmo-hlr.spec.in b/contrib/osmo-hlr.spec.in index bd1b278..c4029be 100644 --- a/contrib/osmo-hlr.spec.in +++ b/contrib/osmo-hlr.spec.in @@ -29,11 +29,11 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(talloc) >= 2.0.1 # only needed for populate_hlr_db.pl diff --git a/debian/changelog b/debian/changelog index 1b02a20..0ac618d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,103 @@ +osmo-hlr (1.3.0) unstable; urgency=medium + + [ Alexander Couzens ] + * hlr: respect the num_auth_vectors requested + * hlr: remove unused internal USSD list + + [ Oliver Smith ] + * add libosmo-mslookup abstract client + * add mDNS lookup method to libosmo-mslookup + * Makefile.am: fix pkgconfig_DATA + * add mDNS lookup method to libosmo-mslookup (#2) + * contrib/dgsm/ add example esme and dialplan + * mslookup_client.c: fix dereferencing null pointer + * mdns_msg.c: always call va_end + * mslookup_client_mdns.c: fix dereferencing null + * osmo-mslookup-client.c: fix dereferencing null + * osmo-mslookup-client: fix dereferencing null + * mdns_sock.c: fix resource leak of sock + * mdns_rfc.c: fix possible access of uninit. mem + * mslookup_client_mdns_test: disable by default + * mslookup_client_mdns_test: no automatic skip + * Cosmetic: mention OS#4491 in location cancel code + * hlr_vty_subscr: prettier output for last LU seen + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Neels Hofmeyr ] + * add osmo-mslookup-client program + * add osmo-mslookup-client program (#2) + * fix missing braces in LOGP_GSUP_FWD + * gsup_client.c: fix deprecation for client create func + * 1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name + * 2/2: wrap ipa_name in osmo_cni_peer_id with type enum and union + * gsup client: add up_down_cb(), add osmo_gsup_client_create3() + * db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy + * enlarge the GSUP message headroom + * test_nodes.vty: remove cruft + * D-GSM 1/n: add mslookup server in osmo-hlr + * D-GSM 2/n: implement mDNS method of mslookup server + * D-GSM 3/n: implement roaming by mslookup in osmo-hlr + * gsup_server: send routing error back to the correct peer + * adoc: add D-GSM chapter to osmohlr-usermanual + * drop error log for when a subscriber does not exist + * vty: show subscriber: change format of 'last LU seen' + * vty: show subscriber: show lu d,h,m,s ago, not just seconds + * auc3g: officially wrap IND around IND_bitlen space + * make osmo_cni_peer_id_cmp() NULL safe + * osmo_gsup_req_new(): require from_peer != NULL + * gsup_server.c: properly handle negative rc from osmo_gsup_conn_ccm_get() + * osmo_mslookup_server_mdns_rx(): handle read() rc == 0 + * hlr_subscr_nam(): fix condition to fix nam=false notifications + * esme_dgsm.py: add --always-fail option for debugging SMPP + * osmo-mslookup-client: fix segfault for respond_error() caller + * manual: describe subscriber import by SQL + + [ Harald Welte ] + * Revert "add osmo-mslookup-client program" + * Revert "add mDNS lookup method to libosmo-mslookup" + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * support the XOR algorithm for UMTS AKA + * auc_test.c: Add some comments on what the test cases actually do + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Vadim Yanitskiy ] + * db: fix possible SQLite3 allocated memory leak in db_open() + * gsup_server: fix typo: s/omso_gsup_message/osmo_gsup_message/ + * debian/control: change maintainer to the Osmocom team / mailing list + * cosmetic: fix spelling in logging message: existAnt -> existEnt + * doc/manuals: fix s/There/The/ in 'USSD Configuration' + * doc/manuals: re-organize description of internal USSD handlers + * USSD: fix handle_ussd(): do not free() unconditionally + * USSD: add special 'idle' handler to IUSE for testing + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Philipp Maier ] + * doc: do not use loglevel info for log category ss + + [ Pau Espin Pedrol ] + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * Set TCP NODELAY sockopt to GSUP cli and srv connections + * contrib/jenkins: Enable parallel make in make distcheck + * .gitignore: Ignore new autofoo tmp files + * tests: Replace deprecated API log_set_print_filename + + [ Keith ] + * osmo-hlr-db-tool: Make import from osmo-nitb less "lossy" + * Correct vty inline help for show subscriber + * Add vty command to show summary of all or filtered subscribers + * Fix Coverity Warnings + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:13:53 +0100 + osmo-hlr (1.2.0) unstable; urgency=medium [ Ruben Undheim ] diff --git a/debian/control b/debian/control index 68d789e..104799b 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,12 @@ dh-systemd (>= 1.5), autotools-dev, python3-minimal, - libosmocore-dev (>= 1.4.0), - libosmo-abis-dev, - libosmo-netif-dev, + libosmocore-dev (>= 1.5.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), libsqlite3-dev, sqlite3, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.6 Vcs-Browser: http://cgit.osmocom.org/osmo-hlr Vcs-Git: git://git.osmocom.org/osmo-hlr diff --git a/src/gsupclient/Makefile.am b/src/gsupclient/Makefile.am index 3412c40..a627ccc 100644 --- a/src/gsupclient/Makefile.am +++ b/src/gsupclient/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include \ $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iffdee17c1f70f472fb9cfe722b77967c2634ea37 Gerrit-Change-Number: 23065 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:28:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 17:28:33 +0000 Subject: Change in osmo-iuh[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23061 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If07b00e928fbecc596a7f75fc55e811bd9199b72 Gerrit-Change-Number: 23061 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 17:28:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:28:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 17:28:35 +0000 Subject: Change in osmo-iuh[master]: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23061 ) Change subject: main: add --vty-ref-mode, use vty_dump_xml_ref_mode() ...................................................................... main: add --vty-ref-mode, use vty_dump_xml_ref_mode() Change-Id: If07b00e928fbecc596a7f75fc55e811bd9199b72 Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40 Relates: OS#5041 --- M src/hnbgw.c 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index a6e0d29..5e01b63 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -415,12 +415,42 @@ printf(" -T --timestamp Prefix every log line with a timestamp.\n"); printf(" -V --version Print the version of OsmoHNBGW.\n"); printf(" -e --log-level number Set a global loglevel.\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } } static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; + static int long_option = 0; static struct option long_options[] = { {"help", 0, 0, 'h'}, {"debug", 1, 0, 'd'}, @@ -430,6 +460,8 @@ {"timestamp", 0, 0, 'T'}, {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; @@ -439,6 +471,8 @@ break; switch (c) { + case 0: + handle_long_options(argv[0], long_option); case 'h': print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If07b00e928fbecc596a7f75fc55e811bd9199b72 Gerrit-Change-Number: 23061 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:29:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:29:35 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E7=2E0=2E138-ace0b-dirty_=E2=86=92_1=2E8=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23066 ) Change subject: Bump version: 1.7.0.138-ace0b-dirty ? 1.8.0 ...................................................................... Bump version: 1.7.0.138-ace0b-dirty ? 1.8.0 Change-Id: I64ff22193ab2a95a9a7d66e9957a875d096e23de --- M TODO-RELEASE M configure.ac M contrib/osmo-mgw.spec.in M debian/changelog M debian/control R debian/libosmo-mgcp-client8.install M src/libosmo-mgcp-client/Makefile.am 7 files changed, 188 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/66/23066/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 8c7cd96..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,5 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -osmo-mgw update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include -libosmo-mgcp-client mgcp_response, mgcp_conn_peer struct size change, breaks ABI diff --git a/configure.ac b/configure.ac index 85b46eb..64e2c04 100644 --- a/configure.ac +++ b/configure.ac @@ -49,13 +49,13 @@ AC_SUBST(LIBRARY_DLSYM) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.1.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in index b08a598..efb166a 100644 --- a/contrib/osmo-mgw.spec.in +++ b/contrib/osmo-mgw.spec.in @@ -29,30 +29,30 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 -BuildRequires: pkgconfig(libosmocoding) >= 1.0.0 -BuildRequires: pkgconfig(libosmoabis) >= 1.0.0 -BuildRequires: pkgconfig(libosmotrau) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmocoding) >= 1.5.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmotrau) >= 1.1.0 %{?systemd_requires} %description OsmoMGW is Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks. -%package -n libosmo-mgcp-client6 +%package -n libosmo-mgcp-client8 Summary: Osmocom's Media Gateway Control Protocol client library Group: System/Libraries -%description -n libosmo-mgcp-client6 +%description -n libosmo-mgcp-client8 Osmocom's Media Gateway Control Protocol client library. %package -n libosmo-mgcp-client-devel Summary: Development files for Osmocom's Media Gateway Control Protocol client library Group: Development/Libraries/C and C++ -Requires: libosmo-mgcp-client6 = %{version} +Requires: libosmo-mgcp-client8 = %{version} %description -n libosmo-mgcp-client-devel Osmocom's Media Gateway Control Protocol client librarary. @@ -90,8 +90,8 @@ %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) -%post -n libosmo-mgcp-client6 -p /sbin/ldconfig -%postun -n libosmo-mgcp-client6 -p /sbin/ldconfig +%post -n libosmo-mgcp-client8 -p /sbin/ldconfig +%postun -n libosmo-mgcp-client8 -p /sbin/ldconfig %if 0%{?suse_version} %preun @@ -119,7 +119,7 @@ %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-mgw.cfg -%files -n libosmo-mgcp-client6 +%files -n libosmo-mgcp-client8 %{_libdir}/libosmo-mgcp-client.so.6* %files -n libosmo-mgcp-client-devel diff --git a/debian/changelog b/debian/changelog index fe31733..9f04449 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,163 @@ +osmo-mgw (1.8.0) unstable; urgency=medium + + [ Harald Welte ] + * Fix number of endpoints of default trunk + * Add CTRL interface to osmo-mgw + * Update per-trunk global packet/byte counters in real-time + * remove accidential TODO-RELEASE entry + * mgcp_protocol: Avoid code duplication between virtual + other trunks + * osmo-mgw.spec.in: Use %config(noreplace) to retain current config file + * mgcp_client_init(): consider "talloc returns NULL" case + * mgcp_client_pending_add(): Consider "talloc returns NULL" case + * libosmo-mgcp-client: fix memleak in case if no response is received + * debian/control + SPEC: Add missing build dependency to libosmo-abis + * osmo-mgw.spec.in: Fix dependency to libosmoabis + * osmo-mgw.spec.in: Add missing dependency to libosmotrau + * Add example osmo-mgw configuration file for Abis/E1 + * use osmo_fd_setup() whenever applicable + + [ Neels Hofmeyr ] + * fix vty dump_trunk: start from zero, do not omit first CONN + * allow larger MGCP client wqueue: 10 -> 1024 + * add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout + * manuals: generate vty reference xml at build time + * refactor: use msgb to receive, pass and send RTP packets + * change timer T2427001 to X2427 + + [ Philipp Maier ] + * doc: do not bind osmo-mgw to random ip-address + * cosmetic: remove excess newlines + * mgcp: remove unused callback pointer + * mgcp: find better locations for LOGPCONN and LOGPENDP + * vty: fix unreachable code (error msg on trunk alloc fail) + * mgcp_vty: fix indentation + * osmo-mgw: rename struct mgcp_trunk_config and symbol tcfg + * mgcp_vty: fix indentation in VTY config write + * osmo-mgw: refactor endpoint and trunk handling + * mgcp_trunk: remove audio_name and audio_payload + * ratectr: move rate counter definitions into mgcp_ratectr.h + * cosmetic: fix doxygen + * cosmetic: fix doxygen + * cosmetic: fix doxygen for mgcp_cleanup_rtp_bridge_cb() + * trunk: get rid of virt_trunk pointer + * cosmetic: remove excess space + * endp: move endpoint name generation into mgcp_endp.c + * endp: add name generator function for E1 endpoints + * mgcp_client: add docstring for mgcp_client_rtpbridge_wildcard() + * mgcp_trunk: fix docstring for mgcp_trunk_alloc() + * mgcp_osmux: remove unused define constants + * mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h + * mgcp_trunk: use enum type for trunk type variable + * trunk: parse E1 trunk number + * endp: add typeset for e1-endpoints + * mgcp_conn: move struct mgcp_conn mgcp_conn.h + * mgcp_internal: remove forward declaration struct mgcp_endpoint_type + * endp: add E1 endpoint interlocking + * endp: require domain name also for E1 endpoints + * mgcp_trunk: pick trunk by number and type + * mgcp_client: add function to generate e1-endpoint names + * mgcp_endp: use define constant to define max number of E1 subslots + * mgcp_endp.c: cosmetic: fix sourcecode formatting + * mgcp_trunk: remove double check + * mgcp_test: do not access endpoint array elements directly + * mgcp_vty: fix endpoint number configuration + * mgcp_test: remove trunk2 from unit-test + * mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array + * mgcp_protocol: remove unused variable + * mgcp_e1: finish E1 support, add E1 support from libosmoabis + * get rid of mgcp_internal.h + * mgcp_ratectr: fix comments in header file + * mgcp_e1: use return value of e1inp_line_update() + * mgcp_protocol: log when endpoint is unavailable + * cosmetic: add missing new-line + * mgcp_trunk: drop "trunk 0" limitation + * mgcp_e1: make E1 ts initalization more debugable + * mgcp_e1: remove unused struct member trunk->e1.line + * mgcp_endp: use NUM_E1_TS from e1_input.h + * mgcp_trunk: increase default number of virtual endpoints + * cosmetic: mgcp_client_fsm: change error message. + * mgcp_vty: remove remains of loopback functionality + * mgcp_vty: deprecate bind early command + * mgcp_e1: do not expose function mgcp_e1_init() + * mgcp_vty: add user attributes to configuration commands + * overview: update section limitations. + * overview: fix graph "OsmoMGW used with OsmoBSC" + * overview: fix graph "OsmoMGW used with OsmoMSC" + * overview: add graph to show E1 integration + * configuration: remove hint towards trunk 0 limit + * configuration: drop note about lackin E1 support + * configuration: add note that changes to trunks need a restart + * mgcp_vty: fix config write for trunk 0 + * mgcp_vty: add missing VTY commands for E1 trunks + * mgcp_trunk: get rid of magic numbers for E1 slots + * configuration: add section about E1 trunks + * usermanual: add chapter about mgcp endpoints + * mgcp_client: get rid of magic numbers for E1 slots + + [ Eric ] + * tests: dlopen does not imply availability of dlsym.. + * configure.ac: fix libtool issue with clang and sanitizer + + [ Alexander Chemeris ] + * vty: Prepend VTY output of counters for better visual separation. + * counters: Implement more useful counters. + * mgcp_network: Fix a typo in the comment bahviour -> behaviour + * rtp_bridge: Demote a chatty ERROR log message to DEBUG level. + + [ Pau Espin Pedrol ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Support setting rt-prio and cpu-affinity mask through VTY + * cosmetic: Rename main talloc ctx + * mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation + * mgcp-client: Fix trailing whitespace in mgcp_client_fsm.h + * mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format + * mgcp_client: Allow submitting and parsing IPv6 addr in SDP + * mgcp_client: Allow setting IPv6 addresses + * mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible + * mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands + * mgcp_client: Deprecate unused IPv4-only API + * mgcp_client: copy back Connection Information from MDCX ACK + * mgw: Fix mgcp_rtp_end field description comment + * mgw: Initial IPv6 support + * mgw: Introduce VTY cmd 'rtp bind-ip-v6' command + * mgw: Find and store RTP conn local_addr once during CRCX handling + * mgw: Announce and rebind new local address if change required during MDCX + * mgw: osmux: Avoid sending packets on recvonly connection + * mgw: Release endpoint after last conn times out + * mgw: osmux: Fix conn watchdog timeout not updated + * mgw: Don't be case-sensitive when parsing X-Osmo-IGN param + * cosmetic: Fix typo in comment + * mgw: Avoid logging notice message each time we receive nt param in LCO + * mgw: Fix return value documentation for API mgcp_verify_call_id + * cosmetic: Fix typo in comment + * contrib/jenkins: Enable parallel make in make distcheck + * .gitignore: Ignore new autofoo tmp files + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Vadim Yanitskiy ] + * libosmo-mgcp-client: fix use-after-free in mgcp_client_tx() + * libosmo-mgcp-client: fix use-after-free in mgcp_msg_gen() + * libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() + * libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() + * libosmo-mgcp: always check result of msgb_printf() in add_fmtp() + * libosmo-mgcp-client: mgcp_client_tx(): return rc on error + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * fixup mgcp_trunk: increase default number of virtual endpoints + + [ Alexander Couzens ] + * configure.ac: require libosmoabis + libosmotrau >= 1.0.0 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:28:45 +0100 + osmo-mgw (1.7.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 83860df..8246708 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,10 @@ dh-autoreconf, pkg-config, autotools-dev, - libosmocore-dev (>= 1.4.0), - libosmo-netif-dev, - libosmo-abis-dev, - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-abis-dev (>= 1.1.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-mgw.git Vcs-Browser: https://git.osmocom.org/osmo-mgw/ @@ -21,7 +21,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client6 +Package: libosmo-mgcp-client8 Section: libs Architecture: any Multi-Arch: same @@ -33,7 +33,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client6 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client8 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities Package: osmo-mgw-doc diff --git a/debian/libosmo-mgcp-client6.install b/debian/libosmo-mgcp-client8.install similarity index 100% rename from debian/libosmo-mgcp-client6.install rename to debian/libosmo-mgcp-client8.install diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index ca2695a..4f17e53 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -21,7 +21,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=7:0:1 +MGCP_CLIENT_LIBVERSION=8:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I64ff22193ab2a95a9a7d66e9957a875d096e23de Gerrit-Change-Number: 23066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:41:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:41:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E7=2E0=2E138-ace0b-dirty_=E2=86=92_1=2E8=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23066 ) Change subject: Bump version: 1.7.0.138-ace0b-dirty ? 1.8.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I64ff22193ab2a95a9a7d66e9957a875d096e23de Gerrit-Change-Number: 23066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 17:41:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:41:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:41:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E7=2E0=2E138-ace0b-dirty_=E2=86=92_1=2E8=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23066 ) Change subject: Bump version: 1.7.0.138-ace0b-dirty ? 1.8.0 ...................................................................... Bump version: 1.7.0.138-ace0b-dirty ? 1.8.0 Change-Id: I64ff22193ab2a95a9a7d66e9957a875d096e23de --- M TODO-RELEASE M configure.ac M contrib/osmo-mgw.spec.in M debian/changelog M debian/control R debian/libosmo-mgcp-client8.install M src/libosmo-mgcp-client/Makefile.am 7 files changed, 188 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 8c7cd96..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,5 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -osmo-mgw update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include -libosmo-mgcp-client mgcp_response, mgcp_conn_peer struct size change, breaks ABI diff --git a/configure.ac b/configure.ac index 85b46eb..64e2c04 100644 --- a/configure.ac +++ b/configure.ac @@ -49,13 +49,13 @@ AC_SUBST(LIBRARY_DLSYM) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.1.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in index b08a598..efb166a 100644 --- a/contrib/osmo-mgw.spec.in +++ b/contrib/osmo-mgw.spec.in @@ -29,30 +29,30 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.0.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.0.0 -BuildRequires: pkgconfig(libosmovty) >= 1.0.0 -BuildRequires: pkgconfig(libosmocoding) >= 1.0.0 -BuildRequires: pkgconfig(libosmoabis) >= 1.0.0 -BuildRequires: pkgconfig(libosmotrau) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmocoding) >= 1.5.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmotrau) >= 1.1.0 %{?systemd_requires} %description OsmoMGW is Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks. -%package -n libosmo-mgcp-client6 +%package -n libosmo-mgcp-client8 Summary: Osmocom's Media Gateway Control Protocol client library Group: System/Libraries -%description -n libosmo-mgcp-client6 +%description -n libosmo-mgcp-client8 Osmocom's Media Gateway Control Protocol client library. %package -n libosmo-mgcp-client-devel Summary: Development files for Osmocom's Media Gateway Control Protocol client library Group: Development/Libraries/C and C++ -Requires: libosmo-mgcp-client6 = %{version} +Requires: libosmo-mgcp-client8 = %{version} %description -n libosmo-mgcp-client-devel Osmocom's Media Gateway Control Protocol client librarary. @@ -90,8 +90,8 @@ %check make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) -%post -n libosmo-mgcp-client6 -p /sbin/ldconfig -%postun -n libosmo-mgcp-client6 -p /sbin/ldconfig +%post -n libosmo-mgcp-client8 -p /sbin/ldconfig +%postun -n libosmo-mgcp-client8 -p /sbin/ldconfig %if 0%{?suse_version} %preun @@ -119,7 +119,7 @@ %dir %{_sysconfdir}/osmocom %config(noreplace) %{_sysconfdir}/osmocom/osmo-mgw.cfg -%files -n libosmo-mgcp-client6 +%files -n libosmo-mgcp-client8 %{_libdir}/libosmo-mgcp-client.so.6* %files -n libosmo-mgcp-client-devel diff --git a/debian/changelog b/debian/changelog index fe31733..9f04449 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,163 @@ +osmo-mgw (1.8.0) unstable; urgency=medium + + [ Harald Welte ] + * Fix number of endpoints of default trunk + * Add CTRL interface to osmo-mgw + * Update per-trunk global packet/byte counters in real-time + * remove accidential TODO-RELEASE entry + * mgcp_protocol: Avoid code duplication between virtual + other trunks + * osmo-mgw.spec.in: Use %config(noreplace) to retain current config file + * mgcp_client_init(): consider "talloc returns NULL" case + * mgcp_client_pending_add(): Consider "talloc returns NULL" case + * libosmo-mgcp-client: fix memleak in case if no response is received + * debian/control + SPEC: Add missing build dependency to libosmo-abis + * osmo-mgw.spec.in: Fix dependency to libosmoabis + * osmo-mgw.spec.in: Add missing dependency to libosmotrau + * Add example osmo-mgw configuration file for Abis/E1 + * use osmo_fd_setup() whenever applicable + + [ Neels Hofmeyr ] + * fix vty dump_trunk: start from zero, do not omit first CONN + * allow larger MGCP client wqueue: 10 -> 1024 + * add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout + * manuals: generate vty reference xml at build time + * refactor: use msgb to receive, pass and send RTP packets + * change timer T2427001 to X2427 + + [ Philipp Maier ] + * doc: do not bind osmo-mgw to random ip-address + * cosmetic: remove excess newlines + * mgcp: remove unused callback pointer + * mgcp: find better locations for LOGPCONN and LOGPENDP + * vty: fix unreachable code (error msg on trunk alloc fail) + * mgcp_vty: fix indentation + * osmo-mgw: rename struct mgcp_trunk_config and symbol tcfg + * mgcp_vty: fix indentation in VTY config write + * osmo-mgw: refactor endpoint and trunk handling + * mgcp_trunk: remove audio_name and audio_payload + * ratectr: move rate counter definitions into mgcp_ratectr.h + * cosmetic: fix doxygen + * cosmetic: fix doxygen + * cosmetic: fix doxygen for mgcp_cleanup_rtp_bridge_cb() + * trunk: get rid of virt_trunk pointer + * cosmetic: remove excess space + * endp: move endpoint name generation into mgcp_endp.c + * endp: add name generator function for E1 endpoints + * mgcp_client: add docstring for mgcp_client_rtpbridge_wildcard() + * mgcp_trunk: fix docstring for mgcp_trunk_alloc() + * mgcp_osmux: remove unused define constants + * mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h + * mgcp_trunk: use enum type for trunk type variable + * trunk: parse E1 trunk number + * endp: add typeset for e1-endpoints + * mgcp_conn: move struct mgcp_conn mgcp_conn.h + * mgcp_internal: remove forward declaration struct mgcp_endpoint_type + * endp: add E1 endpoint interlocking + * endp: require domain name also for E1 endpoints + * mgcp_trunk: pick trunk by number and type + * mgcp_client: add function to generate e1-endpoint names + * mgcp_endp: use define constant to define max number of E1 subslots + * mgcp_endp.c: cosmetic: fix sourcecode formatting + * mgcp_trunk: remove double check + * mgcp_test: do not access endpoint array elements directly + * mgcp_vty: fix endpoint number configuration + * mgcp_test: remove trunk2 from unit-test + * mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array + * mgcp_protocol: remove unused variable + * mgcp_e1: finish E1 support, add E1 support from libosmoabis + * get rid of mgcp_internal.h + * mgcp_ratectr: fix comments in header file + * mgcp_e1: use return value of e1inp_line_update() + * mgcp_protocol: log when endpoint is unavailable + * cosmetic: add missing new-line + * mgcp_trunk: drop "trunk 0" limitation + * mgcp_e1: make E1 ts initalization more debugable + * mgcp_e1: remove unused struct member trunk->e1.line + * mgcp_endp: use NUM_E1_TS from e1_input.h + * mgcp_trunk: increase default number of virtual endpoints + * cosmetic: mgcp_client_fsm: change error message. + * mgcp_vty: remove remains of loopback functionality + * mgcp_vty: deprecate bind early command + * mgcp_e1: do not expose function mgcp_e1_init() + * mgcp_vty: add user attributes to configuration commands + * overview: update section limitations. + * overview: fix graph "OsmoMGW used with OsmoBSC" + * overview: fix graph "OsmoMGW used with OsmoMSC" + * overview: add graph to show E1 integration + * configuration: remove hint towards trunk 0 limit + * configuration: drop note about lackin E1 support + * configuration: add note that changes to trunks need a restart + * mgcp_vty: fix config write for trunk 0 + * mgcp_vty: add missing VTY commands for E1 trunks + * mgcp_trunk: get rid of magic numbers for E1 slots + * configuration: add section about E1 trunks + * usermanual: add chapter about mgcp endpoints + * mgcp_client: get rid of magic numbers for E1 slots + + [ Eric ] + * tests: dlopen does not imply availability of dlsym.. + * configure.ac: fix libtool issue with clang and sanitizer + + [ Alexander Chemeris ] + * vty: Prepend VTY output of counters for better visual separation. + * counters: Implement more useful counters. + * mgcp_network: Fix a typo in the comment bahviour -> behaviour + * rtp_bridge: Demote a chatty ERROR log message to DEBUG level. + + [ Pau Espin Pedrol ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Support setting rt-prio and cpu-affinity mask through VTY + * cosmetic: Rename main talloc ctx + * mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation + * mgcp-client: Fix trailing whitespace in mgcp_client_fsm.h + * mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format + * mgcp_client: Allow submitting and parsing IPv6 addr in SDP + * mgcp_client: Allow setting IPv6 addresses + * mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible + * mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands + * mgcp_client: Deprecate unused IPv4-only API + * mgcp_client: copy back Connection Information from MDCX ACK + * mgw: Fix mgcp_rtp_end field description comment + * mgw: Initial IPv6 support + * mgw: Introduce VTY cmd 'rtp bind-ip-v6' command + * mgw: Find and store RTP conn local_addr once during CRCX handling + * mgw: Announce and rebind new local address if change required during MDCX + * mgw: osmux: Avoid sending packets on recvonly connection + * mgw: Release endpoint after last conn times out + * mgw: osmux: Fix conn watchdog timeout not updated + * mgw: Don't be case-sensitive when parsing X-Osmo-IGN param + * cosmetic: Fix typo in comment + * mgw: Avoid logging notice message each time we receive nt param in LCO + * mgw: Fix return value documentation for API mgcp_verify_call_id + * cosmetic: Fix typo in comment + * contrib/jenkins: Enable parallel make in make distcheck + * .gitignore: Ignore new autofoo tmp files + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Vadim Yanitskiy ] + * libosmo-mgcp-client: fix use-after-free in mgcp_client_tx() + * libosmo-mgcp-client: fix use-after-free in mgcp_msg_gen() + * libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name() + * libosmo-mgcp: fix unused extra argument to printf() in add_fmtp() + * libosmo-mgcp: always check result of msgb_printf() in add_fmtp() + * libosmo-mgcp-client: mgcp_client_tx(): return rc on error + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * fixup mgcp_trunk: increase default number of virtual endpoints + + [ Alexander Couzens ] + * configure.ac: require libosmoabis + libosmotrau >= 1.0.0 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:28:45 +0100 + osmo-mgw (1.7.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 83860df..8246708 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,10 @@ dh-autoreconf, pkg-config, autotools-dev, - libosmocore-dev (>= 1.4.0), - libosmo-netif-dev, - libosmo-abis-dev, - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-abis-dev (>= 1.1.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-mgw.git Vcs-Browser: https://git.osmocom.org/osmo-mgw/ @@ -21,7 +21,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client6 +Package: libosmo-mgcp-client8 Section: libs Architecture: any Multi-Arch: same @@ -33,7 +33,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client6 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client8 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities Package: osmo-mgw-doc diff --git a/debian/libosmo-mgcp-client6.install b/debian/libosmo-mgcp-client8.install similarity index 100% rename from debian/libosmo-mgcp-client6.install rename to debian/libosmo-mgcp-client8.install diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index ca2695a..4f17e53 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -21,7 +21,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=7:0:1 +MGCP_CLIENT_LIBVERSION=8:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I64ff22193ab2a95a9a7d66e9957a875d096e23de Gerrit-Change-Number: 23066 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:43:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 17:43:35 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E558-f5d07-dirty_=E2=86=92_1=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23067 ) Change subject: Bump version: 1.6.0.558-f5d07-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.558-f5d07-dirty ? 1.7.0 Change-Id: I0afcb06f8a7466f98cac26ff939a3813d4add1cc --- M TODO-RELEASE M configure.ac M contrib/osmo-bsc.spec.in M debian/changelog M debian/control 5 files changed, 614 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/23067/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 4760012..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -osmo-bsc Mobile Identity Coding OsmoBSC is stricter in rejecting invalid coding of Mobile Identity IEs -libosmocore >1.4.0 (1.4.1?) need BSSMAP-LE, BSSLAP, GAD coding, osmo_gsm48_si* diff --git a/configure.ac b/configure.ac index 343c031..762b814 100644 --- a/configure.ac +++ b/configure.ac @@ -51,15 +51,15 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.8.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 8293c51..6f3b2bd 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -31,16 +31,16 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.5.0 -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.8.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(talloc) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index b65bc0d..8fc8b76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,591 @@ +osmo-bsc (1.7.0) unstable; urgency=medium + + [ Harald Welte ] + * Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal + * OM2000: Add some more message types and IEs we now understand + * remove 'NAT' log category + * handorer.h: Fix compilation with gcc-10 + * gsm_data.h: Comment the 'nokia' BTS fields + * bts_nokia_site: Fix LAPD segfault during reset procedure + * [cosmetic] system_information: Values are not guesses; more comments + * bs11_config: Print "Not Equipped" for MBCCU (TRX) that don't exist + * Count RSL DELETE INDICATION received from BTS + * system_information: Set BSS_PAGING_COORDINATION in SI13 for osmo-bts + * vty/bts_resend_cmd: Use gsm_bts_set_system_infos() to increment changemark + * osmo-bsc.spec.in: Use %config(noreplace) to retain current config file + * abis_nm: Avoid various "Unhandled message" errors on BS-11 startup + * Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state + * Don't print 'bogus channel load sample' message if total == 0 + * bts_nokia_site: Clean up logging + * Add example configuration files for E1 BTS + * remove examples/osmo-bsc/ericsson/osmo-bsc.cfg + * osmo-bsc.spec.in: Package E1 config files + * osmo-bsc.spec.in: Add missing directories to package + * debian: Package E1 configuration file examples + * lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND + * Add example config files for Ericsson DUG20 based BTS + * acc.c: Don't use C99 constructs, this breaks builds on Debian 8 + * BS-11: Fix "CONNECT TERRESTRIAL TRAFFIC" + * Implement support for receiving BSSMAP CommonID from MSC + * osmo_bsc_sigtran.c: Remove unused #defines + * use osmo_fd_setup() whenever applicable + * debian/control: Recommend installation of osmo-mgw + * Use osmo_fd_*_{disable,enable} + * fix some size-t format string characters + * update aoip-mgw-options document with reality of 2020 + * abis_om2000: Force TRX NM state to UNLOCKED once TRX is up + * osmobsc-usermanual: Add Chapter with AoIP message flow examples + * OM2K: Permit transition from WAIT_CONF_RES -> WAIT_ENABLE_ACCEPT + * OM2K: Skip the entire CON MO if there are no connection groups + * Add a bts_model->bts_init() and trx_init() call-back function + * abis_om2000: make om2k_mo_name() an exported function + * [cosmetic] abis_om2000: Re-format to use longer lines + * abis_om2000: Mark om2k_mo_fsm_start() as static + * abis_om2000: keep OM2K FSMs around, don't terminate + * om2000: Add "show bts 0 om2k-mo" command + * abis_om2000: Handle DP object in get_om2k_mo() + * smscb: Avoid scheduler array overflow + * smscb: Fix adding of SMSCB messages when no message with lower period exists + * select_best_cipher(): Prefer A5/1 over A5/2 + * BS-11: Send proprietary MRPCI message after assignment + HO complete + * hide the "smscb-command" vty command; people should use osmo-cbc + * CBSP: document rate counters and their mapping to basic/extended CBCH + + [ Philipp Maier ] + * bsc_main: use higher default loglevels. + * lchan_rtp_fsm: fix out_state_mask + * vty: check with is_ipaccess_bts() before using IPACC + * lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static + * lchan_rtp_fsm: use E1 endpoints if the BTS is not ipaccess type + * e1: encode line number as trunk number in MGCP endpoint + * gsm_04_08_rr: block EMERGENCY SETUP when EMERGENCY CALLS are denied + * abis_rsl.c: make sure emergency calls are rejected early + * lchan_fsm: merge lchan_mr_config() + * lchan_fsm: make internal functions static. + * lchan_fsm: make rsl mode-modify working again + * abis_rsl: prioritize emergency calls over regular calls + * abis_rsl.c: flush channel request queue on RSL bootstrap + * abis_rsl: inform user when expired channel requests get tossed + * abis_rsl: fix memleak in rach dos reduction function + * bsc_vty: improve manual activation of lchans (debug / labtest) + * bsc_vty: fix manual channel activation + * bsc_vty: fix wrong else-if statement + * gsm_08_08: fix unreachable code in parse_powercap() + * osmo_bsc_bssap: actually check for lchan + * bts: add repeated acch mode flags + vty config + * abis_rsl: parse cm3 and indicate ACCH repetition cap to BTS + * bsc_vty: mark repeated ACCH value of 1.9% to 2.7% BER as default + * bsc_vty: fix acch_repetition ber threshold strings + * abis_rsl: check if emergency calling is disabled before premption + * bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default + * bts.adoc: describe ACCH repetition settings + + [ Vadim Yanitskiy ] + * VTY: fix writing of custom timer values to a configuration file + * vty: fix: restore removed DNAT category as deprecated + * doc/manuals: remove deprecated DNAT from the VTY reference + * rest_octets: cosmetic: fix alignment in gprs_cell_options + * vty: 'gprs 11bit_rach_support_for_egprs': drop redundant check + * vty: 'gprs 11bit_rach_support_for_egprs': clarify error message + * vty: clarify EGPRS Packet Channel Request message support + * A-bis: fix logging level mismatch in abis_nm_rcvmsg_fom() + * bsc_subscr_find_or_create_by_{imsi,tmsi}(): fix NULL pointer dereference + * doc/manuals: regenerate the VTY reference file + * gsm_data: cosmetic: mark argument of is_*_bts() as const + * bts_unknown: fix: properly initialize the feature vector + * bts_sysmobts: fix: properly zero-initialize the feature vector + * bsc_bts_alloc_register(): fix possible NULL-pointer dereference + * handover_test: use 'unknown' BTS type instead of 'sysmobts' + * abis_nm: cosmetic: add curly braces to complex 'if' statements + * abis_nm: cosmetic: use sizeof() for printing buffer size + * abis_nm: fix: properly truncate feature vector reported by BTS + * abis_nm: fix ARFCN list encoding in Set Channel Attributes + * abis_nm: fix length indicator in Set Channel Attributes + * fix crashes due to OSMO_ASSERT(conn->lchan) + * abis_rsl: Mobile Allocation IE in CHANnel ACTIVation shall be empty + * system_information: publicly declare generate_cell_chan_list() + * system_information: constify bitvec in freq. list encoding API + * generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors + * gsm_04_08_rr: fix hopping parameters in RR Assignment Command + * doc/examples: remove deprecated 'dyn_ts_allow_tch_f' + * vty: ensure that all warning messages are prefixed with '%%' + * vty: fix missing comma in a warning message + * vty: introduce and use GPRS_CHECK_ENABLED() macro + * vty: allow enabling freq. hopping regardless of the feature vector + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: fix copy-pasted 'no gprs control-ack-type-rach' description + * fix bsc_sapi_n_reject(): dlci is unsigned, use uint8_t + * bsc_subscr_conn_fsm: fix a memleak in rll_ind_cb() + * bsc_subscr_conn_fsm: use proper cause values in SAPI N REJECT + * abis_rsl: fix IAR Rest Octets in rsl_send_imm_ass_rej() + * vty: add a command to clear hopping ARFCN list + * gsm_04_08_rr: fix hopping parameters in RR Handover Command + * SI Type 4: fix missing CBCH Mobile Allocation IE + * generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro + * generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) + * SI Type 4: prevent potential buffer overflow + * vty: propagate result of gsm_bts_set_system_infos() + * fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() + * abis_om2000: check result of gsm_bts_trx_set_system_infos() + * vty: clarify NM state owner printed by 'show trx N' command + * abis_nm: fix erroneous use of LOGPC() instead of LOGP() + * abis_nm: fix msgb memleak in _abis_nm_sendmsg() + * abis_nm: LOGPFOH()/DEBUGPFOH(): remove redundant context info + * abis_nm: abis_nm_get_ts(): use LOGPFOH() instead of generic LOGP() + * abis_nm: use btstype2str() in abis_nm_rcvmsg_manuf() + * abis_nm: use DEBUGPFOH() in abis_nm_rx_sw_act_req() + * abis_nm: use LOGPFOH()/DEBUGPFOH() in parse_attr_resp_info_unreported() + * abis_nm: improve logging message in abis_nm_get_attr() + * generate_ma_for_ts(): simplify MA bit-mask computation + * vty: fix unreacheable code / wrong check in lchan_act_all_trx() + * RSL/BSSAP: fix: properly convert between RSL Link ID and DLCI + * vty: add attributes to VTY commands indicating when they apply + * bts: move rate counter / stat item definitions from *.h to *.c + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * vty: add reminder messages about the radio link timeout + * gsm_08_08: fix NULL pointer dereference in bsc_cm_update() + * NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED + * vty: add new attribute for vendor-specific commands + * abis_rsl: turn rsl_msgb_alloc() a macro and move it to header + * power_control: add new structures and default parameters + * power_control: add encoding/init API to 'struct gsm_bts_model' + * power_control: send default parameters from bootstrap_rsl() + * power_control: add encoder for ip.access nanoBTS and OsmoBTS + * power_control: make use of MS/BS parameters in RSL messages + * power_control: add VTY commands for per-BTS configuration + * power_control: add VTY command for re-sending default parameters + * power_control: add VTY command to set static / maximum BS Power + * power_control: reflect MS/BS Power difference in the VTY prompt + * vty: cosmetic: make all 'struct cmd_node' definitions static + * power_control: encoding of H_REQAVE and H_REQT for ip.access + * power_control: fix swapped lower/upper RxQual threshold values + * power_control: enable dynamic MS power control for osmo-bts + * power_control: vty: some commands are not vendor specific + * vty: fix NULL-pointer dereference in cfg_bts_rep_dl_facch() + * power_control: vty: do not print 'no (rxlev-avg|rxqual-avg)' + * vty: join UL/DL SACCH repetition commands together + * vty: fix wrong attributes for UL/DL ACCH repetition commands + * ericsson_rbs2000: fix unreachable code in inp_sig_cb() + * power_control: add documentation on available configuration params + * manuals: fix a duplicate line in the description of DTXu + * manuals: fix a typo: s/DTS/DTX/ + * power_control: cosmetic changes and fixes to the documentation + * power_control: add increase / reduce step size recommendations + * vty: use 'const' for *nsvc in config_write_bts_gprs() + * vty: fix writing empty IP address for unconfigured NSVCs + * power_control: fix: properly initialize per-lchan BS power + * vty: fix 'codec-list' command: check all given arguments first + * gsm_data: return early if MS Power class remains the same + * assignment_fsm: assert the result of conn_get_bts() + * power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() + * power_control: enable Uplink DPC by default if format is known + * power_control: make P_CON_INTERVAL parameter configurable + * abis_nm: enrich debug messages with contextual info + + [ Pau Espin Pedrol ] + * bssap: Avoid logging error if no optional Global Call Ref IE received + * bsc: Allow setting negative nominal tx power through VTY + * Avoid selecting channels from administratively locked trx + * bsc_main: Improve log line on Lost E1 link + * bsc_main: Use LOG_TRX in log line + * ipaccess_sign_link_up: Log sign_link type + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * gsm_data.h: Drop duplicated include stdint.h + * Fix trailing whitespace in several files + * ipaccess_nanobts: Log ipaccess_sign_link_down event + * Move struct gsm_bts: gsm_data.* => bts.* + * bts: Drop duplicated function to get trx by number + * Move struct gsm_bts_trx: gsm-data.* => bts_trx.* + * Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* + * Move acc_ramp_init inside gsm_bts_alloc + * configure.ac: Fix trailing whitespace + * doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals + * {bts,bsc}.adoc: Drop deprecated OsmoNITB references + * rename files acc_ramp.* -> acc.c* + * Introduce support for ACC subset rotation + * Introduce support for ACC ramping during whole BTS life cycle + * Support setting rt-prio and cpu-affinity mask through VTY + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * ctrl: Fix CTRL TRAP for {msc.X,msc_)connection_status not sent + * acc_test: Print allowed ACC from t2 and t3 + * acc: Fix ACC rotate barring highest ACCs too quickly during wraparound + * tests: acc_test: Test more rotating scenarios + * Allow storing IPv6 address strings in BSSAP structs + * vty: Hide show running-config ACC ramping params if not enabled + * Fail on invalid IP addresses passed to IPACC MDCX + * Fix creating MGCP proxy socket if MGW listens on an IPv6 address + * lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX + * oml: Fix premature Opstart to Radio Carrier + * bssap: Use new DTAP DLCI helper fields from libosmocore + * abis_nm: Log Rx Change Administrative State ACK + * abis_nm: Log no state change detected + * abis_nm: Remove duplicated log line + * cosmetic: tests/ctrl_test_runner.py: Fix trailing whitespace + * ipa oml: tx OPSTART after unlocking, not before + * contrib/jenkins: Enable parallel make in make distcheck + * Set all NM OML objects to Locked by default + * Introduce NM BTS Site Manager FSM + * Introduce NM BTS FSM + * Introduce NM BaseBand Transceiver FSM + * Introduce NM RadioCarrier FSM + * Introduce Radio Channel FSM + * OML: Stay compatible with older osmo-bts versions + * abis_nm: Log Opstart NACK with error loglevel + * ipa: Fix use of null pointer in log macro + * nm_channel_fsm: Fix innocuous transition not permitted log error + * main: generate coredump and exit upon SIGABRT received + * ipaccess-proxy: generate coredump and exit upon SIGABRT received + * Store GPRS MOs directly under BTS SiteMgr object + * nm_bts_sm_fsm: Fix peer_has_no_avstate_offline not applied for nanobts + * Introduce NM GPRS NSE FSM + * Introduce NM GPRS CELL FSM + * abis_nm: Simplify param passing to abis_nm_rx_get_attr_resp() + * Handle BTS/BBTRANSC Get Attributes (Ack) in NM FSMs + * Fix typo in function nanobts_attr_nsvc_get + * oml: Delay configuring NSVC until BTS features are negotiated + * gsm_lchan_name: assert on NULL lchan + * Use rest_octets functionalities from libosmocore + * gitignore: Ignore *~ + * doc: handover: Fix malformed table + * Introduce Neighbor Resolution Service + * cosmetic: doc: wrap line too long + * cosmetic: bts-sysmo: Fix whitespace indentation + * Allow configuring SI13 CCN_ACTIVE bit from VTY, enable by default on osmo-bts + * Introduce VTY cmd to configure Alpha in SI13 + * Move bts_ident_key to neighbor_ident.c + * Fix neigh resolution service on local neighbours + * SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * tests/Makefile.am: allow running only one VTY test + * osmo-bsc/bsc_vty: set default gprs cell bvci to 2 + * osmo-bsc/bsc_vty: fail on get_amr_from_arg error + * osmo-bsc-minimal.cfg: fix codec-list + * main: exit on mutually exclusive codecs settings + * abis_nm.c: rx_fail_evt_rep: fix sd.bts + * abis_nm: move fail report parsing to extra func + * VTY: add show bts failure report + * VTY: let all descriptions end in \n + * VTY: regenerate bsc_vty_reference.xml + * timers: T->X: 23002, 23004, 23005, 23006 + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * lchan_fsm, lchan_rtp_fsm: make all timers configurable + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Neels Hofmeyr ] + * manual: add "Multiple Instances" section, akin to other manuals + * manual: add SCCP/M3UA section from common chapters + * manual: add SCCPlite section + * manual: fix config example typo 'msc-addr' + * manuals: update bsc_vty_reference.xml + * deprecate 'msc' / 'ip.access rtp-base ' + * cosmetic: put comment back at proper place in bsc_vty.c + * drop IMSI filter and libfilter completely + * drop CC 'local-prefix' feature + * code cleanup: absorb complete_layer3() into bsc_compl_l3() + * drop all BSC originated USSD notification features + * doc/examples: remove deprecated ussd text config + * drop MSC types "local" vs "normal" + * flatten: move network->bsc_data->* to network->* + * CTRL: determine MSC connection status from RESET-ACK, not AS_ACTIVE + * create only one SCCP user per SCCP instance + * cosmetic: tweak rc type of is_cm_service_for_emerg() + * is_cm_service_for_emerg(): return false, not 0 + * gsm0408_test.c: drop test_mi_functionality() + * refactor bsc_find_msc()'s round-robin + * add osmo-bsc --vty-ref-xml: dump VTY ref XML to stdout + * manuals: generate vty reference xml at build time + * osmo-bsc main: exit on cmdline option error + * remove extract_sub(), add bsc_subscr_find_or_create_by_mi() + * use osmo_mobile_identity API everywhere + * tweak log category for Compl L3 error + * MSC pooling: make NRI mappings VTY configurable + * MSC pooling: implement NAS node selection by NRI from TMSI + * MSC pooling: LU: ignore TMSI NRI from a different PLMN + * MSC pooling: add 'no allow-attach' for MSC off-loading + * mscpool: add user manual chapter + * vty: add 'mscpool roundrobin next' for ttcn3 tests + * log: add MSC number to bsc_subscr_conn_fsm id + * debug: log about matching Paging Response to earlier Paging + * MSC pooling: add rate counters + * merge files: absorb osmo_bsc_vty.c into bsc_vty.c + * vty: hide 'mscpool roundrobin next' + * fix segfault introduced by recent segfault fix + * create ASP+AS only once per cs7 instance + * si2quater: fix budget calculation for multiple EARFCNs + * SI2quater: allow storing 48 EARFCNs + * RR Release Cell selection IE: fix repeated EARFCNs encoding + * RR Channel Release: pass Cause code from BSSMAP Clear to the BTS + * propagate RSL error cause codes to RR Channel Release cause + * fix CBSP server: actually open the srv_link + * handover_test.c: add test case 29: TCH/F -> TCH/H + * handover_test.c: typo s/more/less in test 19 description + * hodec2: fix logging of requirements flags + * hodec2 congestion: consider only congested pchan types + * hodec2: do not keep candidates with zero requirements met + * hodec2: log requirements of best candidate, log rxlev in dBm + * cosmetic: bscon: use GSM48_RR_CAUSE_NORMAL instead of 0 + * gscon timeout: use proper cause code for lchan release + * debug log: add RR Release cause code to the log + * info, error log: show MSC nr for new conn + * mscpool: fix refcount leak for unusual case of no bts + * CBSP: on RESET, also clear the etws_timer, and stop ETWS PN broadcast + * CBSP: log CBSP RESET on NOTICE + * CBSP: rewrite the CBSP link setup and 'cbc' VTY section + * CBSP: add local bind to client mode + * cosmetic: use local var in handover_start_intra_bsc() + * cosmetic: dissolve error-goto with single source in handover_start() + * ho counters: count invalid target cell as 'error', not 'no_channel' + * fix 'handover:*' counters: add missing / move increments + * fix 'handover:*' counters: remove bogus increments + * fix HO inter-BSC-IN target bts for counters + * add {BTS,BSC}_CTR_INTER_BSC_HO_OUT_FAILED for RR HO Failure + * bssap: do not send a Clear Request after a Clear Command + * handover_fsm: signal Clear from gscon, for proper HO result counts + * handover: fix detection for ambiguous HO neighbor ident + * CBSP: fix link startup when enabled in config file + * drop some unused members and function decls + * CBSP: adjust manual to reflect new 'cbc' VTY config + * CBSP VTY: re-add legacy cbc config for backwards compat + * dissolve bsc_grace_paging_request() + * drop bsc_subscr.lac + * drop unused Tdef for 992427 + * add timer.vty + * clean up timer definitions: introduce groups, move some T to X + * tests: add missing *.vty to EXTRA_DIST + * log MSC nr for opening new A conn + * remove unused signature gsm48_handle_paging_resp() + * gscon_bssmap_clear(): guard against NULL msc + * compl l3: separate paging handling from bsc_scan_bts_msg() + * compl l3: parse Mobile Identity once + * compl l3: cosmetics around Create Layer 3 + * compl l3: allocate conn in gsm_08_08.c, not gsm_04_08_rr.c + * compl l3: populate conn's bsc subscr from MI + * compl l3: move Paging Response handling out of bsc_find_msc() + * compl l3: move all message parsing out of bsc_find_msc() + * refactor paging: introduce bsc_paging_params + * refactor paging: introduce bsc_paging_start() + * refactor paging: add bsc_subscr to bsc_paging_params + * LCS: add paging reason, return in paging_request_stop() + * introduce osmo_use_count for bsc_subscr + * bsc_subscr_name: print both IMSI and TMSI + * cosmetic: fix naming of GSCON_EV_A_CONN_REQ -> GSCON_EV_MO_COMPL_L3 + * LCS: implement re-use of existing A-interface conn + * LCS: SCCP next conn id: prepare Lb-interface + * LCS: implement the bulk of Location Services + * LCS: allow RSL EST IND during GSCON_ST_ACTIVE + * remove unused osmo_bsc_reset.h + * add doc/location_services_ta.msc + * BSSMAP RESET: generalize a_reset FSM + * BSSMAP RESET: move cancel-paging call to osmo_bsc_sigtran_reset() + * BSSMAP RESET: move RESET-ACK into reset fsm + * BSSMAP RESET: tweak logging + * BSSMAP RESET: also accept conn cfm events during ST_DISC + * LCS: disable Lb interface by default, add vty 'smlc' / 'enable' + * add smlc.vty test + * LCS: add proper BSSMAP-LE RESET re-using new generalized reset FSM + * LCS: Lb startup: no need to re-use existing SCCP user + * drop features 'core-location-area-code' and 'core-cell-identity' + * manual: describe LCS and Lb interface + * fix missing RR release when there is no MSC + * add fixme comment for OS#3833 + * minor code dup: smlc_set_cs7_instance() + * handover vty doc: explain rxqual values + * handover_test: fix comment + * handover_test prep: move arfcn into create_bts() + * handover_test prep: move generate_si() into create_bts() + * handover_test prep: allow arbitrary timeslots in create_bts() code + * handover_test prep: allow configuring several trx in create_bts() + * handover_test prep: rename 'create-bts' to 'create-n-bts' + * handover_test cosmetic: eliminate bts array and bts_num from main() + * handover_test: allow arbitrary timeslot config and multiple TRX + * handover test: fix dyn ts: set pchan_is on act / rel + * handover test: add 'expect-ts-use' to clarify tests + * handover_test: add 'set-ts-use' + * handover_test: change 'meas-rep' params to bts-trx-ts-ss nr + * handover_test: drop secondary array of lchans + * handover test: add test 30: de-congest TCH/F by moving to dyn TS TCH/H + * handover_test: add test 31: TCH/H: re-use dyn TS + * fix TCH/H allocation: use half occupied dyn TS instead of switching more dyn TS + * hodec 2: prep: common pick_better_lchan_to_move() function + * hodec 2: favor moving dyn TS + * handover test 30: play through filling up all lchans + * handover_test: add test 32: half used TCH/H on dyn TS + * fix AMR start-mode auto: reflect proper ICMI in MultiRate Config IE + * AMR start-mode: send proper smod bits + * AMR start-mode auto: send smod bits as zero + * ctrl_test_runner.py: remove per-test startup delay + * hodec 2: prefer moving TCH/H from half-used dyn TS + * handover_test: implement as VTY shell + * handover_test: log sending ho complete + * handover_test: send ho detection + * handover_test: adjust logging for reproducability + * handover_test: set a fake osmo_mgcpc_ep_ci pointer + * handover_test: rename test scripts from numbers to names + * handover_test: gitignore + * tweak handover_tests.sh + * handover_test: cosmetic cfg simplifications in 5 tests + * handover_test: fix test_congestion.ho_vty meas-rep + * handover_test.c: properly release lchans in set-ts-use + * hodec2: cosmetic: add dBm unit to rxval logging + * hodec2: code dup / cosmetics + * handover_test: add 'meas-rep repeat N' + * handover_test: add test_congestion_favor_best_target_rxlev.ho_vty + * handover_test: add AMR TCH/H->/F tests, showing a bug + * handover_test: show ineffective intra-cell choice + * handover_test: add test_congestion_intra_vs_inter_cell.ho_vty + * hodec2: clarify current and target rxlev per candidate + * hodec2: cosmetic: clarify afs_bias, simplify pick_better_lchan_to_move() + * hodec2: fix candidate choices in congestion check + * handover_test: include ack-chan in expect-chan + * handover_test: safeguard against unhandled chan req + * handover_test: saner chan act handling + * handover_test: saner ho request handling + * handover_test: vty echo + * handover_test: show a bug: add test_congestion_no_oscillation.ho_vty + * hodec2: cosmetic: clarify ho_candidate.{current,target} + * hodec2: reduce check_requirements() args + * hodec2: add ho_candidate.{current,target}.free_tch + * handover_test: add lchan wildcards to meas-rep cmd + * handover_test: show bug: add test_balance_congestion_tchf_tchh.ho_vty + * hodec2: fix congestion oscillation bug + * handover_test: add test_balance_congestion_by_percentage.ho_vty + * hodec2: to balance congestion, use overload percent + * handover_test: enhance test_balance_congestion_by_percentage.ho_vty + * handover_tests.sh: update stdout/stderr only on capital -U arg + * fix for test_dyn_ts_favor_moving_half_used_tch_h.ho_vty + * cosmetic: in a ho test, use '*' instead of pdch + * show bug: add test_dyn_ts_congestion_tch_f_vs_tch_h.ho_vty + * fixate test_dyn_ts_congestion_tch_f_vs_tch_h.ho_vty + * hodec2: fix congestion resolution on dyn TS + * add test_dyn_ts_congestion_tch_f_vs_tch_h_2.ho_vty + * lchan_avail(): omit logging for handover decision 2 + * show bug: add test_dyn_ts_balance_congestion.ho_vty + * hodec2: fix congestion balancing on dyn TS + * show bug: add test_dyn_ts_amr_tch_{f,h}_to_{h,f}_congestion_assignment_2.ho_vty + * hodec2: fix intra-cell congestion balancing with source lchan on dyn TS + * lchan assignment when RTP is set up: don't break on Mode Modify + * rename lchan->rqd_ta to last_ta + * lchan activation: indicate whether TA is known + + [ Keith ] + * Meas Tools: Avoid OSMO_ASSERT due to uninitialised logging. + * Meas Tools: Avoid unusable terminal in case of error on osmo_sock_init + * Meas Tools, Avoid compiler format warnings + * Disallow changing the type of an existing BTS from the vty + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Sylvain Munaut ] + * om2k: Add definitions for the TG object + * om2k: Allow TG and MCTR to be manipulated via VTY + * om2k: Allow the CON configuration request to be triggered via VTY + * om2k: Add VTY command to allow TX of arbitrary message for testing + * om2k: Don't use slashes in FSM IDs and use dashes instead + * om2k: Fix TS channel config payload for non-superchannel case + * om2k: Fix type of msg_type in abis_om2k_tx_simple + * om2k: Acknowledge the HW Infos Reports + * om2k: Acknowledge the unknown MCTR messages we get from time to time + * om2k: Properly name message 0x0136, found to be MCTR Statistics Report + * om2k: Use the "from config" TS config to setup OM objects + * om2k: Dispatch TS_EV_OML_READY to TS FSM only when it's actually ready + * om2k: Fix the frequency specifier for TX/RX/TS conf requests + * bts_ericsson_rbs2000: Init all the TRX, not just C0 + * bts_ericsson_rbs2000: Whitelist the E1d input driver + * om2k: Add option to limit OML version during negotiation + * om2k: Rename MCTR config request constants for consistency + * om2k: Add support for MCTR configuration + * om2k: Properly update the 'fake' 12.21 states using OM2000 status + * om2k: Wait for OM TRX links to stabilize before trying to bring up TRX + * chan_alloc: Don't re-invent trx_is_usable and use existing helper + * gsm_data: Update trx_is_usable for ericsson BTS + * om2k: Fix invalid use of linked list when building hopping freq list + * bts_nokia_site: Fake 12.21 OM objet state as "OK" when boot is done + + [ Alexander Chemeris ] + * ctrs: Correctly count load total for dynamic timeslots. + * stats: Report per channel type load to statsd counters. + * stats: Remove dots from the end of stats descriptions. + * Fix indent whitespace and log message. + * stats: Fix stat group index for BTS stats. + * Fix a comment for the handle_unitdata_from_msc() function. + * chan_alloc: Add comments for the *_chan_load() functions. + * osmo_bsc_sigtran: Fix a SSCP-> SCCP typo in a comment + * stats: Add a stats gauge for the MSC links count. + * stats: report a number of configured BTS to a stats gauge. + * stats: Add counters for received BSSMAP messages. + * stats: Export connected OML/RSL links count per BTS. + * a_reset: Rename SIGTRAN connection to BSSMAP MSC assocation in log messages + * stats: Fix Rx DTAP error stat description + * bsc_subscr_conn_fsm: Fix a typo in the comment life->live + * lchan: Allow transition from BORKEN state to WAIT_RF_RELEASE_ACK + * timeslot_fsm: Allow PDCH_ACT_ACK in BORKEN state. + * stats: Only dereference a connection pointer after checking for NULL. + * handover_test: Properly allocate MSC data struct. + * stats: Add counters for Tx BSSMAP messages. + * stats: Rename BSSMAP Rx message counters to match Tx ones. + * bsc_vty: Coding style fix - brackets around a complex if/else + * log: Fix "Paging request failed" logging level + * log: Adjust "new SIGTRAN connection" logging level + * bssmap: Ignore repeated BSSMAP RESET ACK messages. + * log: Demote "CHAN RQD: reason" to INFO + * log: Demote "SAPI=%u ESTABLISH CONFIRM" message from ERROR to DEBUG. + * borken: Recover from more TS borken states. + * stats: Add counters and gauges for BORKEN lchans/TS + * stats: Add a BTS/BSC counter PAGING_NO_ACTIVE_PAGING. + * stats: Correctly count lchans under BORKEN TS. + * bssap: Handle BSSMAP CONFUSION message. + * Fix crash in bsc_patch_mm_info() + * bsc_patch: Don't even parse MM INFO if TZ patching is not enabled. + * bsc_subscr_conn_fsm: Fix crash in gscon_forget_lchan() + * stats: Count paging requests flushed due to MSC Reset. + * Return 0 from gsm0408_rcvmsg() if SCCP link is already closed. + * paging: Remove obsolete comment. + * chan_alloc: Fix typo in a comment. + * timeslot_fsm: Name TS FSM instances on allocation. + + [ Daniel Willmann ] + * osmo-bsc: Use designated initializer in bts_stat_desc + * gsm_data.h: Remove period at end of counter description + * abis_rsl: Count successful channel requests + * Count assignment rates per BTS as well + * Remove punctuation in counter description + * Count handover per BTS as well as per BSC + * Count intra-cell and intra-bsc handover separately + * Add bts counters to count BTS events where we don't have a bts + * configure.ac: Require python3 for ext_tests + + [ Alexander Couzens ] + * gsm_data: always set spare bits in channel description + * gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release + * gsm 04.08: correct calculate the Cell Selection Indicator after release of all TCH and SDCCH + * osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 + * abis_nm: abis_nm_perform_test: fix a potential null deref + * pcu_sock: use tn as variable name to improve readability + * pcuif_proto: protocol 9: add missing fields + * oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG + * pcuif_proto: version 10: add frequency hopping parameters + * pcuif_proto: version 10: add support for IPv6 NSVCs + * bsc_vty: cfg_bts_gprs_nsvc_rip: add missing breaks + * bsc_vty: parse the return code to make coverity happy + * bts_ipaccess_nanobts: check if msgb_alloc fails + * sysmobts: expect feature IPV6_NSVC + * Introduce NM GPRS NSVC FSM + + [ Michael Iedema ] + * stats: Add granularity to SDCCH/TCH/LU activity. + * stats: Add granularity to chan:rf_fail stat. + * cosmetic: shorten deref chains where possible + * stats: add SIGN/SPEECH assignment subcategories + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:43:04 +0100 + osmo-bsc (1.6.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/debian/control b/debian/control index e3af0fb..09dcd04 100644 --- a/debian/control +++ b/debian/control @@ -12,13 +12,13 @@ python3-minimal, libcdk5-dev, libtalloc-dev, - libosmocore-dev (>= 1.4.0), - libosmo-sccp-dev (>= 0.10.0), - libosmo-sigtran-dev (>= 0.10.0), - libosmo-abis-dev (>= 0.6.0), - libosmo-netif-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.6.0), - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + libosmo-sccp-dev (>= 1.4.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.8.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc.git Vcs-Browser: https://git.osmocom.org/osmo-bsc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0afcb06f8a7466f98cac26ff939a3813d4add1cc Gerrit-Change-Number: 23067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 17:52:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 17:52:16 +0000 Subject: Change in osmo-bsc[master]: remove obsolete dependency on libosmo-sccp References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23068 ) Change subject: remove obsolete dependency on libosmo-sccp ...................................................................... remove obsolete dependency on libosmo-sccp We only use libosmo-sigtran these days, so we can remove the depdency to the old libosmo-sccp from osmo-bsc. We don't use LIBOSMO_SCCP_* variables in any Makefile.am, nor do we #include anywhere [anymore]. Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Related: OS#2601 --- M configure.ac M contrib/osmo-bsc.spec.in M debian/control 3 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/23068/1 diff --git a/configure.ac b/configure.ac index 343c031..1d06a46 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,6 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) dnl checks for header files diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 8293c51..8325ccf 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -33,7 +33,6 @@ BuildRequires: pkgconfig(libcrypto) >= 0.9.5 BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.5.0 BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 BuildRequires: pkgconfig(libosmocore) >= 1.2.0 diff --git a/debian/control b/debian/control index e3af0fb..b5d732b 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 1.4.0), - libosmo-sccp-dev (>= 0.10.0), libosmo-sigtran-dev (>= 0.10.0), libosmo-abis-dev (>= 0.6.0), libosmo-netif-dev (>= 0.6.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Gerrit-Change-Number: 23068 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:04:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 18:04:26 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E558-f5d07-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23067 ) Change subject: Bump version: 1.6.0.558-f5d07-dirty ? 1.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0afcb06f8a7466f98cac26ff939a3813d4add1cc Gerrit-Change-Number: 23067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 18:04:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:04:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 18:04:28 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E558-f5d07-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23067 ) Change subject: Bump version: 1.6.0.558-f5d07-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.558-f5d07-dirty ? 1.7.0 Change-Id: I0afcb06f8a7466f98cac26ff939a3813d4add1cc --- M TODO-RELEASE M configure.ac M contrib/osmo-bsc.spec.in M debian/changelog M debian/control 5 files changed, 614 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 4760012..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -osmo-bsc Mobile Identity Coding OsmoBSC is stricter in rejecting invalid coding of Mobile Identity IEs -libosmocore >1.4.0 (1.4.1?) need BSSMAP-LE, BSSLAP, GAD coding, osmo_gsm48_si* diff --git a/configure.ac b/configure.ac index 343c031..762b814 100644 --- a/configure.ac +++ b/configure.ac @@ -51,15 +51,15 @@ AM_CONDITIONAL(BUILD_IPA_UTILS, test "x$osmo_ac_ipa_utils" = "xyes") AC_SUBST(osmo_ac_ipa_utils) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.8.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 8293c51..6f3b2bd 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -31,16 +31,16 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.5.0 -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.8.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(talloc) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index b65bc0d..8fc8b76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,591 @@ +osmo-bsc (1.7.0) unstable; urgency=medium + + [ Harald Welte ] + * Introduce nm_fail_rep_signal_data for "SS_NM, S_NM_FAIL_REP" signal + * OM2000: Add some more message types and IEs we now understand + * remove 'NAT' log category + * handorer.h: Fix compilation with gcc-10 + * gsm_data.h: Comment the 'nokia' BTS fields + * bts_nokia_site: Fix LAPD segfault during reset procedure + * [cosmetic] system_information: Values are not guesses; more comments + * bs11_config: Print "Not Equipped" for MBCCU (TRX) that don't exist + * Count RSL DELETE INDICATION received from BTS + * system_information: Set BSS_PAGING_COORDINATION in SI13 for osmo-bts + * vty/bts_resend_cmd: Use gsm_bts_set_system_infos() to increment changemark + * osmo-bsc.spec.in: Use %config(noreplace) to retain current config file + * abis_nm: Avoid various "Unhandled message" errors on BS-11 startup + * Bring timeslot FSMs on BS-11 out of NOT_INITIALIZED state + * Don't print 'bogus channel load sample' message if total == 0 + * bts_nokia_site: Clean up logging + * Add example configuration files for E1 BTS + * remove examples/osmo-bsc/ericsson/osmo-bsc.cfg + * osmo-bsc.spec.in: Package E1 config files + * osmo-bsc.spec.in: Add missing directories to package + * debian: Package E1 configuration file examples + * lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND + * Add example config files for Ericsson DUG20 based BTS + * acc.c: Don't use C99 constructs, this breaks builds on Debian 8 + * BS-11: Fix "CONNECT TERRESTRIAL TRAFFIC" + * Implement support for receiving BSSMAP CommonID from MSC + * osmo_bsc_sigtran.c: Remove unused #defines + * use osmo_fd_setup() whenever applicable + * debian/control: Recommend installation of osmo-mgw + * Use osmo_fd_*_{disable,enable} + * fix some size-t format string characters + * update aoip-mgw-options document with reality of 2020 + * abis_om2000: Force TRX NM state to UNLOCKED once TRX is up + * osmobsc-usermanual: Add Chapter with AoIP message flow examples + * OM2K: Permit transition from WAIT_CONF_RES -> WAIT_ENABLE_ACCEPT + * OM2K: Skip the entire CON MO if there are no connection groups + * Add a bts_model->bts_init() and trx_init() call-back function + * abis_om2000: make om2k_mo_name() an exported function + * [cosmetic] abis_om2000: Re-format to use longer lines + * abis_om2000: Mark om2k_mo_fsm_start() as static + * abis_om2000: keep OM2K FSMs around, don't terminate + * om2000: Add "show bts 0 om2k-mo" command + * abis_om2000: Handle DP object in get_om2k_mo() + * smscb: Avoid scheduler array overflow + * smscb: Fix adding of SMSCB messages when no message with lower period exists + * select_best_cipher(): Prefer A5/1 over A5/2 + * BS-11: Send proprietary MRPCI message after assignment + HO complete + * hide the "smscb-command" vty command; people should use osmo-cbc + * CBSP: document rate counters and their mapping to basic/extended CBCH + + [ Philipp Maier ] + * bsc_main: use higher default loglevels. + * lchan_rtp_fsm: fix out_state_mask + * vty: check with is_ipaccess_bts() before using IPACC + * lchan_rtp_fsm: make _fsm_timer_cb and _fsm_cleanup static + * lchan_rtp_fsm: use E1 endpoints if the BTS is not ipaccess type + * e1: encode line number as trunk number in MGCP endpoint + * gsm_04_08_rr: block EMERGENCY SETUP when EMERGENCY CALLS are denied + * abis_rsl.c: make sure emergency calls are rejected early + * lchan_fsm: merge lchan_mr_config() + * lchan_fsm: make internal functions static. + * lchan_fsm: make rsl mode-modify working again + * abis_rsl: prioritize emergency calls over regular calls + * abis_rsl.c: flush channel request queue on RSL bootstrap + * abis_rsl: inform user when expired channel requests get tossed + * abis_rsl: fix memleak in rach dos reduction function + * bsc_vty: improve manual activation of lchans (debug / labtest) + * bsc_vty: fix manual channel activation + * bsc_vty: fix wrong else-if statement + * gsm_08_08: fix unreachable code in parse_powercap() + * osmo_bsc_bssap: actually check for lchan + * bts: add repeated acch mode flags + vty config + * abis_rsl: parse cm3 and indicate ACCH repetition cap to BTS + * bsc_vty: mark repeated ACCH value of 1.9% to 2.7% BER as default + * bsc_vty: fix acch_repetition ber threshold strings + * abis_rsl: check if emergency calling is disabled before premption + * bsc_vty: mark repeat rxqual 4 (BER >= 1.6) as default + * bts.adoc: describe ACCH repetition settings + + [ Vadim Yanitskiy ] + * VTY: fix writing of custom timer values to a configuration file + * vty: fix: restore removed DNAT category as deprecated + * doc/manuals: remove deprecated DNAT from the VTY reference + * rest_octets: cosmetic: fix alignment in gprs_cell_options + * vty: 'gprs 11bit_rach_support_for_egprs': drop redundant check + * vty: 'gprs 11bit_rach_support_for_egprs': clarify error message + * vty: clarify EGPRS Packet Channel Request message support + * A-bis: fix logging level mismatch in abis_nm_rcvmsg_fom() + * bsc_subscr_find_or_create_by_{imsi,tmsi}(): fix NULL pointer dereference + * doc/manuals: regenerate the VTY reference file + * gsm_data: cosmetic: mark argument of is_*_bts() as const + * bts_unknown: fix: properly initialize the feature vector + * bts_sysmobts: fix: properly zero-initialize the feature vector + * bsc_bts_alloc_register(): fix possible NULL-pointer dereference + * handover_test: use 'unknown' BTS type instead of 'sysmobts' + * abis_nm: cosmetic: add curly braces to complex 'if' statements + * abis_nm: cosmetic: use sizeof() for printing buffer size + * abis_nm: fix: properly truncate feature vector reported by BTS + * abis_nm: fix ARFCN list encoding in Set Channel Attributes + * abis_nm: fix length indicator in Set Channel Attributes + * fix crashes due to OSMO_ASSERT(conn->lchan) + * abis_rsl: Mobile Allocation IE in CHANnel ACTIVation shall be empty + * system_information: publicly declare generate_cell_chan_list() + * system_information: constify bitvec in freq. list encoding API + * generate_ma_for_ts(): constify per cell/timeslot ARFCN bit-vectors + * gsm_04_08_rr: fix hopping parameters in RR Assignment Command + * doc/examples: remove deprecated 'dyn_ts_allow_tch_f' + * vty: ensure that all warning messages are prefixed with '%%' + * vty: fix missing comma in a warning message + * vty: introduce and use GPRS_CHECK_ENABLED() macro + * vty: allow enabling freq. hopping regardless of the feature vector + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: fix copy-pasted 'no gprs control-ack-type-rach' description + * fix bsc_sapi_n_reject(): dlci is unsigned, use uint8_t + * bsc_subscr_conn_fsm: fix a memleak in rll_ind_cb() + * bsc_subscr_conn_fsm: use proper cause values in SAPI N REJECT + * abis_rsl: fix IAR Rest Octets in rsl_send_imm_ass_rej() + * vty: add a command to clear hopping ARFCN list + * gsm_04_08_rr: fix hopping parameters in RR Handover Command + * SI Type 4: fix missing CBCH Mobile Allocation IE + * generate_ma_for_ts(): use OSMO_BYTES_FOR_BITS() macro + * generate_ma_for_ts(): fix: properly encode ARFCN 0 (corner case) + * SI Type 4: prevent potential buffer overflow + * vty: propagate result of gsm_bts_set_system_infos() + * fix bootstrap_rsl(): check result of gsm_bts_trx_set_system_infos() + * abis_om2000: check result of gsm_bts_trx_set_system_infos() + * vty: clarify NM state owner printed by 'show trx N' command + * abis_nm: fix erroneous use of LOGPC() instead of LOGP() + * abis_nm: fix msgb memleak in _abis_nm_sendmsg() + * abis_nm: LOGPFOH()/DEBUGPFOH(): remove redundant context info + * abis_nm: abis_nm_get_ts(): use LOGPFOH() instead of generic LOGP() + * abis_nm: use btstype2str() in abis_nm_rcvmsg_manuf() + * abis_nm: use DEBUGPFOH() in abis_nm_rx_sw_act_req() + * abis_nm: use LOGPFOH()/DEBUGPFOH() in parse_attr_resp_info_unreported() + * abis_nm: improve logging message in abis_nm_get_attr() + * generate_ma_for_ts(): simplify MA bit-mask computation + * vty: fix unreacheable code / wrong check in lchan_act_all_trx() + * RSL/BSSAP: fix: properly convert between RSL Link ID and DLCI + * vty: add attributes to VTY commands indicating when they apply + * bts: move rate counter / stat item definitions from *.h to *.c + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * vty: add reminder messages about the radio link timeout + * gsm_08_08: fix NULL pointer dereference in bsc_cm_update() + * NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED + * vty: add new attribute for vendor-specific commands + * abis_rsl: turn rsl_msgb_alloc() a macro and move it to header + * power_control: add new structures and default parameters + * power_control: add encoding/init API to 'struct gsm_bts_model' + * power_control: send default parameters from bootstrap_rsl() + * power_control: add encoder for ip.access nanoBTS and OsmoBTS + * power_control: make use of MS/BS parameters in RSL messages + * power_control: add VTY commands for per-BTS configuration + * power_control: add VTY command for re-sending default parameters + * power_control: add VTY command to set static / maximum BS Power + * power_control: reflect MS/BS Power difference in the VTY prompt + * vty: cosmetic: make all 'struct cmd_node' definitions static + * power_control: encoding of H_REQAVE and H_REQT for ip.access + * power_control: fix swapped lower/upper RxQual threshold values + * power_control: enable dynamic MS power control for osmo-bts + * power_control: vty: some commands are not vendor specific + * vty: fix NULL-pointer dereference in cfg_bts_rep_dl_facch() + * power_control: vty: do not print 'no (rxlev-avg|rxqual-avg)' + * vty: join UL/DL SACCH repetition commands together + * vty: fix wrong attributes for UL/DL ACCH repetition commands + * ericsson_rbs2000: fix unreachable code in inp_sig_cb() + * power_control: add documentation on available configuration params + * manuals: fix a duplicate line in the description of DTXu + * manuals: fix a typo: s/DTS/DTX/ + * power_control: cosmetic changes and fixes to the documentation + * power_control: add increase / reduce step size recommendations + * vty: use 'const' for *nsvc in config_write_bts_gprs() + * vty: fix writing empty IP address for unconfigured NSVCs + * power_control: fix: properly initialize per-lchan BS power + * vty: fix 'codec-list' command: check all given arguments first + * gsm_data: return early if MS Power class remains the same + * assignment_fsm: assert the result of conn_get_bts() + * power_control: check BTS model in cfg_power_ctrl_avg_osmo_ewma() + * power_control: enable Uplink DPC by default if format is known + * power_control: make P_CON_INTERVAL parameter configurable + * abis_nm: enrich debug messages with contextual info + + [ Pau Espin Pedrol ] + * bssap: Avoid logging error if no optional Global Call Ref IE received + * bsc: Allow setting negative nominal tx power through VTY + * Avoid selecting channels from administratively locked trx + * bsc_main: Improve log line on Lost E1 link + * bsc_main: Use LOG_TRX in log line + * ipaccess_sign_link_up: Log sign_link type + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * gsm_data.h: Drop duplicated include stdint.h + * Fix trailing whitespace in several files + * ipaccess_nanobts: Log ipaccess_sign_link_down event + * Move struct gsm_bts: gsm_data.* => bts.* + * bts: Drop duplicated function to get trx by number + * Move struct gsm_bts_trx: gsm-data.* => bts_trx.* + * Move gsm_bts_{trx_}set_system_infos APIs to bts{_trx}.* + * Move acc_ramp_init inside gsm_bts_alloc + * configure.ac: Fix trailing whitespace + * doc: Copy {bsc,bts}.adoc from osmo-gsm-manuals + * {bts,bsc}.adoc: Drop deprecated OsmoNITB references + * rename files acc_ramp.* -> acc.c* + * Introduce support for ACC subset rotation + * Introduce support for ACC ramping during whole BTS life cycle + * Support setting rt-prio and cpu-affinity mask through VTY + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * ctrl: Fix CTRL TRAP for {msc.X,msc_)connection_status not sent + * acc_test: Print allowed ACC from t2 and t3 + * acc: Fix ACC rotate barring highest ACCs too quickly during wraparound + * tests: acc_test: Test more rotating scenarios + * Allow storing IPv6 address strings in BSSAP structs + * vty: Hide show running-config ACC ramping params if not enabled + * Fail on invalid IP addresses passed to IPACC MDCX + * Fix creating MGCP proxy socket if MGW listens on an IPv6 address + * lchan_rtp_fsm: Deferr IPACC MDCX after BTS side MGCP MDCX + * oml: Fix premature Opstart to Radio Carrier + * bssap: Use new DTAP DLCI helper fields from libosmocore + * abis_nm: Log Rx Change Administrative State ACK + * abis_nm: Log no state change detected + * abis_nm: Remove duplicated log line + * cosmetic: tests/ctrl_test_runner.py: Fix trailing whitespace + * ipa oml: tx OPSTART after unlocking, not before + * contrib/jenkins: Enable parallel make in make distcheck + * Set all NM OML objects to Locked by default + * Introduce NM BTS Site Manager FSM + * Introduce NM BTS FSM + * Introduce NM BaseBand Transceiver FSM + * Introduce NM RadioCarrier FSM + * Introduce Radio Channel FSM + * OML: Stay compatible with older osmo-bts versions + * abis_nm: Log Opstart NACK with error loglevel + * ipa: Fix use of null pointer in log macro + * nm_channel_fsm: Fix innocuous transition not permitted log error + * main: generate coredump and exit upon SIGABRT received + * ipaccess-proxy: generate coredump and exit upon SIGABRT received + * Store GPRS MOs directly under BTS SiteMgr object + * nm_bts_sm_fsm: Fix peer_has_no_avstate_offline not applied for nanobts + * Introduce NM GPRS NSE FSM + * Introduce NM GPRS CELL FSM + * abis_nm: Simplify param passing to abis_nm_rx_get_attr_resp() + * Handle BTS/BBTRANSC Get Attributes (Ack) in NM FSMs + * Fix typo in function nanobts_attr_nsvc_get + * oml: Delay configuring NSVC until BTS features are negotiated + * gsm_lchan_name: assert on NULL lchan + * Use rest_octets functionalities from libosmocore + * gitignore: Ignore *~ + * doc: handover: Fix malformed table + * Introduce Neighbor Resolution Service + * cosmetic: doc: wrap line too long + * cosmetic: bts-sysmo: Fix whitespace indentation + * Allow configuring SI13 CCN_ACTIVE bit from VTY, enable by default on osmo-bts + * Introduce VTY cmd to configure Alpha in SI13 + * Move bts_ident_key to neighbor_ident.c + * Fix neigh resolution service on local neighbours + * SI13: Enable sending GPRS Cell Options Extension Information on GPRS-only BTS + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * tests/Makefile.am: allow running only one VTY test + * osmo-bsc/bsc_vty: set default gprs cell bvci to 2 + * osmo-bsc/bsc_vty: fail on get_amr_from_arg error + * osmo-bsc-minimal.cfg: fix codec-list + * main: exit on mutually exclusive codecs settings + * abis_nm.c: rx_fail_evt_rep: fix sd.bts + * abis_nm: move fail report parsing to extra func + * VTY: add show bts failure report + * VTY: let all descriptions end in \n + * VTY: regenerate bsc_vty_reference.xml + * timers: T->X: 23002, 23004, 23005, 23006 + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * lchan_fsm, lchan_rtp_fsm: make all timers configurable + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Neels Hofmeyr ] + * manual: add "Multiple Instances" section, akin to other manuals + * manual: add SCCP/M3UA section from common chapters + * manual: add SCCPlite section + * manual: fix config example typo 'msc-addr' + * manuals: update bsc_vty_reference.xml + * deprecate 'msc' / 'ip.access rtp-base ' + * cosmetic: put comment back at proper place in bsc_vty.c + * drop IMSI filter and libfilter completely + * drop CC 'local-prefix' feature + * code cleanup: absorb complete_layer3() into bsc_compl_l3() + * drop all BSC originated USSD notification features + * doc/examples: remove deprecated ussd text config + * drop MSC types "local" vs "normal" + * flatten: move network->bsc_data->* to network->* + * CTRL: determine MSC connection status from RESET-ACK, not AS_ACTIVE + * create only one SCCP user per SCCP instance + * cosmetic: tweak rc type of is_cm_service_for_emerg() + * is_cm_service_for_emerg(): return false, not 0 + * gsm0408_test.c: drop test_mi_functionality() + * refactor bsc_find_msc()'s round-robin + * add osmo-bsc --vty-ref-xml: dump VTY ref XML to stdout + * manuals: generate vty reference xml at build time + * osmo-bsc main: exit on cmdline option error + * remove extract_sub(), add bsc_subscr_find_or_create_by_mi() + * use osmo_mobile_identity API everywhere + * tweak log category for Compl L3 error + * MSC pooling: make NRI mappings VTY configurable + * MSC pooling: implement NAS node selection by NRI from TMSI + * MSC pooling: LU: ignore TMSI NRI from a different PLMN + * MSC pooling: add 'no allow-attach' for MSC off-loading + * mscpool: add user manual chapter + * vty: add 'mscpool roundrobin next' for ttcn3 tests + * log: add MSC number to bsc_subscr_conn_fsm id + * debug: log about matching Paging Response to earlier Paging + * MSC pooling: add rate counters + * merge files: absorb osmo_bsc_vty.c into bsc_vty.c + * vty: hide 'mscpool roundrobin next' + * fix segfault introduced by recent segfault fix + * create ASP+AS only once per cs7 instance + * si2quater: fix budget calculation for multiple EARFCNs + * SI2quater: allow storing 48 EARFCNs + * RR Release Cell selection IE: fix repeated EARFCNs encoding + * RR Channel Release: pass Cause code from BSSMAP Clear to the BTS + * propagate RSL error cause codes to RR Channel Release cause + * fix CBSP server: actually open the srv_link + * handover_test.c: add test case 29: TCH/F -> TCH/H + * handover_test.c: typo s/more/less in test 19 description + * hodec2: fix logging of requirements flags + * hodec2 congestion: consider only congested pchan types + * hodec2: do not keep candidates with zero requirements met + * hodec2: log requirements of best candidate, log rxlev in dBm + * cosmetic: bscon: use GSM48_RR_CAUSE_NORMAL instead of 0 + * gscon timeout: use proper cause code for lchan release + * debug log: add RR Release cause code to the log + * info, error log: show MSC nr for new conn + * mscpool: fix refcount leak for unusual case of no bts + * CBSP: on RESET, also clear the etws_timer, and stop ETWS PN broadcast + * CBSP: log CBSP RESET on NOTICE + * CBSP: rewrite the CBSP link setup and 'cbc' VTY section + * CBSP: add local bind to client mode + * cosmetic: use local var in handover_start_intra_bsc() + * cosmetic: dissolve error-goto with single source in handover_start() + * ho counters: count invalid target cell as 'error', not 'no_channel' + * fix 'handover:*' counters: add missing / move increments + * fix 'handover:*' counters: remove bogus increments + * fix HO inter-BSC-IN target bts for counters + * add {BTS,BSC}_CTR_INTER_BSC_HO_OUT_FAILED for RR HO Failure + * bssap: do not send a Clear Request after a Clear Command + * handover_fsm: signal Clear from gscon, for proper HO result counts + * handover: fix detection for ambiguous HO neighbor ident + * CBSP: fix link startup when enabled in config file + * drop some unused members and function decls + * CBSP: adjust manual to reflect new 'cbc' VTY config + * CBSP VTY: re-add legacy cbc config for backwards compat + * dissolve bsc_grace_paging_request() + * drop bsc_subscr.lac + * drop unused Tdef for 992427 + * add timer.vty + * clean up timer definitions: introduce groups, move some T to X + * tests: add missing *.vty to EXTRA_DIST + * log MSC nr for opening new A conn + * remove unused signature gsm48_handle_paging_resp() + * gscon_bssmap_clear(): guard against NULL msc + * compl l3: separate paging handling from bsc_scan_bts_msg() + * compl l3: parse Mobile Identity once + * compl l3: cosmetics around Create Layer 3 + * compl l3: allocate conn in gsm_08_08.c, not gsm_04_08_rr.c + * compl l3: populate conn's bsc subscr from MI + * compl l3: move Paging Response handling out of bsc_find_msc() + * compl l3: move all message parsing out of bsc_find_msc() + * refactor paging: introduce bsc_paging_params + * refactor paging: introduce bsc_paging_start() + * refactor paging: add bsc_subscr to bsc_paging_params + * LCS: add paging reason, return in paging_request_stop() + * introduce osmo_use_count for bsc_subscr + * bsc_subscr_name: print both IMSI and TMSI + * cosmetic: fix naming of GSCON_EV_A_CONN_REQ -> GSCON_EV_MO_COMPL_L3 + * LCS: implement re-use of existing A-interface conn + * LCS: SCCP next conn id: prepare Lb-interface + * LCS: implement the bulk of Location Services + * LCS: allow RSL EST IND during GSCON_ST_ACTIVE + * remove unused osmo_bsc_reset.h + * add doc/location_services_ta.msc + * BSSMAP RESET: generalize a_reset FSM + * BSSMAP RESET: move cancel-paging call to osmo_bsc_sigtran_reset() + * BSSMAP RESET: move RESET-ACK into reset fsm + * BSSMAP RESET: tweak logging + * BSSMAP RESET: also accept conn cfm events during ST_DISC + * LCS: disable Lb interface by default, add vty 'smlc' / 'enable' + * add smlc.vty test + * LCS: add proper BSSMAP-LE RESET re-using new generalized reset FSM + * LCS: Lb startup: no need to re-use existing SCCP user + * drop features 'core-location-area-code' and 'core-cell-identity' + * manual: describe LCS and Lb interface + * fix missing RR release when there is no MSC + * add fixme comment for OS#3833 + * minor code dup: smlc_set_cs7_instance() + * handover vty doc: explain rxqual values + * handover_test: fix comment + * handover_test prep: move arfcn into create_bts() + * handover_test prep: move generate_si() into create_bts() + * handover_test prep: allow arbitrary timeslots in create_bts() code + * handover_test prep: allow configuring several trx in create_bts() + * handover_test prep: rename 'create-bts' to 'create-n-bts' + * handover_test cosmetic: eliminate bts array and bts_num from main() + * handover_test: allow arbitrary timeslot config and multiple TRX + * handover test: fix dyn ts: set pchan_is on act / rel + * handover test: add 'expect-ts-use' to clarify tests + * handover_test: add 'set-ts-use' + * handover_test: change 'meas-rep' params to bts-trx-ts-ss nr + * handover_test: drop secondary array of lchans + * handover test: add test 30: de-congest TCH/F by moving to dyn TS TCH/H + * handover_test: add test 31: TCH/H: re-use dyn TS + * fix TCH/H allocation: use half occupied dyn TS instead of switching more dyn TS + * hodec 2: prep: common pick_better_lchan_to_move() function + * hodec 2: favor moving dyn TS + * handover test 30: play through filling up all lchans + * handover_test: add test 32: half used TCH/H on dyn TS + * fix AMR start-mode auto: reflect proper ICMI in MultiRate Config IE + * AMR start-mode: send proper smod bits + * AMR start-mode auto: send smod bits as zero + * ctrl_test_runner.py: remove per-test startup delay + * hodec 2: prefer moving TCH/H from half-used dyn TS + * handover_test: implement as VTY shell + * handover_test: log sending ho complete + * handover_test: send ho detection + * handover_test: adjust logging for reproducability + * handover_test: set a fake osmo_mgcpc_ep_ci pointer + * handover_test: rename test scripts from numbers to names + * handover_test: gitignore + * tweak handover_tests.sh + * handover_test: cosmetic cfg simplifications in 5 tests + * handover_test: fix test_congestion.ho_vty meas-rep + * handover_test.c: properly release lchans in set-ts-use + * hodec2: cosmetic: add dBm unit to rxval logging + * hodec2: code dup / cosmetics + * handover_test: add 'meas-rep repeat N' + * handover_test: add test_congestion_favor_best_target_rxlev.ho_vty + * handover_test: add AMR TCH/H->/F tests, showing a bug + * handover_test: show ineffective intra-cell choice + * handover_test: add test_congestion_intra_vs_inter_cell.ho_vty + * hodec2: clarify current and target rxlev per candidate + * hodec2: cosmetic: clarify afs_bias, simplify pick_better_lchan_to_move() + * hodec2: fix candidate choices in congestion check + * handover_test: include ack-chan in expect-chan + * handover_test: safeguard against unhandled chan req + * handover_test: saner chan act handling + * handover_test: saner ho request handling + * handover_test: vty echo + * handover_test: show a bug: add test_congestion_no_oscillation.ho_vty + * hodec2: cosmetic: clarify ho_candidate.{current,target} + * hodec2: reduce check_requirements() args + * hodec2: add ho_candidate.{current,target}.free_tch + * handover_test: add lchan wildcards to meas-rep cmd + * handover_test: show bug: add test_balance_congestion_tchf_tchh.ho_vty + * hodec2: fix congestion oscillation bug + * handover_test: add test_balance_congestion_by_percentage.ho_vty + * hodec2: to balance congestion, use overload percent + * handover_test: enhance test_balance_congestion_by_percentage.ho_vty + * handover_tests.sh: update stdout/stderr only on capital -U arg + * fix for test_dyn_ts_favor_moving_half_used_tch_h.ho_vty + * cosmetic: in a ho test, use '*' instead of pdch + * show bug: add test_dyn_ts_congestion_tch_f_vs_tch_h.ho_vty + * fixate test_dyn_ts_congestion_tch_f_vs_tch_h.ho_vty + * hodec2: fix congestion resolution on dyn TS + * add test_dyn_ts_congestion_tch_f_vs_tch_h_2.ho_vty + * lchan_avail(): omit logging for handover decision 2 + * show bug: add test_dyn_ts_balance_congestion.ho_vty + * hodec2: fix congestion balancing on dyn TS + * show bug: add test_dyn_ts_amr_tch_{f,h}_to_{h,f}_congestion_assignment_2.ho_vty + * hodec2: fix intra-cell congestion balancing with source lchan on dyn TS + * lchan assignment when RTP is set up: don't break on Mode Modify + * rename lchan->rqd_ta to last_ta + * lchan activation: indicate whether TA is known + + [ Keith ] + * Meas Tools: Avoid OSMO_ASSERT due to uninitialised logging. + * Meas Tools: Avoid unusable terminal in case of error on osmo_sock_init + * Meas Tools, Avoid compiler format warnings + * Disallow changing the type of an existing BTS from the vty + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Sylvain Munaut ] + * om2k: Add definitions for the TG object + * om2k: Allow TG and MCTR to be manipulated via VTY + * om2k: Allow the CON configuration request to be triggered via VTY + * om2k: Add VTY command to allow TX of arbitrary message for testing + * om2k: Don't use slashes in FSM IDs and use dashes instead + * om2k: Fix TS channel config payload for non-superchannel case + * om2k: Fix type of msg_type in abis_om2k_tx_simple + * om2k: Acknowledge the HW Infos Reports + * om2k: Acknowledge the unknown MCTR messages we get from time to time + * om2k: Properly name message 0x0136, found to be MCTR Statistics Report + * om2k: Use the "from config" TS config to setup OM objects + * om2k: Dispatch TS_EV_OML_READY to TS FSM only when it's actually ready + * om2k: Fix the frequency specifier for TX/RX/TS conf requests + * bts_ericsson_rbs2000: Init all the TRX, not just C0 + * bts_ericsson_rbs2000: Whitelist the E1d input driver + * om2k: Add option to limit OML version during negotiation + * om2k: Rename MCTR config request constants for consistency + * om2k: Add support for MCTR configuration + * om2k: Properly update the 'fake' 12.21 states using OM2000 status + * om2k: Wait for OM TRX links to stabilize before trying to bring up TRX + * chan_alloc: Don't re-invent trx_is_usable and use existing helper + * gsm_data: Update trx_is_usable for ericsson BTS + * om2k: Fix invalid use of linked list when building hopping freq list + * bts_nokia_site: Fake 12.21 OM objet state as "OK" when boot is done + + [ Alexander Chemeris ] + * ctrs: Correctly count load total for dynamic timeslots. + * stats: Report per channel type load to statsd counters. + * stats: Remove dots from the end of stats descriptions. + * Fix indent whitespace and log message. + * stats: Fix stat group index for BTS stats. + * Fix a comment for the handle_unitdata_from_msc() function. + * chan_alloc: Add comments for the *_chan_load() functions. + * osmo_bsc_sigtran: Fix a SSCP-> SCCP typo in a comment + * stats: Add a stats gauge for the MSC links count. + * stats: report a number of configured BTS to a stats gauge. + * stats: Add counters for received BSSMAP messages. + * stats: Export connected OML/RSL links count per BTS. + * a_reset: Rename SIGTRAN connection to BSSMAP MSC assocation in log messages + * stats: Fix Rx DTAP error stat description + * bsc_subscr_conn_fsm: Fix a typo in the comment life->live + * lchan: Allow transition from BORKEN state to WAIT_RF_RELEASE_ACK + * timeslot_fsm: Allow PDCH_ACT_ACK in BORKEN state. + * stats: Only dereference a connection pointer after checking for NULL. + * handover_test: Properly allocate MSC data struct. + * stats: Add counters for Tx BSSMAP messages. + * stats: Rename BSSMAP Rx message counters to match Tx ones. + * bsc_vty: Coding style fix - brackets around a complex if/else + * log: Fix "Paging request failed" logging level + * log: Adjust "new SIGTRAN connection" logging level + * bssmap: Ignore repeated BSSMAP RESET ACK messages. + * log: Demote "CHAN RQD: reason" to INFO + * log: Demote "SAPI=%u ESTABLISH CONFIRM" message from ERROR to DEBUG. + * borken: Recover from more TS borken states. + * stats: Add counters and gauges for BORKEN lchans/TS + * stats: Add a BTS/BSC counter PAGING_NO_ACTIVE_PAGING. + * stats: Correctly count lchans under BORKEN TS. + * bssap: Handle BSSMAP CONFUSION message. + * Fix crash in bsc_patch_mm_info() + * bsc_patch: Don't even parse MM INFO if TZ patching is not enabled. + * bsc_subscr_conn_fsm: Fix crash in gscon_forget_lchan() + * stats: Count paging requests flushed due to MSC Reset. + * Return 0 from gsm0408_rcvmsg() if SCCP link is already closed. + * paging: Remove obsolete comment. + * chan_alloc: Fix typo in a comment. + * timeslot_fsm: Name TS FSM instances on allocation. + + [ Daniel Willmann ] + * osmo-bsc: Use designated initializer in bts_stat_desc + * gsm_data.h: Remove period at end of counter description + * abis_rsl: Count successful channel requests + * Count assignment rates per BTS as well + * Remove punctuation in counter description + * Count handover per BTS as well as per BSC + * Count intra-cell and intra-bsc handover separately + * Add bts counters to count BTS events where we don't have a bts + * configure.ac: Require python3 for ext_tests + + [ Alexander Couzens ] + * gsm_data: always set spare bits in channel description + * gsm 04.08: encode the LTE neighbors measurement bandwindth in Channel Release + * gsm 04.08: correct calculate the Cell Selection Indicator after release of all TCH and SDCCH + * osmo-bsc: fix a crash when receiving a RACH LOAD IND with 0 + * abis_nm: abis_nm_perform_test: fix a potential null deref + * pcu_sock: use tn as variable name to improve readability + * pcuif_proto: protocol 9: add missing fields + * oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG + * pcuif_proto: version 10: add frequency hopping parameters + * pcuif_proto: version 10: add support for IPv6 NSVCs + * bsc_vty: cfg_bts_gprs_nsvc_rip: add missing breaks + * bsc_vty: parse the return code to make coverity happy + * bts_ipaccess_nanobts: check if msgb_alloc fails + * sysmobts: expect feature IPV6_NSVC + * Introduce NM GPRS NSVC FSM + + [ Michael Iedema ] + * stats: Add granularity to SDCCH/TCH/LU activity. + * stats: Add granularity to chan:rf_fail stat. + * cosmetic: shorten deref chains where possible + * stats: add SIGN/SPEECH assignment subcategories + + -- Pau Espin Pedrol Tue, 23 Feb 2021 18:43:04 +0100 + osmo-bsc (1.6.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/debian/control b/debian/control index e3af0fb..09dcd04 100644 --- a/debian/control +++ b/debian/control @@ -12,13 +12,13 @@ python3-minimal, libcdk5-dev, libtalloc-dev, - libosmocore-dev (>= 1.4.0), - libosmo-sccp-dev (>= 0.10.0), - libosmo-sigtran-dev (>= 0.10.0), - libosmo-abis-dev (>= 0.6.0), - libosmo-netif-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.6.0), - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + libosmo-sccp-dev (>= 1.4.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.8.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc.git Vcs-Browser: https://git.osmocom.org/osmo-bsc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0afcb06f8a7466f98cac26ff939a3813d4add1cc Gerrit-Change-Number: 23067 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:05:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 18:05:56 +0000 Subject: Change in osmo-bsc[master]: remove obsolete dependency on libosmo-sccp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23068 ) Change subject: remove obsolete dependency on libosmo-sccp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Gerrit-Change-Number: 23068 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 18:05:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:09:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 18:09:06 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Avoid re-defining same global variable twice References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23069 ) Change subject: hnbgw: Avoid re-defining same global variable twice ...................................................................... hnbgw: Avoid re-defining same global variable twice This global variable is already defined in iu_client.c provided by libosmo-ranap (and used by libasn1c). Fixes ASan warning at starutp. Change-Id: I7dbae83ce0dc4ac25dc10879e223280414f7b561 --- M src/hnbgw.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/69/23069/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index 5e01b63..e21ec4a 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -72,7 +72,6 @@ "There is NO WARRANTY, to the extent permitted by law.\r\n"; static void *tall_hnb_ctx; -void *talloc_asn1_ctx; static struct hnb_gw *g_hnb_gw; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7dbae83ce0dc4ac25dc10879e223280414f7b561 Gerrit-Change-Number: 23069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:17:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 18:17:47 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Avoid re-defining same global variable twice In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23069 ) Change subject: hnbgw: Avoid re-defining same global variable twice ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7dbae83ce0dc4ac25dc10879e223280414f7b561 Gerrit-Change-Number: 23069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 18:17:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:17:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 18:17:53 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Avoid re-defining same global variable twice In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23069 ) Change subject: hnbgw: Avoid re-defining same global variable twice ...................................................................... hnbgw: Avoid re-defining same global variable twice This global variable is already defined in iu_client.c provided by libosmo-ranap (and used by libasn1c). Fixes ASan warning at starutp. Change-Id: I7dbae83ce0dc4ac25dc10879e223280414f7b561 --- M src/hnbgw.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index 5e01b63..e21ec4a 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -72,7 +72,6 @@ "There is NO WARRANTY, to the extent permitted by law.\r\n"; static void *tall_hnb_ctx; -void *talloc_asn1_ctx; static struct hnb_gw *g_hnb_gw; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7dbae83ce0dc4ac25dc10879e223280414f7b561 Gerrit-Change-Number: 23069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 18:55:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 18:55:09 +0000 Subject: Change in osmo-iuh[master]: Workaround ASan report memleak during call to --vty-ref-xml References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23070 ) Change subject: Workaround ASan report memleak during call to --vty-ref-xml ...................................................................... Workaround ASan report memleak during call to --vty-ref-xml For some unknown reason, using size=0 instead of 1 makes LeakSanitizer report a leak when calling osmo-hnbgw --vty-ref-xml: """ ==19857==ERROR: LeakSanitizer: detected memory leaks Direct leak of 96 byte(s) in 1 object(s) allocated from: #0 0x7f083b4d0d28 in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.3+0xc1d28) #1 0x7f083a8e5661 in talloc_named_const (/usr/lib/x86_64-linux-gnu/libtalloc.so.2+0x6661) """ It seems iu_client.c is already using size=1. Change-Id: I383653c981e68a053babd33dee1f0df8731752b0 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/70/23070/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index e21ec4a..965e8a4 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -576,7 +576,7 @@ int rc; tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); - talloc_asn1_ctx = talloc_named_const(NULL, 0, "asn1_context"); + talloc_asn1_ctx = talloc_named_const(NULL, 1, "asn1_context"); msgb_talloc_ctx_init(tall_hnb_ctx, 0); g_hnb_gw = hnb_gw_create(tall_hnb_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I383653c981e68a053babd33dee1f0df8731752b0 Gerrit-Change-Number: 23070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:05:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:05:14 +0000 Subject: Change in osmo-iuh[master]: Workaround ASan report memleak during call to --vty-ref-xml In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23070 ) Change subject: Workaround ASan report memleak during call to --vty-ref-xml ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I383653c981e68a053babd33dee1f0df8731752b0 Gerrit-Change-Number: 23070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 19:05:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:05:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:05:17 +0000 Subject: Change in osmo-iuh[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23062 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia1e978ad9139c41368cd2720c339e1738d345c4a Gerrit-Change-Number: 23062 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 19:05:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:06:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:06:37 +0000 Subject: Change in osmo-iuh[master]: Workaround ASan report memleak during call to --vty-ref-xml In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23070 ) Change subject: Workaround ASan report memleak during call to --vty-ref-xml ...................................................................... Workaround ASan report memleak during call to --vty-ref-xml For some unknown reason, using size=0 instead of 1 makes LeakSanitizer report a leak when calling osmo-hnbgw --vty-ref-xml: """ ==19857==ERROR: LeakSanitizer: detected memory leaks Direct leak of 96 byte(s) in 1 object(s) allocated from: #0 0x7f083b4d0d28 in malloc (/usr/lib/x86_64-linux-gnu/libasan.so.3+0xc1d28) #1 0x7f083a8e5661 in talloc_named_const (/usr/lib/x86_64-linux-gnu/libtalloc.so.2+0x6661) """ It seems iu_client.c is already using size=1. Change-Id: I383653c981e68a053babd33dee1f0df8731752b0 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index e21ec4a..965e8a4 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -576,7 +576,7 @@ int rc; tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); - talloc_asn1_ctx = talloc_named_const(NULL, 0, "asn1_context"); + talloc_asn1_ctx = talloc_named_const(NULL, 1, "asn1_context"); msgb_talloc_ctx_init(tall_hnb_ctx, 0); g_hnb_gw = hnb_gw_create(tall_hnb_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I383653c981e68a053babd33dee1f0df8731752b0 Gerrit-Change-Number: 23070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:06:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:06:49 +0000 Subject: Change in osmo-iuh[master]: manuals: generate vty reference xml at build time In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23062 ) Change subject: manuals: generate vty reference xml at build time ...................................................................... manuals: generate vty reference xml at build time Remove hnbgw_vty_reference from the source tree. In manuals/Makefile.am use the new BUILT_REFERENCE_XML feature recently added to osmo-gsm-manuals, and add a build target to generate the XML using the new osmo-hnbgw --vty-ref-xml cmdline switch. Change-Id: Ia1e978ad9139c41368cd2720c339e1738d345c4a Depends: I613d692328050a036d05b49a436ab495fc2087ba Related: OS#5041 --- M doc/manuals/Makefile.am D doc/manuals/vty/hnbgw_vty_reference.xml 2 files changed, 6 insertions(+), 1,535 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 7a76e90..595f157 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -12,6 +12,12 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohnbgw-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/hnbgw_vty_reference.xml + $(builddir)/vty/hnbgw_vty_reference.xml: $(top_builddir)/src/osmo-hnbgw + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-hnbgw --vty-ref-xml > $@ + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc OSMO_REPOSITORY = osmo-hnbgw diff --git a/doc/manuals/vty/hnbgw_vty_reference.xml b/doc/manuals/vty/hnbgw_vty_reference.xml deleted file mode 100644 index 4046636..0000000 --- a/doc/manuals/vty/hnbgw_vty_reference.xml +++ /dev/null @@ -1,1535 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hnbgw - - - - - - - - - - - - - - - - - - - - - - - - config-hnbgw-iuh - - - - - - - - - - - - - - - - - - - - - - config-hnbgw-iucs - - - - - - - - - config-hnbgw-iups - - - - - - - - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia1e978ad9139c41368cd2720c339e1738d345c4a Gerrit-Change-Number: 23062 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:12:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:12:27 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E49-356f-dirty_=E2=86=92_0=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23071 ) Change subject: Bump version: 0.6.0.49-356f-dirty ? 0.7.0 ...................................................................... Bump version: 0.6.0.49-356f-dirty ? 0.7.0 Change-Id: I3b592c39646a77681efde5debb5ac2a844208949 --- M configure.ac M contrib/osmo-iuh.spec.in M debian/changelog M debian/control M src/Makefile.am 5 files changed, 89 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/71/23071/1 diff --git a/configure.ac b/configure.ac index d82c78f..e2d9f56 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_PROG_CC AC_PROG_INSTALL -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) @@ -42,12 +42,12 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.12.0) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.3.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.10.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 1.4.0) PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 82046fe..c8bdea2 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -30,13 +30,13 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libasn1c) >= 0.9.30 -BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmocore) >= 0.12.0 -BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 0.12.0 -BuildRequires: pkgconfig(libosmovty) >= 0.12.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index f59c49e..62ce110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,72 @@ +osmo-iuh (0.7.0) unstable; urgency=medium + + [ Martin Hauke ] + * tests: Missing return statement + + [ Pau Espin Pedrol ] + * tests/hnb-test-ranap.c: Fix wrong printf format + * tests/test-ranap.c: Fix wrong printf format + * Fix compiler warning on signedness of char ptr using OCTET_STRING_fromBuf() + * hnbgw_vty.c: Drop unusued variables + * tests: Fix trailing whitespace + * Fix OneDefinitionRule Asan violation in tests and osmo-hnbgw + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * hnbgw: Mark SCTP conn as NODELAY + * contrib/jenkins: Enable parallel make in make distcheck + * tests/hnb-test-ranap: Fix incorrect pointer type cast + * tests/hnb-test: Drop unused variables + * tests/hnb-test: Fix signedness of imsi_buf + * tests/hnb-test: check return code of hnbap_encode_ueregisterrequesties + * tests/hnb-test-ranap: Fix incorrect signedness in pointer + * tests/hnb-test-ranap: Fix missing include for ranap_bcd_decode + * tests/hnb-test: Fix uninitialized use of rc variable + * tests/hnb-test: Fix signedness of assigned pointer + * tests/hnb-test: Initialize logging with existing struct log_info + * tests/hnb-test: Disable building unsued code + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + * hnbgw: Avoid re-defining same global variable twice + * Workaround ASan report memleak during call to --vty-ref-xml + + [ Neels Hofmeyr ] + * manual: add "Configuring Primary Links" and "Multiple instances" + * manual: link to new common cs7-config.adoc + + [ Vadim Yanitskiy ] + * tests/test-helpers: fix some -Wpointer-sign warnings reported by GCC + * tests/test-helpers: fix endianness: do not print uint32_t as raw bytes + * tests/test-ranap: cosmetic: remove unused variable 'rc' + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Philipp Maier ] + * hnbgw: do not use LOGL_DEBUG as default loglevel + + [ Harald Welte ] + * Fix compilation with gcc-10 + * Provide more context when logging "Error in ANY_fromType_aper" + * hnbgw: use OSMO_STRLCPY_ARRAY() instead of open coding it + * hnbgw: Introduce LOGHNB() macro for log context information + * debian: Actually build manuals; add osmo-hnbgw-doc package + * configure.ac: Ensure netinet/sctp.h is present + * hnbgw: Use LOGHNB() to add log context information to log lines + * ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded + * ranap_msg_factory: Fix LOGP statements + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 20:11:59 +0100 + osmo-iuh (0.6.0) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/debian/control b/debian/control index d1805de..236e853 100644 --- a/debian/control +++ b/debian/control @@ -11,10 +11,10 @@ git, libasn1c-dev, libsctp-dev, - libosmocore-dev (>= 0.12.0), - libosmo-netif-dev (>= 0.3.0), - libosmo-sigtran-dev (>= 0.10.0), - osmo-gsm-manuals-dev (>= 1.0.0), + libosmocore-dev (>= 1.5.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-sigtran-dev (>= 1.4.0), + osmo-gsm-manuals-dev (>= 1.1.0), python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-iuh.git diff --git a/src/Makefile.am b/src/Makefile.am index 1c3a64a..524f7b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,7 @@ # build the shared RANAP + SABP library # -RANAP_LIBVERSION=3:0:0 +RANAP_LIBVERSION=4:0:1 SABP_LIBVERSION=0:0:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) @@ -73,7 +73,7 @@ libosmo_sabp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SABP_LIBVERSION) libosmo_sabp_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) sabp/libosmo-asn1-sabp.la -libosmo_sabp_la_SOURCES = sabp_common.c sabp_encoder.c sabp_decoder.c +libosmo_sabp_la_SOURCES = sabp_common.c sabp_encoder.c sabp_decoder.c # build the actual HomeNodeB gateway -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3b592c39646a77681efde5debb5ac2a844208949 Gerrit-Change-Number: 23071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:19:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:19:02 +0000 Subject: Change in osmo-bsc[master]: remove obsolete dependency on libosmo-sccp In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 to look at the new patch set (#2). Change subject: remove obsolete dependency on libosmo-sccp ...................................................................... remove obsolete dependency on libosmo-sccp We only use libosmo-sigtran these days, so we can remove the depdency to the old libosmo-sccp from osmo-bsc. We don't use LIBOSMO_SCCP_* variables in any Makefile.am, nor do we #include anywhere [anymore]. Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Related: OS#2601 --- M configure.ac M contrib/osmo-bsc.spec.in M debian/control 3 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/23068/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Gerrit-Change-Number: 23068 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:21:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:21:54 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E49-356f-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23071 ) Change subject: Bump version: 0.6.0.49-356f-dirty ? 0.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3b592c39646a77681efde5debb5ac2a844208949 Gerrit-Change-Number: 23071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 19:21:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:21:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:21:56 +0000 Subject: =?UTF-8?Q?Change_in_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E6=2E0=2E49-356f-dirty_=E2=86=92_0=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23071 ) Change subject: Bump version: 0.6.0.49-356f-dirty ? 0.7.0 ...................................................................... Bump version: 0.6.0.49-356f-dirty ? 0.7.0 Change-Id: I3b592c39646a77681efde5debb5ac2a844208949 --- M configure.ac M contrib/osmo-iuh.spec.in M debian/changelog M debian/control M src/Makefile.am 5 files changed, 89 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index d82c78f..e2d9f56 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_PROG_CC AC_PROG_INSTALL -dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], [AS_CASE(["${host_os}"], [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) @@ -42,12 +42,12 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.12.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.12.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.12.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.12.0) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.3.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.10.0) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 1.4.0) PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 82046fe..c8bdea2 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -30,13 +30,13 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libasn1c) >= 0.9.30 -BuildRequires: pkgconfig(libosmo-netif) >= 0.3.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmocore) >= 0.12.0 -BuildRequires: pkgconfig(libosmoctrl) >= 0.12.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 0.12.0 -BuildRequires: pkgconfig(libosmovty) >= 0.12.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index f59c49e..62ce110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,72 @@ +osmo-iuh (0.7.0) unstable; urgency=medium + + [ Martin Hauke ] + * tests: Missing return statement + + [ Pau Espin Pedrol ] + * tests/hnb-test-ranap.c: Fix wrong printf format + * tests/test-ranap.c: Fix wrong printf format + * Fix compiler warning on signedness of char ptr using OCTET_STRING_fromBuf() + * hnbgw_vty.c: Drop unusued variables + * tests: Fix trailing whitespace + * Fix OneDefinitionRule Asan violation in tests and osmo-hnbgw + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * hnbgw: Mark SCTP conn as NODELAY + * contrib/jenkins: Enable parallel make in make distcheck + * tests/hnb-test-ranap: Fix incorrect pointer type cast + * tests/hnb-test: Drop unused variables + * tests/hnb-test: Fix signedness of imsi_buf + * tests/hnb-test: check return code of hnbap_encode_ueregisterrequesties + * tests/hnb-test-ranap: Fix incorrect signedness in pointer + * tests/hnb-test-ranap: Fix missing include for ranap_bcd_decode + * tests/hnb-test: Fix uninitialized use of rc variable + * tests/hnb-test: Fix signedness of assigned pointer + * tests/hnb-test: Initialize logging with existing struct log_info + * tests/hnb-test: Disable building unsued code + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + * hnbgw: Avoid re-defining same global variable twice + * Workaround ASan report memleak during call to --vty-ref-xml + + [ Neels Hofmeyr ] + * manual: add "Configuring Primary Links" and "Multiple instances" + * manual: link to new common cs7-config.adoc + + [ Vadim Yanitskiy ] + * tests/test-helpers: fix some -Wpointer-sign warnings reported by GCC + * tests/test-helpers: fix endianness: do not print uint32_t as raw bytes + * tests/test-ranap: cosmetic: remove unused variable 'rc' + * debian/control: change maintainer to the Osmocom team / mailing list + * vty: use install_lib_element() and install_lib_element_ve() + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Philipp Maier ] + * hnbgw: do not use LOGL_DEBUG as default loglevel + + [ Harald Welte ] + * Fix compilation with gcc-10 + * Provide more context when logging "Error in ANY_fromType_aper" + * hnbgw: use OSMO_STRLCPY_ARRAY() instead of open coding it + * hnbgw: Introduce LOGHNB() macro for log context information + * debian: Actually build manuals; add osmo-hnbgw-doc package + * configure.ac: Ensure netinet/sctp.h is present + * hnbgw: Use LOGHNB() to add log context information to log lines + * ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded + * ranap_msg_factory: Fix LOGP statements + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Tue, 23 Feb 2021 20:11:59 +0100 + osmo-iuh (0.6.0) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/debian/control b/debian/control index d1805de..236e853 100644 --- a/debian/control +++ b/debian/control @@ -11,10 +11,10 @@ git, libasn1c-dev, libsctp-dev, - libosmocore-dev (>= 0.12.0), - libosmo-netif-dev (>= 0.3.0), - libosmo-sigtran-dev (>= 0.10.0), - osmo-gsm-manuals-dev (>= 1.0.0), + libosmocore-dev (>= 1.5.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-sigtran-dev (>= 1.4.0), + osmo-gsm-manuals-dev (>= 1.1.0), python3 Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-iuh.git diff --git a/src/Makefile.am b/src/Makefile.am index 1c3a64a..524f7b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,7 +61,7 @@ # build the shared RANAP + SABP library # -RANAP_LIBVERSION=3:0:0 +RANAP_LIBVERSION=4:0:1 SABP_LIBVERSION=0:0:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) @@ -73,7 +73,7 @@ libosmo_sabp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SABP_LIBVERSION) libosmo_sabp_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) sabp/libosmo-asn1-sabp.la -libosmo_sabp_la_SOURCES = sabp_common.c sabp_encoder.c sabp_decoder.c +libosmo_sabp_la_SOURCES = sabp_common.c sabp_encoder.c sabp_decoder.c # build the actual HomeNodeB gateway -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3b592c39646a77681efde5debb5ac2a844208949 Gerrit-Change-Number: 23071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:22:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:22:59 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: re-enable osmo-uecups References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23072 ) Change subject: osmocom-latest-packages: re-enable osmo-uecups ...................................................................... osmocom-latest-packages: re-enable osmo-uecups this should have been re-enabled since libosmocore 1.4.0 already Change-Id: I5b8789cdfff2432c8d43972e19117f9f54eaaa7f --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/23072/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 906d068..34fa55c 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -186,8 +186,7 @@ build osmo-remsim build open5gs build neocon - # re-enable after libosmcoore > 1.3.1 is released (osmo_system_nowait2) - #build osmo-uecups + build osmo-uecups build osmo-e1d build osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b8789cdfff2432c8d43972e19117f9f54eaaa7f Gerrit-Change-Number: 23072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:23:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:23:13 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E1=2E98-cad22-dirty_=E2=86=92_1=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/23073 ) Change subject: Bump version: 1.6.1.98-cad22-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.1.98-cad22-dirty ? 1.7.0 Change-Id: I1bf25c0c01efd6f93df8ac2b26868dd1579b3531 --- M TODO-RELEASE M configure.ac M contrib/osmo-msc.spec.in M debian/changelog M debian/control 5 files changed, 152 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/23073/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 036a9b9..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,8 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs -libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response -osmo-msc update version dependency to version with osmo_fd_*_{disable,enable} -osmo-msc smpp migrate to gsm_septet_pack(), available since Ib1aac538afeb0a5c76a1df472d555139a496e12e diff --git a/configure.ac b/configure.ac index ee4b33b..db7507a 100644 --- a/configure.ac +++ b/configure.ac @@ -42,16 +42,16 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.7.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.3.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/contrib/osmo-msc.spec.in b/contrib/osmo-msc.spec.in index c968d3e..d588e5b 100644 --- a/contrib/osmo-msc.spec.in +++ b/contrib/osmo-msc.spec.in @@ -35,17 +35,17 @@ BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig(dbi) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.0.0 -BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.6.0 -BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 1.1.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 1.1.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 -BuildRequires: pkgconfig(libsmpp34) >= 1.13.0 +BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.8.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libsmpp34) >= 1.14.0 #### BuildRequires: lksctp-tools-devel #### diff --git a/debian/changelog b/debian/changelog index 7b5f708..758173b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,125 @@ +osmo-msc (1.7.0) unstable; urgency=medium + + [ Keith Whyte ] + * Use GSM411_RP_* and not GSM48_CC_* + * Trivial: code simplification, return early + * vty: allow configuring db path from cfg file + * Don't Store an SMS in the database when the ESME is not Bound + + [ Pablo Neira Ayuso ] + * libmsc: SMS, Avoid premature RP-ACK to MS + + [ Vadim Yanitskiy ] + * manuals/vty: update the VTY reference to reflect recent changes + * libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr + * osmo-msc: fix: properly initialize default values for MGW timers + * msc/signal.h: remove unused (since the NiTB split up) signals + * VTY: mark 'subscriber create imsi' command as deprecated + * VTY: add osmo_tdef introspection and configuration commands + * libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 + * libmsc: move subscriber expiration timer T3212 to libvlr + * vlr: remove unused parameter 'log_level' of auth_fsm_start() + * vlr_sgs_fsm: add missing break, do not call to_null() twice + * msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() + * VTY: cosmetic: make struct cmd_node for GSMNET_NODE static + * libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() + * libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM + * libmsc/gsm_04_11.h: remove unused sms_deliver definition + * osmo-msc: use stderr to print error messages, not stdout + * libmsc/sdp: cosmetic: fix less-than-zero comparison of an unsigned value + * SMS-over-GSUP: clarify error message about unexpected MO/MT SMS + * SMS-over-GSUP: move net->sms_over_gsup check to gsm411_gsup_rx() + * SMS-over-GSUP: respond with error if net->sms_over_gsup is false + * SMS-over-GSUP: notify sender about unhandled GSUP messages + * SMS-over-GSUP: notify sender about malformed GSUP messages + * SMS-over-GSUP: notify sender in case of RPL delivery failure + * gsm_04_14: fix off-by-one error in create_gsm0414_msg() + * vty: fix vsub reference counting: call vlr_subscr_put() + * debian/control: change maintainer to the Osmocom team / mailing list + * mncc_builtin: cosmetic: fix coding style in int_mncc_recv() + * mncc_builtin: log type of unhandled message in int_mncc_recv() + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * submit_to_sms(): fix the use of deprecated gsm_septets2octets() + * ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() + * fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request + + [ Neels Hofmeyr ] + * fix segfault: unsolicited Paging Response + * manual: add missing mention of MGCP in "Multiple instances" + * manual: Multiple Instances: tweak MNCC, add missing SGs doc + * manual: link to new common cs7-config.adoc, remove some dup of that + * vlr_subscr_rx_id_resp(): dont assert on received MI type + * msc_vlr_test_gsm_ciph.c: fix IMEISV MI: even number of digits, clear odd bit + * use new osmo_mobile_identity API everywhere + * add rudimentary NRI support for MSC pooling + * add osmo-msc --vty-ref-xml: dump VTY ref XML to stdout + * add comments to clarify some complete l3 details + * vty 'show connection': show msc_a->via_cell instead of vsub->cgi + * propagate Compl L3 Info Cell ID to the VLR subscriber record + * make vty-transcrip-test: use $VTY_TEST var like osmo-bsc + * refactor: move RESET Osmux TLV parsing to ran_msg_a.c + * sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding + * is_reset_msg: use proper enum for rc value + * manuals: generate vty reference xml at build time + * Clear Command: set cause value to "Call Control" + * fix crash for unknown MI during Paging Response + * fix MGCP timeout timer + * drop duplicate ran_peer_find() vs ran_peer_find_by_addr() + * fix comment in ran_peer.h + * msc_vlr_tests: make independent of libosmocore talloc + * gsm_network: drop unused neighbor_list member + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Philipp Maier ] + * doc: do not use random ip-address for MGW + * msc_vty: remove emergency-call command from network + * msc_a: add callref as call id to ASSIGNMENT REQ. + * msc_ho: fix CALL IDENTIFIER in HANDOVER REQUEST + * mncc_call: fix memory overrun + * gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() + + [ Harald Welte ] + * vlr_auth_fsm: Fix compilation with gcc-10 + * contrib/osmo-msc.spec.in: Enable SMPP in RPM builds + * remove empty + unused ran_up_l2.c + * osmo-msc.spec.in: Use %config(noreplace) to retain current config file + * Send "BSSMAP CommonID" to tell BSC about the IMSI + * Use osmo_fd_setup() whenever applicable + * debian/control: Recommend installation of osmo-mgw + * Use osmo_fd_*_{disable,enable} + * README update. Explain more what it is than just the history + + [ Pau Espin Pedrol ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * ran_msg_iu.c: Avoid redefining osmo-iuh global variables + * configure.ac: Drop trailing whitespace + * Support setting rt-prio and cpu-affinity mask through VTY + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * Support sending IPv6 Transport Address in Assignment Command + * Support handling IPv6 Transport Address in Assignment Complete + * tests: Fix VTY results after switch to newer libosmo-mgcp-client + * Support handling IPv6 Transport Address in Handover Request (Ack) + * mncc: Support IPv6 addresses (new version mncc 7) + * contrib/jenkins: Enable parallel make in make distcheck + * main: generate coredump and exit upon SIGABRT received + * .gitignore: Ignore new autofoo tmp files + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Alexander Couzens ] + * Convert paging response timer into an osmocom own X4 timer + + -- Pau Espin Pedrol Tue, 23 Feb 2021 20:22:34 +0100 + osmo-msc (1.6.1) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/debian/control b/debian/control index 9a85589..9b529c2 100644 --- a/debian/control +++ b/debian/control @@ -15,15 +15,15 @@ libtalloc-dev, libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), - libosmocore-dev (>= 1.4.0), - libosmo-sccp-dev (>= 1.1.0), - libosmo-sigtran-dev (>= 1.1.0), - libosmo-abis-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.7.0), - libosmo-gsup-client-dev (>= 1.0.0), - libosmo-netif-dev (>= 0.6.0), - libosmo-ranap-dev (>= 0.3.0), - osmo-gsm-manuals-dev (>= 0.2.0) + libosmocore-dev (>= 1.5.0), + libosmo-sccp-dev (>= 1.4.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.8.0), + libosmo-gsup-client-dev (>= 1.3.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-ranap-dev (>= 0.7.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-msc.git Vcs-Browser: https://git.osmocom.org/osmo-msc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/23073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1bf25c0c01efd6f93df8ac2b26868dd1579b3531 Gerrit-Change-Number: 23073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:25:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:25:56 +0000 Subject: Change in osmo-ci[master]: osmocom-latet-packages: Package osmo-smlc References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23074 ) Change subject: osmocom-latet-packages: Package osmo-smlc ...................................................................... osmocom-latet-packages: Package osmo-smlc osmo-smlc now has a tag that builds against a tagged libosmocore Change-Id: I0e6756f94027ad1ffd88109b2977cb33ee891a21 --- M scripts/osmocom-latest-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/23074/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 34fa55c..14f454d 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -152,6 +152,7 @@ checkout osmo-uecups checkout osmo-e1d checkout osmo-cbc + checkout osmo-smlc cd "$TOP" osmo_obs_checkout_copy debian8 osmo-gsm-manuals @@ -189,6 +190,7 @@ build osmo-uecups build osmo-e1d build osmo-cbc + build osmo-smlc cd "$TOP/$PROJ" osc ci -m "Latest Tagged versions of $DT" --noservice -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0e6756f94027ad1ffd88109b2977cb33ee891a21 Gerrit-Change-Number: 23074 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:26:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:26:49 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: Enable testing of osmo-cbc "latest" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23075 ) Change subject: ttcn3-testsuites: Enable testing of osmo-cbc "latest" ...................................................................... ttcn3-testsuites: Enable testing of osmo-cbc "latest" We do have "latest" packages, so we can start testing it Change-Id: I9f8fb03d9a02da7174bc1aa2aef412e7dbc0724e --- M jobs/ttcn3-testsuites.yml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/23075/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index a0b55ce..eb46770 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -135,9 +135,9 @@ - ttcn3-gbproxy-test-latest: blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - #- ttcn3-cbc-test-latest: - # blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" - # timer: 40 10 * * * + - ttcn3-cbc-test-latest: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 10 * * * # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9f8fb03d9a02da7174bc1aa2aef412e7dbc0724e Gerrit-Change-Number: 23075 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:27:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:27:20 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: re-enable osmo-uecups In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23072 ) Change subject: osmocom-latest-packages: re-enable osmo-uecups ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b8789cdfff2432c8d43972e19117f9f54eaaa7f Gerrit-Change-Number: 23072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 19:27:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:27:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:27:24 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: Enable testing of osmo-cbc "latest" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23075 ) Change subject: ttcn3-testsuites: Enable testing of osmo-cbc "latest" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9f8fb03d9a02da7174bc1aa2aef412e7dbc0724e Gerrit-Change-Number: 23075 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 19:27:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:27:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:27:27 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: re-enable osmo-uecups In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23072 ) Change subject: osmocom-latest-packages: re-enable osmo-uecups ...................................................................... osmocom-latest-packages: re-enable osmo-uecups this should have been re-enabled since libosmocore 1.4.0 already Change-Id: I5b8789cdfff2432c8d43972e19117f9f54eaaa7f --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 906d068..34fa55c 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -186,8 +186,7 @@ build osmo-remsim build open5gs build neocon - # re-enable after libosmcoore > 1.3.1 is released (osmo_system_nowait2) - #build osmo-uecups + build osmo-uecups build osmo-e1d build osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b8789cdfff2432c8d43972e19117f9f54eaaa7f Gerrit-Change-Number: 23072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:27:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:27:27 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: Enable testing of osmo-cbc "latest" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23075 ) Change subject: ttcn3-testsuites: Enable testing of osmo-cbc "latest" ...................................................................... ttcn3-testsuites: Enable testing of osmo-cbc "latest" We do have "latest" packages, so we can start testing it Change-Id: I9f8fb03d9a02da7174bc1aa2aef412e7dbc0724e --- M jobs/ttcn3-testsuites.yml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index a0b55ce..eb46770 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -135,9 +135,9 @@ - ttcn3-gbproxy-test-latest: blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - #- ttcn3-cbc-test-latest: - # blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" - # timer: 40 10 * * * + - ttcn3-cbc-test-latest: + blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" + timer: 40 10 * * * # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9f8fb03d9a02da7174bc1aa2aef412e7dbc0724e Gerrit-Change-Number: 23075 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:30:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:30:30 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E157-b05c1-dirty_=E2=86=92_1=2E7=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23076 ) Change subject: Bump version: 1.6.0.157-b05c1-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.157-b05c1-dirty ? 1.7.0 Change-Id: Ifa861bb0109f433b103a75d5140425bf19c66943 --- M TODO-RELEASE M configure.ac M contrib/osmo-sgsn.spec.in M debian/changelog M debian/control 5 files changed, 212 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/76/23076/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 5514897..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +1 @@ #component what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -configure.ac libosmocore depend on next released libosmocore after 1.4.x with hashtable support -sgsn vty/config change the configuration of the vty config. old configuration are invalid. diff --git a/configure.ac b/configure.ac index 947ecf1..c29bacb 100644 --- a/configure.ac +++ b/configure.ac @@ -50,29 +50,29 @@ AC_SUBST(LIBRARY_DLSYM) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.3.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.6.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.7.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.5.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.7.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index cd3b5b7..f661fa0 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -34,20 +34,20 @@ %endif BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libgtp) >= 1.4.0 -BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.0.0 -BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libgtp) >= 1.7.0 +BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %if %{with_iu} BuildRequires: pkgconfig(libasn1c) -BuildRequires: pkgconfig(libosmo-ranap) >= 0.4.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-ranap) >= 0.7.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 %endif %description diff --git a/debian/changelog b/debian/changelog index 2827f43..2edc6e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,184 @@ +osmo-sgsn (1.7.0) unstable; urgency=medium + + [ Daniel Willmann ] + * gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT + * gbproxy-usermanual: Explain BSSGP/BVC handling + * gbproxy: Whitespace fixes + * gbproxy: Add todo for BVC RESET logic + * gbproxy: Get the peer if paging by BVCI on SIG_BVC + * Let libosmocore handle VTY parent node tracking + * osmo-gbproxy: Free msgb in ns2 prim callback + * configure.ac: Require python3 for ext_tests + * osmo-gbproxy: Implement nsvc-state ctrl command + * gbproxy: Remove test testing NSVCI change + * gbproxy: Add NSE peer that can have multiple gbproxy_peers + * gbproxy: Ensure BVC0 is reset before handling PtP BVCs + * gbproxy: Only send paging to each matching NSE once + * gbproxy: Separate function to move gbproxy_peer to different nse + * gbproxy: Add logging macros for NSE and BVC + * gbproxy: Use LOG macros for NSE/BVC + * gbproxy: Change generic LOG messages so BVCI/NSEI fmt is consistent + * gbproxy: Add todos encountered while going through the code + * gbproxy: Add BVC log filters + * gbproxy: Add newline to log message + * gbproxy: Allow gbproxy_nse_free(NULL) + * gbproxy: Delete gbproxy_nse in delete-gbproxy-peer VTY command + * mm_state_gb_fsm: Handle implicit detach from mm_standby + * gbproxy: Fix bvci check in gbprox_rx_ptp_from_* + * osmo-gbproxy: Initialize all hash_maps + * gbproxy: Fix confusing log message in gbprox_relay2nse + * gbproxy: Add SGSN NRI configuration + * gbproxy: Add SGSN pooling support + * gbproxy: Add comments to sgsn functions + * gbproxy: Add config option to name an SGSN + * gbproxy: Add VTY command to override the node selection function + * Fix gbproxy_sgsn_by_tlli wraparound + * gbproxy: Implement TLLI cache and use it for SUSPEND/RESUME + * gbproxy: Increase TLLI cache timeout to 10s + * gbproxy: Implement IMSI cache + * gbproxy: Use IMSI cache to handle PAGING_PS_REJECT + * gbproxy: Use C-style comments + * gbproxy: Move helper function to a more logical place + * gbproxy: Remove unused variable assignment + * gbproxy: Fix VTY cmd name + * gbproxy: Define and use help string for gbproxy + * gbproxy: Add VTY commands to query the TLLI/IMSI cache + * gbproxy: Use IMSI cache for PTP paging and implement DUMMY_PAGING_PS + * gbproxy: Print the correct message type for dummy paging/paging reject + * gbproxy: Improve log messages in gbproxy_select_sgsn + * gbproxy: Fix radio status routing by TMSI + * manual/gbproxy: Update overview chapter + * Rename OsmoGbPROXY -> *Proxy + * manuals/gbproxy: Update configuration chapter + * manuals/gbproxy: Add osmo-bsc MSC pooling chapter from Neels as a base + * manuals/gbproxy: MSC -> SGSN for pooling chapter + * manuals/gbproxy: Move pooling to separate chapter + + [ Alexander Couzens ] + * gprs_gmm_fsm.c: Implement RAT change between 2g and 3g + * gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr + * gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it + * gmm: on invalid RA id reject the MS with an implicit detach + * gtphub_test: fix compilation error on gcc 10.2.0 + * gtphub: fix compilation with gcc 10.2.0 + * Port gbproxy to NS2 + * sgsn: check for NULL of gprs_subscr_get_or_create() + * sgsn: Use the new NS2 api + * gbproxy: use ns2 vty2 + * configure.ac: define a c standard instead of using the compilers default + * follow libosmocore/gprs_ns2 API changes of GPRS enums + * gbproxy: follow gprs_ns2 API vty changes + * sgsn: migrate to the new gprs_ns2_vty configuration + * follow libosmocore/gprs_ns2 API changes (gprs_ns2_dynamic_create_nse) + + [ Neels Hofmeyr ] + * manual: explain IuPS, add SCCP/M3UA section from common chapters + * fix nullpointer: in gsm48_rx_gmm_ra_upd_req() + * gsup: send RAT type on LU + * gbproxy_test.c: fix mobile identity test data + * use new osmo_mobile_identity API everywhere + + [ Eric ] + * tests: dlopen does not imply availability of dlsym.. + * configure.ac: fix libtool issue with clang and sanitizer + + [ Harald Welte ] + * gtphub_test: Fix compilation with gcc-10 + * Fix memory leak when SNDCP de-fragmentation is used + * Treat RAU as implicit RESUME if GMM is suspended + * *.spec.in: Use %config(noreplace) to retain current config file + * Send a BVC-RESET to all persistent Gb interfaces at start-up + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * gbproxy: Properly implement paging to LAC/RAC + * gbproxy: Implement paging to entire BSS area + * gprs_gb_parse: Add function to determine TLLI from encoded BSSGP + * gbproxy: Pass TLLI as LSP towards NS to facilitate load sharing + * gb_proxy_peer: Add some FIXMEs regarding invalid assumptions + * gb_proxy: More precise + readable log messages + * gb_proxy: Broadcast SGSN-INVOKE-TRACE and OVERLOAD + * gbproxy: Move BSS-side BVC-RESET processing to its own function + * gb_proxy: Slightly restructure processing of BSS-originated BVC-RESET + * gbproxy: Cosmetics: use longer lines + * gbproxy: Send BVC-STATUS if BSS sends us BVC-RESET without mandatory IEs + * gb_proxy: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * gb_proxy: Rename gbproxy_peer to gbproxy_bvc + * gbproxy: Rename gbproxy_cfg.nses to gbproxy_cfg.bss_nses + * gbproxy: convert bss_nses from llist_head to hashtable + * gbproxy: convert nse->bvcs from llist_head to hashtable + * gbproxy: Remove patching, TLLI-tracking and SGSN2 support + * gb_proxy: cosmetic: Use function rather than open-coding is_sgsn + * gbproxy: Delete gbproxy_test + * gb_proxy: Introduce more validation / constraint checks + * gbproxy: use gbprox_relay2peer() whenever possible + * gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs + * gbproxy: Log FSM timeouts + * migrate to DLBSSGP as log sub-system for BSSGP + * gbproxy major rewrite for SGSN pool support + * gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index + * gbproxy: Introduce new DOBJ log category; log object allocation/release + * gbproxy: Don't create an extra msgb copy for SGSN DL SIG + * gbproxy: Implement handling of BVC Flow Control + * gbproxy: Copy RA-ID from BSS side BVC to CELL and SGSN-side BVC + * gbproxy: (Re)allocate SGSN-side PTP BVC even if CELL already exists + * gbproxy: Fix segfault when receiving PAGING for unknown destination + * gbproxy: Add FSM related VTY commands + * gbproxy: Implement scaling of BVC flow control in SGSN pool + * gbproxy: Improve VTY state introspection + * gbproxy: rename vty command "show gbproxy ..." to "show gbproxy bvc ..." + * gbproxy: Add "show gbproxy cell ..." VTY command + * gbproxy: Fix build on Deiban 8 + * gb_proxy: Don't use orphan log subsystem DPCU + * gbproxy: Avoid depending on any of the SGSN code + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Pau Espin Pedrol ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * sgsn_libgtp: Improve ps-paging logging + * gprs_gmm_fsm.c: Add missing license header + * sgsn_libgtp: Avoid ps-paging MS on GMM Suspended state + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * contrib/jenkins: Enable parallel make in make distcheck + * Log error if pdp ctx is freed while holding an active timer + * Fix crash rx DeactPdpReq while waiting for DeactPdpAck after gtp side is freed + * sgsn_delete_pdp_ctx: Add documentation and assert assumptions + * process_ms_ctx_status: refactor to avoid code duplication + * process_ms_ctx_status: Fix crash deleting PDP Ctx if GTP side was already released + * gbproxy: generate coredump and exit upon SIGABRT received + * gtphub: generate coredump and exit upon SIGABRT received + * sgsn: generate coredump and exit upon SIGABRT received + * gmm: fix build without define PTMSI_ALLOC + * gmm: Introduce comment to ease addition of Network feature support IE later + * .gitignore: Ignore new autofoo tmp files + * sndcp: Fix struct bit fields on big endian + * Fix nsei+bvci not updated on rx UL SNDCP data + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * gbproxy: remove (moved to own repository) + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * gb_proxy_peer: sgsn can never be NULL in gbproxy_sgsn_by_nri() + * gb_proxy_peer: fix NULL pointer dereference in gbproxy_sgsn_alloc() + + [ Keith ] + * Fix Radio Priority in MM Attach and PDP Context Activation + * VTY: Add gtp state-dir command + + [ Philipp Maier ] + * gprs_sndcp: fix use after free + * sgsn_rim: Add routing for (GERAN) BSSGP RIM messages + + -- Pau Espin Pedrol Tue, 23 Feb 2021 20:29:33 +0100 + osmo-sgsn (1.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index fe2f1e6..abc7595 100644 --- a/debian/control +++ b/debian/control @@ -12,16 +12,16 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.5.0), - libosmocore-dev (>= 1.4.0), - libosmo-abis-dev (>= 0.6.0), - libosmo-netif-dev (>= 0.4.0), - libosmo-gsup-client-dev (>= 1.0.0), + libgtp-dev (>= 1.7.0), + libosmocore-dev (>= 1.5.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-gsup-client-dev (>= 1.3.0), libasn1c-dev (>= 0.9.30), - libosmo-ranap-dev (>= 0.6.0), - libosmo-sigtran-dev (>= 1.0.0), - libosmo-sccp-dev (>= 1.0.0), - osmo-gsm-manuals-dev + libosmo-ranap-dev (>= 0.7.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-sccp-dev (>= 1.4.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git Vcs-Browser: https://git.osmocom.org/osmo-sgsn -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifa861bb0109f433b103a75d5140425bf19c66943 Gerrit-Change-Number: 23076 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:30:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:30:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E1=2E98-cad22-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/23073 ) Change subject: Bump version: 1.6.1.98-cad22-dirty ? 1.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/23073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1bf25c0c01efd6f93df8ac2b26868dd1579b3531 Gerrit-Change-Number: 23073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 19:30:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:30:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:30:40 +0000 Subject: =?UTF-8?Q?Change_in_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E1=2E98-cad22-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/23073 ) Change subject: Bump version: 1.6.1.98-cad22-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.1.98-cad22-dirty ? 1.7.0 Change-Id: I1bf25c0c01efd6f93df8ac2b26868dd1579b3531 --- M TODO-RELEASE M configure.ac M contrib/osmo-msc.spec.in M debian/changelog M debian/control 5 files changed, 152 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 036a9b9..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,8 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs -libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response -osmo-msc update version dependency to version with osmo_fd_*_{disable,enable} -osmo-msc smpp migrate to gsm_septet_pack(), available since Ib1aac538afeb0a5c76a1df472d555139a496e12e diff --git a/configure.ac b/configure.ac index ee4b33b..db7507a 100644 --- a/configure.ac +++ b/configure.ac @@ -42,16 +42,16 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.7.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.3.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/contrib/osmo-msc.spec.in b/contrib/osmo-msc.spec.in index c968d3e..d588e5b 100644 --- a/contrib/osmo-msc.spec.in +++ b/contrib/osmo-msc.spec.in @@ -35,17 +35,17 @@ BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig(dbi) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.0.0 -BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.6.0 -BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 1.1.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 1.1.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 -BuildRequires: pkgconfig(libsmpp34) >= 1.13.0 +BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.8.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libsmpp34) >= 1.14.0 #### BuildRequires: lksctp-tools-devel #### diff --git a/debian/changelog b/debian/changelog index 7b5f708..758173b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,125 @@ +osmo-msc (1.7.0) unstable; urgency=medium + + [ Keith Whyte ] + * Use GSM411_RP_* and not GSM48_CC_* + * Trivial: code simplification, return early + * vty: allow configuring db path from cfg file + * Don't Store an SMS in the database when the ESME is not Bound + + [ Pablo Neira Ayuso ] + * libmsc: SMS, Avoid premature RP-ACK to MS + + [ Vadim Yanitskiy ] + * manuals/vty: update the VTY reference to reflect recent changes + * libvlr: remove unused 'periodic_lu_timer' from struct vlr_subscr + * osmo-msc: fix: properly initialize default values for MGW timers + * msc/signal.h: remove unused (since the NiTB split up) signals + * VTY: mark 'subscriber create imsi' command as deprecated + * VTY: add osmo_tdef introspection and configuration commands + * libvlr: use generic osmo_tdef API for T3250, T3260, and T3270 + * libmsc: move subscriber expiration timer T3212 to libvlr + * vlr: remove unused parameter 'log_level' of auth_fsm_start() + * vlr_sgs_fsm: add missing break, do not call to_null() twice + * msc/sccp_ran.h: fix: do not pass -1 to osmo_rat_type_name() + * VTY: cosmetic: make struct cmd_node for GSMNET_NODE static + * libmsc/gsm_04_08: make use of msc_a in gsm48_rx_rr_app_info() + * libmsc/gsm_04_08: use DRR in gsm48_rx_rr_pag_resp(), not DMM + * libmsc/gsm_04_11.h: remove unused sms_deliver definition + * osmo-msc: use stderr to print error messages, not stdout + * libmsc/sdp: cosmetic: fix less-than-zero comparison of an unsigned value + * SMS-over-GSUP: clarify error message about unexpected MO/MT SMS + * SMS-over-GSUP: move net->sms_over_gsup check to gsm411_gsup_rx() + * SMS-over-GSUP: respond with error if net->sms_over_gsup is false + * SMS-over-GSUP: notify sender about unhandled GSUP messages + * SMS-over-GSUP: notify sender about malformed GSUP messages + * SMS-over-GSUP: notify sender in case of RPL delivery failure + * gsm_04_14: fix off-by-one error in create_gsm0414_msg() + * vty: fix vsub reference counting: call vlr_subscr_put() + * debian/control: change maintainer to the Osmocom team / mailing list + * mncc_builtin: cosmetic: fix coding style in int_mncc_recv() + * mncc_builtin: log type of unhandled message in int_mncc_recv() + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * submit_to_sms(): fix the use of deprecated gsm_septets2octets() + * ran_a_decode_cipher_mode_reject(): use gsm0808_get_cause() + * fix _gsm48_cc_trans_free(): send MNCC REL.ind on Clear Request + + [ Neels Hofmeyr ] + * fix segfault: unsolicited Paging Response + * manual: add missing mention of MGCP in "Multiple instances" + * manual: Multiple Instances: tweak MNCC, add missing SGs doc + * manual: link to new common cs7-config.adoc, remove some dup of that + * vlr_subscr_rx_id_resp(): dont assert on received MI type + * msc_vlr_test_gsm_ciph.c: fix IMEISV MI: even number of digits, clear odd bit + * use new osmo_mobile_identity API everywhere + * add rudimentary NRI support for MSC pooling + * add osmo-msc --vty-ref-xml: dump VTY ref XML to stdout + * add comments to clarify some complete l3 details + * vty 'show connection': show msc_a->via_cell instead of vsub->cgi + * propagate Compl L3 Info Cell ID to the VLR subscriber record + * make vty-transcrip-test: use $VTY_TEST var like osmo-bsc + * refactor: move RESET Osmux TLV parsing to ran_msg_a.c + * sgs_tx_loc_upd_resp_cb(): fix error handling for MI encoding + * is_reset_msg: use proper enum for rc value + * manuals: generate vty reference xml at build time + * Clear Command: set cause value to "Call Control" + * fix crash for unknown MI during Paging Response + * fix MGCP timeout timer + * drop duplicate ran_peer_find() vs ran_peer_find_by_addr() + * fix comment in ran_peer.h + * msc_vlr_tests: make independent of libosmocore talloc + * gsm_network: drop unused neighbor_list member + + [ Eric ] + * configure.ac: fix libtool issue with clang and sanitizer + + [ Philipp Maier ] + * doc: do not use random ip-address for MGW + * msc_vty: remove emergency-call command from network + * msc_a: add callref as call id to ASSIGNMENT REQ. + * msc_ho: fix CALL IDENTIFIER in HANDOVER REQUEST + * mncc_call: fix memory overrun + * gsm_04_08: check return code of osmo_mobile_identity_decode_from_l3() + + [ Harald Welte ] + * vlr_auth_fsm: Fix compilation with gcc-10 + * contrib/osmo-msc.spec.in: Enable SMPP in RPM builds + * remove empty + unused ran_up_l2.c + * osmo-msc.spec.in: Use %config(noreplace) to retain current config file + * Send "BSSMAP CommonID" to tell BSC about the IMSI + * Use osmo_fd_setup() whenever applicable + * debian/control: Recommend installation of osmo-mgw + * Use osmo_fd_*_{disable,enable} + * README update. Explain more what it is than just the history + + [ Pau Espin Pedrol ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * ran_msg_iu.c: Avoid redefining osmo-iuh global variables + * configure.ac: Drop trailing whitespace + * Support setting rt-prio and cpu-affinity mask through VTY + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * Support sending IPv6 Transport Address in Assignment Command + * Support handling IPv6 Transport Address in Assignment Complete + * tests: Fix VTY results after switch to newer libosmo-mgcp-client + * Support handling IPv6 Transport Address in Handover Request (Ack) + * mncc: Support IPv6 addresses (new version mncc 7) + * contrib/jenkins: Enable parallel make in make distcheck + * main: generate coredump and exit upon SIGABRT received + * .gitignore: Ignore new autofoo tmp files + * tests: Explicitly drop category from log + * tests: Replace deprecated API log_set_print_filename + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * configure.ac: set -std=gnu11 + + [ Alexander Couzens ] + * Convert paging response timer into an osmocom own X4 timer + + -- Pau Espin Pedrol Tue, 23 Feb 2021 20:22:34 +0100 + osmo-msc (1.6.1) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/debian/control b/debian/control index 9a85589..9b529c2 100644 --- a/debian/control +++ b/debian/control @@ -15,15 +15,15 @@ libtalloc-dev, libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), - libosmocore-dev (>= 1.4.0), - libosmo-sccp-dev (>= 1.1.0), - libosmo-sigtran-dev (>= 1.1.0), - libosmo-abis-dev (>= 0.6.0), - libosmo-mgcp-client-dev (>= 1.7.0), - libosmo-gsup-client-dev (>= 1.0.0), - libosmo-netif-dev (>= 0.6.0), - libosmo-ranap-dev (>= 0.3.0), - osmo-gsm-manuals-dev (>= 0.2.0) + libosmocore-dev (>= 1.5.0), + libosmo-sccp-dev (>= 1.4.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.8.0), + libosmo-gsup-client-dev (>= 1.3.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-ranap-dev (>= 0.7.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-msc.git Vcs-Browser: https://git.osmocom.org/osmo-msc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/23073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1bf25c0c01efd6f93df8ac2b26868dd1579b3531 Gerrit-Change-Number: 23073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:32:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:32:18 +0000 Subject: Change in osmo-bsc[master]: remove obsolete dependency on libosmo-sccp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23068 ) Change subject: remove obsolete dependency on libosmo-sccp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Gerrit-Change-Number: 23068 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 19:32:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:37:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:37:04 +0000 Subject: Change in osmo-cbc[master]: Update dependencies to current libosmocore & co References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23077 ) Change subject: Update dependencies to current libosmocore & co ...................................................................... Update dependencies to current libosmocore & co So far we couldn't depend on proper versions as they had not been released yet. Now they do, so we can add the respective dependencies Change-Id: I0573a151f55488599a01ea9dfdcfa02396cd6c35 --- M configure.ac M contrib/osmo-cbc.spec.in M debian/control 3 files changed, 10 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/77/23077/1 diff --git a/configure.ac b/configure.ac index a2d9288..7ca73da 100644 --- a/configure.ac +++ b/configure.ac @@ -31,10 +31,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) PKG_CHECK_MODULES(ULFIUS, libulfius) PKG_CHECK_MODULES(JANSSON, jansson) PKG_CHECK_MODULES(ORCANIA, liborcania) diff --git a/contrib/osmo-cbc.spec.in b/contrib/osmo-cbc.spec.in index f22212b..c27e7d2 100644 --- a/contrib/osmo-cbc.spec.in +++ b/contrib/osmo-cbc.spec.in @@ -30,16 +30,10 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(libulfius) %{?systemd_requires} diff --git a/debian/control b/debian/control index 9fcafc8..59725d4 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ pkg-config, python3-minimal, libtalloc-dev, - libosmocore-dev, - libosmo-netif-dev, + libosmocore-dev (>= 1.5.0), + libosmo-netif-dev (>= 1.1.0), libulfius-dev, libjansson-dev, osmo-gsm-manuals-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0573a151f55488599a01ea9dfdcfa02396cd6c35 Gerrit-Change-Number: 23077 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:39:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:39:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E157-b05c1-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23076 ) Change subject: Bump version: 1.6.0.157-b05c1-dirty ? 1.7.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifa861bb0109f433b103a75d5140425bf19c66943 Gerrit-Change-Number: 23076 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 19:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:39:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 23 Feb 2021 19:39:45 +0000 Subject: =?UTF-8?Q?Change_in_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E6=2E0=2E157-b05c1-dirty_=E2=86=92_1=2E7=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/23076 ) Change subject: Bump version: 1.6.0.157-b05c1-dirty ? 1.7.0 ...................................................................... Bump version: 1.6.0.157-b05c1-dirty ? 1.7.0 Change-Id: Ifa861bb0109f433b103a75d5140425bf19c66943 --- M TODO-RELEASE M configure.ac M contrib/osmo-sgsn.spec.in M debian/changelog M debian/control 5 files changed, 212 insertions(+), 34 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 5514897..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +1 @@ #component what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -configure.ac libosmocore depend on next released libosmocore after 1.4.x with hashtable support -sgsn vty/config change the configuration of the vty config. old configuration are invalid. diff --git a/configure.ac b/configure.ac index 947ecf1..c29bacb 100644 --- a/configure.ac +++ b/configure.ac @@ -50,29 +50,29 @@ AC_SUBST(LIBRARY_DLSYM) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.3.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.6.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.7.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.5.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.7.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index cd3b5b7..f661fa0 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -34,20 +34,20 @@ %endif BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libgtp) >= 1.4.0 -BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.0.0 -BuildRequires: pkgconfig(libosmo-netif) >= 0.4.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libgtp) >= 1.7.0 +BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.3.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %if %{with_iu} BuildRequires: pkgconfig(libasn1c) -BuildRequires: pkgconfig(libosmo-ranap) >= 0.4.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 1.0.0 +BuildRequires: pkgconfig(libosmo-ranap) >= 0.7.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 %endif %description diff --git a/debian/changelog b/debian/changelog index 2827f43..2edc6e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,184 @@ +osmo-sgsn (1.7.0) unstable; urgency=medium + + [ Daniel Willmann ] + * gprs_gmm: Check for RAT change and ensure this only happens for RAU/ATT + * gbproxy-usermanual: Explain BSSGP/BVC handling + * gbproxy: Whitespace fixes + * gbproxy: Add todo for BVC RESET logic + * gbproxy: Get the peer if paging by BVCI on SIG_BVC + * Let libosmocore handle VTY parent node tracking + * osmo-gbproxy: Free msgb in ns2 prim callback + * configure.ac: Require python3 for ext_tests + * osmo-gbproxy: Implement nsvc-state ctrl command + * gbproxy: Remove test testing NSVCI change + * gbproxy: Add NSE peer that can have multiple gbproxy_peers + * gbproxy: Ensure BVC0 is reset before handling PtP BVCs + * gbproxy: Only send paging to each matching NSE once + * gbproxy: Separate function to move gbproxy_peer to different nse + * gbproxy: Add logging macros for NSE and BVC + * gbproxy: Use LOG macros for NSE/BVC + * gbproxy: Change generic LOG messages so BVCI/NSEI fmt is consistent + * gbproxy: Add todos encountered while going through the code + * gbproxy: Add BVC log filters + * gbproxy: Add newline to log message + * gbproxy: Allow gbproxy_nse_free(NULL) + * gbproxy: Delete gbproxy_nse in delete-gbproxy-peer VTY command + * mm_state_gb_fsm: Handle implicit detach from mm_standby + * gbproxy: Fix bvci check in gbprox_rx_ptp_from_* + * osmo-gbproxy: Initialize all hash_maps + * gbproxy: Fix confusing log message in gbprox_relay2nse + * gbproxy: Add SGSN NRI configuration + * gbproxy: Add SGSN pooling support + * gbproxy: Add comments to sgsn functions + * gbproxy: Add config option to name an SGSN + * gbproxy: Add VTY command to override the node selection function + * Fix gbproxy_sgsn_by_tlli wraparound + * gbproxy: Implement TLLI cache and use it for SUSPEND/RESUME + * gbproxy: Increase TLLI cache timeout to 10s + * gbproxy: Implement IMSI cache + * gbproxy: Use IMSI cache to handle PAGING_PS_REJECT + * gbproxy: Use C-style comments + * gbproxy: Move helper function to a more logical place + * gbproxy: Remove unused variable assignment + * gbproxy: Fix VTY cmd name + * gbproxy: Define and use help string for gbproxy + * gbproxy: Add VTY commands to query the TLLI/IMSI cache + * gbproxy: Use IMSI cache for PTP paging and implement DUMMY_PAGING_PS + * gbproxy: Print the correct message type for dummy paging/paging reject + * gbproxy: Improve log messages in gbproxy_select_sgsn + * gbproxy: Fix radio status routing by TMSI + * manual/gbproxy: Update overview chapter + * Rename OsmoGbPROXY -> *Proxy + * manuals/gbproxy: Update configuration chapter + * manuals/gbproxy: Add osmo-bsc MSC pooling chapter from Neels as a base + * manuals/gbproxy: MSC -> SGSN for pooling chapter + * manuals/gbproxy: Move pooling to separate chapter + + [ Alexander Couzens ] + * gprs_gmm_fsm.c: Implement RAT change between 2g and 3g + * gtphub: rename sgsn's oww osmo_sockaddr into sgsn_sockaddr + * gprs_llc: _bssgp_tx_dl_ud: ensure the LLME is valid before using it + * gmm: on invalid RA id reject the MS with an implicit detach + * gtphub_test: fix compilation error on gcc 10.2.0 + * gtphub: fix compilation with gcc 10.2.0 + * Port gbproxy to NS2 + * sgsn: check for NULL of gprs_subscr_get_or_create() + * sgsn: Use the new NS2 api + * gbproxy: use ns2 vty2 + * configure.ac: define a c standard instead of using the compilers default + * follow libosmocore/gprs_ns2 API changes of GPRS enums + * gbproxy: follow gprs_ns2 API vty changes + * sgsn: migrate to the new gprs_ns2_vty configuration + * follow libosmocore/gprs_ns2 API changes (gprs_ns2_dynamic_create_nse) + + [ Neels Hofmeyr ] + * manual: explain IuPS, add SCCP/M3UA section from common chapters + * fix nullpointer: in gsm48_rx_gmm_ra_upd_req() + * gsup: send RAT type on LU + * gbproxy_test.c: fix mobile identity test data + * use new osmo_mobile_identity API everywhere + + [ Eric ] + * tests: dlopen does not imply availability of dlsym.. + * configure.ac: fix libtool issue with clang and sanitizer + + [ Harald Welte ] + * gtphub_test: Fix compilation with gcc-10 + * Fix memory leak when SNDCP de-fragmentation is used + * Treat RAU as implicit RESUME if GMM is suspended + * *.spec.in: Use %config(noreplace) to retain current config file + * Send a BVC-RESET to all persistent Gb interfaces at start-up + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * gbproxy: Properly implement paging to LAC/RAC + * gbproxy: Implement paging to entire BSS area + * gprs_gb_parse: Add function to determine TLLI from encoded BSSGP + * gbproxy: Pass TLLI as LSP towards NS to facilitate load sharing + * gb_proxy_peer: Add some FIXMEs regarding invalid assumptions + * gb_proxy: More precise + readable log messages + * gb_proxy: Broadcast SGSN-INVOKE-TRACE and OVERLOAD + * gbproxy: Move BSS-side BVC-RESET processing to its own function + * gb_proxy: Slightly restructure processing of BSS-originated BVC-RESET + * gbproxy: Cosmetics: use longer lines + * gbproxy: Send BVC-STATUS if BSS sends us BVC-RESET without mandatory IEs + * gb_proxy: Use TLVP_PRES_LEN instead of TLVP_PRESENT + * gb_proxy: Rename gbproxy_peer to gbproxy_bvc + * gbproxy: Rename gbproxy_cfg.nses to gbproxy_cfg.bss_nses + * gbproxy: convert bss_nses from llist_head to hashtable + * gbproxy: convert nse->bvcs from llist_head to hashtable + * gbproxy: Remove patching, TLLI-tracking and SGSN2 support + * gb_proxy: cosmetic: Use function rather than open-coding is_sgsn + * gbproxy: Delete gbproxy_test + * gb_proxy: Introduce more validation / constraint checks + * gbproxy: use gbprox_relay2peer() whenever possible + * gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs + * gbproxy: Log FSM timeouts + * migrate to DLBSSGP as log sub-system for BSSGP + * gbproxy major rewrite for SGSN pool support + * gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index + * gbproxy: Introduce new DOBJ log category; log object allocation/release + * gbproxy: Don't create an extra msgb copy for SGSN DL SIG + * gbproxy: Implement handling of BVC Flow Control + * gbproxy: Copy RA-ID from BSS side BVC to CELL and SGSN-side BVC + * gbproxy: (Re)allocate SGSN-side PTP BVC even if CELL already exists + * gbproxy: Fix segfault when receiving PAGING for unknown destination + * gbproxy: Add FSM related VTY commands + * gbproxy: Implement scaling of BVC flow control in SGSN pool + * gbproxy: Improve VTY state introspection + * gbproxy: rename vty command "show gbproxy ..." to "show gbproxy bvc ..." + * gbproxy: Add "show gbproxy cell ..." VTY command + * gbproxy: Fix build on Deiban 8 + * gb_proxy: Don't use orphan log subsystem DPCU + * gbproxy: Avoid depending on any of the SGSN code + * main: add --vty-ref-mode, use vty_dump_xml_ref_mode() + * manuals: generate vty reference xml at build time + + [ Pau Espin Pedrol ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * sgsn_libgtp: Improve ps-paging logging + * gprs_gmm_fsm.c: Add missing license header + * sgsn_libgtp: Avoid ps-paging MS on GMM Suspended state + * configure.ac: Fix trailing whitespace + * doc: Update VTY reference xml file + * Support setting rt-prio and cpu-affinity mask through VTY + * Change default SCTP conn NULL->127.0.0.1 to localhost->localhost + * contrib/jenkins: Enable parallel make in make distcheck + * Log error if pdp ctx is freed while holding an active timer + * Fix crash rx DeactPdpReq while waiting for DeactPdpAck after gtp side is freed + * sgsn_delete_pdp_ctx: Add documentation and assert assumptions + * process_ms_ctx_status: refactor to avoid code duplication + * process_ms_ctx_status: Fix crash deleting PDP Ctx if GTP side was already released + * gbproxy: generate coredump and exit upon SIGABRT received + * gtphub: generate coredump and exit upon SIGABRT received + * sgsn: generate coredump and exit upon SIGABRT received + * gmm: fix build without define PTMSI_ALLOC + * gmm: Introduce comment to ease addition of Network feature support IE later + * .gitignore: Ignore new autofoo tmp files + * sndcp: Fix struct bit fields on big endian + * Fix nsei+bvci not updated on rx UL SNDCP data + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * contrib/jenkins: don't build osmo-gsm-manuals + * gbproxy: remove (moved to own repository) + + [ Vadim Yanitskiy ] + * debian/control: change maintainer to the Osmocom team / mailing list + * gb_proxy_peer: sgsn can never be NULL in gbproxy_sgsn_by_nri() + * gb_proxy_peer: fix NULL pointer dereference in gbproxy_sgsn_alloc() + + [ Keith ] + * Fix Radio Priority in MM Attach and PDP Context Activation + * VTY: Add gtp state-dir command + + [ Philipp Maier ] + * gprs_sndcp: fix use after free + * sgsn_rim: Add routing for (GERAN) BSSGP RIM messages + + -- Pau Espin Pedrol Tue, 23 Feb 2021 20:29:33 +0100 + osmo-sgsn (1.6.0) unstable; urgency=medium [ Pau Espin Pedrol ] diff --git a/debian/control b/debian/control index fe2f1e6..abc7595 100644 --- a/debian/control +++ b/debian/control @@ -12,16 +12,16 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.5.0), - libosmocore-dev (>= 1.4.0), - libosmo-abis-dev (>= 0.6.0), - libosmo-netif-dev (>= 0.4.0), - libosmo-gsup-client-dev (>= 1.0.0), + libgtp-dev (>= 1.7.0), + libosmocore-dev (>= 1.5.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-gsup-client-dev (>= 1.3.0), libasn1c-dev (>= 0.9.30), - libosmo-ranap-dev (>= 0.6.0), - libosmo-sigtran-dev (>= 1.0.0), - libosmo-sccp-dev (>= 1.0.0), - osmo-gsm-manuals-dev + libosmo-ranap-dev (>= 0.7.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-sccp-dev (>= 1.4.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-sgsn.git Vcs-Browser: https://git.osmocom.org/osmo-sgsn -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/23076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifa861bb0109f433b103a75d5140425bf19c66943 Gerrit-Change-Number: 23076 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:41:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:41:26 +0000 Subject: Change in osmo-cbc[master]: Update dependencies to current libosmocore & co In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23077 ) Change subject: Update dependencies to current libosmocore & co ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0573a151f55488599a01ea9dfdcfa02396cd6c35 Gerrit-Change-Number: 23077 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 19:41:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:41:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:41:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-cbc=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E4-88b5_=E2=86=92_0=2E2=2E2?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23078 ) Change subject: Bump version: 0.2.1.4-88b5 ? 0.2.2 ...................................................................... Bump version: 0.2.1.4-88b5 ? 0.2.2 Change-Id: If4919093a0569b81bfd95f76763f8b4b2fddaada --- M debian/changelog 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/78/23078/1 diff --git a/debian/changelog b/debian/changelog index 1c658cd..334d300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-cbc (0.2.2) unstable; urgency=medium + + * rest_api.c: Add missing \n in log line after error message + * bring JSON schema in sync with reality + * fix encoding of CBSP cell identifiers + * Update dependencies to current libosmocore & co + + -- Harald Welte Tue, 23 Feb 2021 20:40:44 +0100 + osmo-cbc (0.2.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If4919093a0569b81bfd95f76763f8b4b2fddaada Gerrit-Change-Number: 23078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:43:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:43:56 +0000 Subject: =?UTF-8?Q?Change_in_osmo-cbc=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E4-88b5_=E2=86=92_0=2E2=2E2?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23078 ) Change subject: Bump version: 0.2.1.4-88b5 ? 0.2.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If4919093a0569b81bfd95f76763f8b4b2fddaada Gerrit-Change-Number: 23078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 19:43:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:43:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:43:58 +0000 Subject: Change in osmo-cbc[master]: Update dependencies to current libosmocore & co In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23077 ) Change subject: Update dependencies to current libosmocore & co ...................................................................... Update dependencies to current libosmocore & co So far we couldn't depend on proper versions as they had not been released yet. Now they do, so we can add the respective dependencies Change-Id: I0573a151f55488599a01ea9dfdcfa02396cd6c35 --- M configure.ac M contrib/osmo-cbc.spec.in M debian/control 3 files changed, 10 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index a2d9288..7ca73da 100644 --- a/configure.ac +++ b/configure.ac @@ -31,10 +31,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) PKG_CHECK_MODULES(ULFIUS, libulfius) PKG_CHECK_MODULES(JANSSON, jansson) PKG_CHECK_MODULES(ORCANIA, liborcania) diff --git a/contrib/osmo-cbc.spec.in b/contrib/osmo-cbc.spec.in index f22212b..c27e7d2 100644 --- a/contrib/osmo-cbc.spec.in +++ b/contrib/osmo-cbc.spec.in @@ -30,16 +30,10 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmoabis) >= 0.6.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(libulfius) %{?systemd_requires} diff --git a/debian/control b/debian/control index 9fcafc8..59725d4 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ pkg-config, python3-minimal, libtalloc-dev, - libosmocore-dev, - libosmo-netif-dev, + libosmocore-dev (>= 1.5.0), + libosmo-netif-dev (>= 1.1.0), libulfius-dev, libjansson-dev, osmo-gsm-manuals-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0573a151f55488599a01ea9dfdcfa02396cd6c35 Gerrit-Change-Number: 23077 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:43:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:43:59 +0000 Subject: =?UTF-8?Q?Change_in_osmo-cbc=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E1=2E4-88b5_=E2=86=92_0=2E2=2E2?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/23078 ) Change subject: Bump version: 0.2.1.4-88b5 ? 0.2.2 ...................................................................... Bump version: 0.2.1.4-88b5 ? 0.2.2 Change-Id: If4919093a0569b81bfd95f76763f8b4b2fddaada --- M debian/changelog 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 1c658cd..334d300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-cbc (0.2.2) unstable; urgency=medium + + * rest_api.c: Add missing \n in log line after error message + * bring JSON schema in sync with reality + * fix encoding of CBSP cell identifiers + * Update dependencies to current libosmocore & co + + -- Harald Welte Tue, 23 Feb 2021 20:40:44 +0100 + osmo-cbc (0.2.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/23078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: If4919093a0569b81bfd95f76763f8b4b2fddaada Gerrit-Change-Number: 23078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 23 19:47:46 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:47:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60355bf84f9be_d852b0a6e29c5f4262416@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/i586 Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 142s] Making all in src [ 142s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 142s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 142s] In file included from internal.h:8:0, [ 142s] from cbc_main.c:47: [ 142s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 142s] #include [ 142s] ^ [ 142s] compilation terminated. [ 142s] Makefile:455: recipe for target 'cbc_main.o' failed [ 142s] make[3]: *** [cbc_main.o] Error 1 [ 142s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 142s] Makefile:420: recipe for target 'all-recursive' failed [ 142s] make[2]: *** [all-recursive] Error 1 [ 142s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 142s] Makefile:367: recipe for target 'all' failed [ 142s] make[1]: *** [all] Error 2 [ 142s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 142s] dh_auto_build: make -j1 returned exit code 2 [ 142s] debian/rules:45: recipe for target 'build' failed [ 142s] make: *** [build] Error 2 [ 142s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 142s] ### VM INTERACTION START ### [ 145s] [ 138.194049] sysrq: Power Off [ 145s] [ 138.195411] reboot: Power down [ 146s] ### VM INTERACTION END ### [ 146s] [ 146s] build78 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:47:38 UTC 2021. [ 146s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:48:53 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:48:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <60355c30ba2c6_d852b0a6e29c5f42627a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 348s] Making all in src [ 348s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 348s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/aarch64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 348s] In file included from internal.h:8:0, [ 348s] from cbc_main.c:47: [ 348s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 348s] #include [ 348s] ^ [ 348s] compilation terminated. [ 348s] Makefile:455: recipe for target 'cbc_main.o' failed [ 348s] make[3]: *** [cbc_main.o] Error 1 [ 348s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 348s] Makefile:420: recipe for target 'all-recursive' failed [ 348s] make[2]: *** [all-recursive] Error 1 [ 348s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 348s] Makefile:367: recipe for target 'all' failed [ 348s] make[1]: *** [all] Error 2 [ 348s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 348s] dh_auto_build: make -j1 returned exit code 2 [ 348s] debian/rules:45: recipe for target 'build' failed [ 348s] make: *** [build] Error 2 [ 348s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 348s] ### VM INTERACTION START ### [ 351s] [ 331.283378] sysrq: Power Off [ 351s] [ 331.285566] reboot: Power down [ 352s] ### VM INTERACTION END ### [ 352s] [ 352s] obs-arm-9 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:48:38 UTC 2021. [ 352s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:49:10 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:49:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Raspbian_9.0/armv7l In-Reply-To: References: Message-ID: <60355c4cbb4ee_d852b0a6e29c5f4262873@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Raspbian_9.0/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: syswrite: (worker was obs-arm-6:13) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:50:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:50:10 +0000 Subject: Change in docker-playground[master]: add osmo-cbc-latest container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23079 ) Change subject: add osmo-cbc-latest container ...................................................................... add osmo-cbc-latest container Change-Id: Ia0071a52a7cdb4f8e53570e05d0d4c2848d0577a --- A osmo-cbc-latest/Dockerfile A osmo-cbc-latest/Makefile A osmo-cbc-latest/Release.key A osmo-cbc-latest/osmo-cbc.cfg 4 files changed, 98 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/79/23079/1 diff --git a/osmo-cbc-latest/Dockerfile b/osmo-cbc-latest/Dockerfile new file mode 100644 index 0000000..0b87b1f --- /dev/null +++ b/osmo-cbc-latest/Dockerfile @@ -0,0 +1,35 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:stretch +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-cbc \ + telnet && \ + apt-get clean + +WORKDIR /data + +VOLUME /data +COPY osmo-cbc.cfg /data/ + +CMD ["/bin/sh", "-c", "/usr/bin/osmo-cbc -c /data/osmo-cbc.cfg >/data/osmo-cbc.log 2>&1"] + +EXPOSE 12345 4264 48049 diff --git a/osmo-cbc-latest/Makefile b/osmo-cbc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-cbc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-cbc-latest/Release.key b/osmo-cbc-latest/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-cbc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-cbc-latest/osmo-cbc.cfg b/osmo-cbc-latest/osmo-cbc.cfg new file mode 100644 index 0000000..0d371c5 --- /dev/null +++ b/osmo-cbc-latest/osmo-cbc.cfg @@ -0,0 +1,42 @@ +! +! OsmoCBC (0.1.0.5-e88e) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print extended-timestamp 1 + logging print level 1 + logging print file 1 last + logging level cbsp debug + logging level rest debug + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice + logging level lns notice + logging level lbssgp notice +! +line vty + no login + bind 0.0.0.0 +! +cbc + unknown-peers reject -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia0071a52a7cdb4f8e53570e05d0d4c2848d0577a Gerrit-Change-Number: 23079 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:50:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:50:10 +0000 Subject: Change in docker-playground[master]: add osmo-smlc-latest container References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23080 ) Change subject: add osmo-smlc-latest container ...................................................................... add osmo-smlc-latest container Change-Id: I714758ddd832e77b592dec5d17ef3568420d11ff --- A osmo-smlc-latest/Dockerfile A osmo-smlc-latest/Makefile A osmo-smlc-latest/Release.key A osmo-smlc-latest/osmo-smlc.cfg 4 files changed, 63 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/80/23080/1 diff --git a/osmo-smlc-latest/Dockerfile b/osmo-smlc-latest/Dockerfile new file mode 100644 index 0000000..d367ee4 --- /dev/null +++ b/osmo-smlc-latest/Dockerfile @@ -0,0 +1,33 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:stretch +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-smlc \ + telnet && \ + apt-get clean + +WORKDIR /data + +VOLUME /data +COPY osmo-smlc.cfg /data/ + +CMD ["/bin/sh", "-c", "/usr/bin/osmo-smlc -c /data/osmo-smlc.cfg >/data/osmo-smlc.log 2>&1"] diff --git a/osmo-smlc-latest/Makefile b/osmo-smlc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-smlc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-smlc-latest/Release.key b/osmo-smlc-latest/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-smlc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-smlc-latest/osmo-smlc.cfg b/osmo-smlc-latest/osmo-smlc.cfg new file mode 100644 index 0000000..4ca7b40 --- /dev/null +++ b/osmo-smlc-latest/osmo-smlc.cfg @@ -0,0 +1,9 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level set-all notice +line vty + no login + bind 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I714758ddd832e77b592dec5d17ef3568420d11ff Gerrit-Change-Number: 23080 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 23 19:50:02 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:50:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <60355c86c5e31_d852b0a6e29c5f42632d2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 236s] Making all in src [ 236s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 236s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 236s] In file included from internal.h:8:0, [ 236s] from cbc_main.c:47: [ 236s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 236s] #include [ 236s] ^ [ 236s] compilation terminated. [ 236s] Makefile:455: recipe for target 'cbc_main.o' failed [ 236s] make[3]: *** [cbc_main.o] Error 1 [ 236s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 236s] Makefile:420: recipe for target 'all-recursive' failed [ 236s] make[2]: *** [all-recursive] Error 1 [ 236s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 236s] Makefile:367: recipe for target 'all' failed [ 236s] make[1]: *** [all] Error 2 [ 236s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 236s] dh_auto_build: make -j1 returned exit code 2 [ 236s] debian/rules:45: recipe for target 'build' failed [ 236s] make: *** [build] Error 2 [ 236s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 236s] ### VM INTERACTION START ### [ 239s] [ 222.890454] sysrq: Power Off [ 239s] [ 222.895323] reboot: Power down [ 240s] ### VM INTERACTION END ### [ 240s] [ 240s] lamb24 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:49:58 UTC 2021. [ 240s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:50:02 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:50:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/aarch64 In-Reply-To: References: Message-ID: <60355c87afdb6_d852b0a6e29c5f42633ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/aarch64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 413s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 413s] echo 0.2.1 > .version-t && mv .version-t .version [ 413s] make all-recursive [ 413s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 413s] Making all in src [ 413s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 413s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/aarch64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 413s] In file included from internal.h:8, [ 413s] from cbc_main.c:47: [ 413s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 413s] #include [ 413s] ^~~~~~~~~~~~~~~~~~~~~ [ 413s] compilation terminated. [ 413s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 413s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 413s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 413s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 413s] make[1]: *** [Makefile:367: all] Error 2 [ 413s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 413s] dh_auto_build: make -j1 returned exit code 2 [ 413s] make: *** [debian/rules:45: build] Error 2 [ 413s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 413s] ### VM INTERACTION START ### [ 416s] [ 392.304811] sysrq: Power Off [ 416s] [ 392.432775] reboot: Power down [ 417s] ### VM INTERACTION END ### [ 417s] [ 417s] obs-arm-8 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:49:59 UTC 2021. [ 417s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:50:19 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:50:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/x86_64 In-Reply-To: References: Message-ID: <60355c898674b_d852b0a6e29c5f42634d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 255s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 255s] echo 0.2.1 > .version-t && mv .version-t .version [ 255s] make all-recursive [ 255s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 255s] Making all in src [ 255s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 255s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 255s] In file included from internal.h:8, [ 255s] from cbc_main.c:47: [ 255s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 255s] #include [ 255s] ^~~~~~~~~~~~~~~~~~~~~ [ 255s] compilation terminated. [ 255s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 255s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 255s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 255s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 255s] make[1]: *** [Makefile:367: all] Error 2 [ 255s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 255s] dh_auto_build: make -j1 returned exit code 2 [ 255s] make: *** [debian/rules:45: build] Error 2 [ 255s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 255s] ### VM INTERACTION START ### [ 258s] [ 243.501610] sysrq: Power Off [ 258s] [ 243.504236] reboot: Power down [ 258s] ### VM INTERACTION END ### [ 258s] [ 258s] old-atreju4 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:50:16 UTC 2021. [ 258s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:50:53 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:50:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/i586 In-Reply-To: References: Message-ID: <60355cacad042_d852b0a6e29c5f4263889@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/i586 Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 304s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 304s] echo 0.2.1 > .version-t && mv .version-t .version [ 304s] make all-recursive [ 304s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 304s] Making all in src [ 304s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 304s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 304s] In file included from internal.h:8, [ 304s] from cbc_main.c:47: [ 304s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 304s] #include [ 304s] ^~~~~~~~~~~~~~~~~~~~~ [ 304s] compilation terminated. [ 304s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 304s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 304s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 304s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 304s] make[1]: *** [Makefile:367: all] Error 2 [ 304s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 304s] dh_auto_build: make -j1 returned exit code 2 [ 304s] make: *** [debian/rules:45: build] Error 2 [ 304s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 304s] ### VM INTERACTION START ### [ 307s] [ 292.935188] sysrq: Power Off [ 307s] [ 292.942464] reboot: Power down [ 308s] ### VM INTERACTION END ### [ 308s] [ 308s] lamb06 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:50:47 UTC 2021. [ 308s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:51:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:51:30 +0000 Subject: Change in docker-playground[master]: add osmo-cbc-latest container In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23079 ) Change subject: add osmo-cbc-latest container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia0071a52a7cdb4f8e53570e05d0d4c2848d0577a Gerrit-Change-Number: 23079 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 23 Feb 2021 19:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:51:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 23 Feb 2021 19:51:32 +0000 Subject: Change in docker-playground[master]: add osmo-cbc-latest container In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23079 ) Change subject: add osmo-cbc-latest container ...................................................................... add osmo-cbc-latest container Change-Id: Ia0071a52a7cdb4f8e53570e05d0d4c2848d0577a --- A osmo-cbc-latest/Dockerfile A osmo-cbc-latest/Makefile A osmo-cbc-latest/Release.key A osmo-cbc-latest/osmo-cbc.cfg 4 files changed, 98 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/osmo-cbc-latest/Dockerfile b/osmo-cbc-latest/Dockerfile new file mode 100644 index 0000000..0b87b1f --- /dev/null +++ b/osmo-cbc-latest/Dockerfile @@ -0,0 +1,35 @@ +ARG REGISTRY=docker.io +ARG UPSTREAM_DISTRO=debian:stretch +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-cbc \ + telnet && \ + apt-get clean + +WORKDIR /data + +VOLUME /data +COPY osmo-cbc.cfg /data/ + +CMD ["/bin/sh", "-c", "/usr/bin/osmo-cbc -c /data/osmo-cbc.cfg >/data/osmo-cbc.log 2>&1"] + +EXPOSE 12345 4264 48049 diff --git a/osmo-cbc-latest/Makefile b/osmo-cbc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-cbc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-cbc-latest/Release.key b/osmo-cbc-latest/Release.key new file mode 100644 index 0000000..a737316 --- /dev/null +++ b/osmo-cbc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 +pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH +/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY +VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi +K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa +X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW +XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig +7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=/Tek +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-cbc-latest/osmo-cbc.cfg b/osmo-cbc-latest/osmo-cbc.cfg new file mode 100644 index 0000000..0d371c5 --- /dev/null +++ b/osmo-cbc-latest/osmo-cbc.cfg @@ -0,0 +1,42 @@ +! +! OsmoCBC (0.1.0.5-e88e) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print extended-timestamp 1 + logging print level 1 + logging print file 1 last + logging level cbsp debug + logging level rest debug + logging level lglobal info + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level ljibuf notice + logging level lrspro notice + logging level lns notice + logging level lbssgp notice +! +line vty + no login + bind 0.0.0.0 +! +cbc + unknown-peers reject -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia0071a52a7cdb4f8e53570e05d0d4c2848d0577a Gerrit-Change-Number: 23079 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 23 19:51:10 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:51:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <60355cc1b164d_d852b0a6e29c5f4263974@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_19.10/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 266s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 266s] echo 0.2.1 > .version-t && mv .version-t .version [ 266s] make all-recursive [ 266s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 266s] Making all in src [ 266s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 266s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 266s] In file included from internal.h:8, [ 266s] from cbc_main.c:47: [ 266s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 266s] 6 | #include [ 266s] | ^~~~~~~~~~~~~~~~~~~~~ [ 266s] compilation terminated. [ 266s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 266s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 266s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 266s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 266s] make[1]: *** [Makefile:367: all] Error 2 [ 266s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 266s] dh_auto_build: make -j1 returned exit code 2 [ 266s] make: *** [debian/rules:45: build] Error 255 [ 266s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 266s] ### VM INTERACTION START ### [ 269s] [ 254.847802] sysrq: Power Off [ 269s] [ 254.851957] reboot: Power down [ 269s] ### VM INTERACTION END ### [ 269s] [ 269s] old-atreju4 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:50:56 UTC 2021. [ 269s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:51:44 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:51:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <60355cdfaab99_d852b0a6e29c5f42641e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 298s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 298s] echo 0.2.1 > .version-t && mv .version-t .version [ 298s] make all-recursive [ 298s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 298s] Making all in src [ 298s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 298s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 298s] In file included from internal.h:8, [ 298s] from cbc_main.c:47: [ 298s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 298s] #include [ 298s] ^~~~~~~~~~~~~~~~~~~~~ [ 298s] compilation terminated. [ 298s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 298s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 298s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 298s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 298s] make[1]: *** [Makefile:367: all] Error 2 [ 298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 298s] dh_auto_build: make -j1 returned exit code 2 [ 298s] make: *** [debian/rules:45: build] Error 2 [ 298s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 298s] ### VM INTERACTION START ### [ 302s] [ 288.077179] sysrq: Power Off [ 302s] [ 288.084117] reboot: Power down [ 302s] ### VM INTERACTION END ### [ 302s] [ 302s] lamb28 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:51:41 UTC 2021. [ 302s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:52:01 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:52:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <60355cffc11c4_d852b0a6e29c5f42642dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 311s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 311s] echo 0.2.1 > .version-t && mv .version-t .version [ 311s] make all-recursive [ 311s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 311s] Making all in src [ 311s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 311s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 311s] In file included from internal.h:8, [ 311s] from cbc_main.c:47: [ 311s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 311s] #include [ 311s] ^~~~~~~~~~~~~~~~~~~~~ [ 311s] compilation terminated. [ 311s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 311s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 311s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 311s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 311s] make[1]: *** [Makefile:367: all] Error 2 [ 311s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 311s] dh_auto_build: make -j1 returned exit code 2 [ 311s] make: *** [debian/rules:45: build] Error 2 [ 311s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 311s] ### VM INTERACTION START ### [ 314s] [ 290.426174] sysrq: Power Off [ 314s] [ 290.430326] reboot: Power down [ 314s] ### VM INTERACTION END ### [ 314s] [ 314s] cloud101 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:51:47 UTC 2021. [ 314s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:52:18 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:52:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60355d00edaa6_d852b0a6e29c5f426433@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_20.04/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 354s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 354s] echo 0.2.1 > .version-t && mv .version-t .version [ 354s] make all-recursive [ 354s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 354s] Making all in src [ 354s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 354s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 354s] In file included from internal.h:8, [ 354s] from cbc_main.c:47: [ 354s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 354s] 6 | #include [ 354s] | ^~~~~~~~~~~~~~~~~~~~~ [ 354s] compilation terminated. [ 354s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 354s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 354s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 354s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 354s] make[1]: *** [Makefile:367: all] Error 2 [ 354s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 354s] dh_auto_build: error: make -j1 returned exit code 2 [ 354s] make: *** [debian/rules:45: build] Error 25 [ 354s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 355s] ### VM INTERACTION START ### [ 358s] [ 341.850751] sysrq: Power Off [ 358s] [ 341.856261] reboot: Power down [ 358s] ### VM INTERACTION END ### [ 358s] [ 358s] lamb06 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:52:15 UTC 2021. [ 358s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:52:18 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:52:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <60355d01e065e_d852b0a6e29c5f426443b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 349s] Making all in src [ 349s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 349s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/i386-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 349s] In file included from internal.h:8:0, [ 349s] from cbc_main.c:47: [ 349s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 349s] #include [ 349s] ^~~~~~~~~~~~~~~~~~~~~ [ 349s] compilation terminated. [ 349s] Makefile:455: recipe for target 'cbc_main.o' failed [ 349s] make[3]: *** [cbc_main.o] Error 1 [ 349s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 349s] Makefile:420: recipe for target 'all-recursive' failed [ 349s] make[2]: *** [all-recursive] Error 1 [ 349s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 349s] Makefile:367: recipe for target 'all' failed [ 349s] make[1]: *** [all] Error 2 [ 349s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 349s] dh_auto_build: make -j1 returned exit code 2 [ 349s] debian/rules:45: recipe for target 'build' failed [ 349s] make: *** [build] Error 2 [ 349s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 349s] ### VM INTERACTION START ### [ 352s] [ 336.389101] sysrq: Power Off [ 352s] [ 336.416648] reboot: Power down [ 352s] ### VM INTERACTION END ### [ 352s] [ 352s] cloud112 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:52:05 UTC 2021. [ 352s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:52:35 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:52:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <60355d1c8c55a_d852b0a6e29c5f42645fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 381s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 381s] echo 0.2.1 > .version-t && mv .version-t .version [ 381s] make all-recursive [ 381s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 381s] Making all in src [ 381s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 381s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 381s] In file included from internal.h:8, [ 381s] from cbc_main.c:47: [ 381s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 381s] 6 | #include [ 381s] | ^~~~~~~~~~~~~~~~~~~~~ [ 381s] compilation terminated. [ 381s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 381s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 381s] make[2]: *** [Makefile:422: all-recursive] Error 1 [ 381s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 381s] make[1]: *** [Makefile:369: all] Error 2 [ 381s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 381s] dh_auto_build: error: make -j1 returned exit code 2 [ 381s] make: *** [debian/rules:45: build] Error 25 [ 381s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 381s] ### VM INTERACTION START ### [ 382s] Powering off. [ 382s] [ 364.979662] reboot: Power down [ 382s] ### VM INTERACTION END ### [ 382s] [ 382s] lamb17 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:52:28 UTC 2021. [ 382s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 19:53:09 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:53:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60355d3a10bd8_d852b0a6e29c5f42656e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_20.10/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 380s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 380s] echo 0.2.1 > .version-t && mv .version-t .version [ 380s] make all-recursive [ 380s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 380s] Making all in src [ 380s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 380s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 380s] In file included from internal.h:8, [ 380s] from cbc_main.c:47: [ 380s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 380s] 6 | #include [ 380s] | ^~~~~~~~~~~~~~~~~~~~~ [ 380s] compilation terminated. [ 380s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 380s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 380s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 380s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 380s] make[1]: *** [Makefile:367: all] Error 2 [ 380s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 380s] dh_auto_build: error: make -j1 returned exit code 2 [ 380s] make: *** [debian/rules:45: build] Error 25 [ 380s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 380s] ### VM INTERACTION START ### [ 381s] Powering off. [ 381s] [ 364.673847] reboot: Power down [ 381s] ### VM INTERACTION END ### [ 381s] [ 381s] lamb68 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:52:55 UTC 2021. [ 381s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Feb 23 19:57:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 23 Feb 2021 19:57:09 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-fr-test/jenkins.sh File ttcn3-fr-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-fr-test/jenkins.sh at a20 PS1, Line 20: # Disable features not in latest yet I would keep this block empty everywhere instead of removing it completely. I am pretty sure there will be the need to apply something 'latest' specific in the future. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 23 Feb 2021 19:57:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Feb 23 19:59:09 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 19:59:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60355ea53d3de_d852b0a6e29c5f4268585@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 707s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 707s] echo 0.2.1 > .version-t && mv .version-t .version [ 707s] make all-recursive [ 707s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 707s] Making all in src [ 707s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 707s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 707s] In file included from internal.h:8, [ 707s] from cbc_main.c:47: [ 707s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 707s] 6 | #include [ 707s] | ^~~~~~~~~~~~~~~~~~~~~ [ 707s] compilation terminated. [ 707s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 707s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 707s] make[2]: *** [Makefile:422: all-recursive] Error 1 [ 707s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 707s] make[1]: *** [Makefile:369: all] Error 2 [ 707s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 707s] dh_auto_build: error: make -j1 returned exit code 2 [ 708s] make: *** [debian/rules:45: build] Error 25 [ 708s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 708s] ### VM INTERACTION START ### [ 709s] Powering off. [ 709s] [ 647.726462] reboot: Power down [ 709s] ### VM INTERACTION END ### [ 709s] [ 709s] lamb51 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 19:58:55 UTC 2021. [ 709s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 20:00:53 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 20:00:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <60355efcc8fe3_d852b0a6e29c5f42693e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 330s] Making all in src [ 330s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 330s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/x86_64-linux-gnu -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 330s] In file included from internal.h:8:0, [ 330s] from cbc_main.c:47: [ 330s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 330s] #include [ 330s] ^~~~~~~~~~~~~~~~~~~~~ [ 330s] compilation terminated. [ 330s] Makefile:455: recipe for target 'cbc_main.o' failed [ 330s] make[3]: *** [cbc_main.o] Error 1 [ 330s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 330s] Makefile:420: recipe for target 'all-recursive' failed [ 330s] make[2]: *** [all-recursive] Error 1 [ 330s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 330s] Makefile:367: recipe for target 'all' failed [ 330s] make[1]: *** [all] Error 2 [ 330s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 330s] dh_auto_build: make -j1 returned exit code 2 [ 330s] debian/rules:45: recipe for target 'build' failed [ 330s] make: *** [build] Error 2 [ 330s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 330s] ### VM INTERACTION START ### [ 333s] [ 318.422958] sysrq: Power Off [ 333s] [ 318.427159] reboot: Power down [ 333s] ### VM INTERACTION END ### [ 333s] [ 333s] lamb65 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 20:00:42 UTC 2021. [ 333s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 20:12:36 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 20:12:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Raspbian_10/armv7l In-Reply-To: References: Message-ID: <603561bc7f680_d852b0a6e29c5f42750e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Raspbian_10/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 1136s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 1136s] echo 0.2.1 > .version-t && mv .version-t .version [ 1136s] make all-recursive [ 1136s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 1136s] Making all in src [ 1136s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 1136s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 1137s] In file included from internal.h:8, [ 1137s] from cbc_main.c:47: [ 1137s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 1137s] #include [ 1137s] ^~~~~~~~~~~~~~~~~~~~~ [ 1137s] compilation terminated. [ 1137s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 1137s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1137s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 1137s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1137s] make[1]: *** [Makefile:367: all] Error 2 [ 1137s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1137s] dh_auto_build: make -j1 returned exit code 2 [ 1137s] make: *** [debian/rules:45: build] Error 2 [ 1137s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1137s] ### VM INTERACTION START ### [ 1140s] [ 1047.569267] sysrq: SysRq : Power Off [ 1140s] [ 1047.620935] reboot: Power down [ 1141s] ### VM INTERACTION END ### [ 1141s] [ 1141s] obs-arm-5 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 20:12:19 UTC 2021. [ 1141s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 20:23:28 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 20:23:28 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <603564461a43c_d852b0a6e29c5f4279099@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_9.0/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 515s] Making all in src [ 515s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 515s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 515s] In file included from internal.h:8:0, [ 515s] from cbc_main.c:47: [ 515s] cbc_data.h:6:31: fatal error: osmocom/core/it_q.h: No such file or directory [ 515s] #include [ 515s] ^ [ 515s] compilation terminated. [ 515s] Makefile:455: recipe for target 'cbc_main.o' failed [ 515s] make[3]: *** [cbc_main.o] Error 1 [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 515s] Makefile:420: recipe for target 'all-recursive' failed [ 515s] make[2]: *** [all-recursive] Error 1 [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] Makefile:367: recipe for target 'all' failed [ 515s] make[1]: *** [all] Error 2 [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_auto_build: make -j1 returned exit code 2 [ 515s] debian/rules:45: recipe for target 'build' failed [ 515s] make: *** [build] Error 2 [ 515s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 515s] ### VM INTERACTION START ### [ 518s] [ 482.565881] sysrq: SysRq : Power Off [ 518s] [ 482.572303] reboot: Power down [ 519s] ### VM INTERACTION END ### [ 519s] [ 519s] obs-arm-5 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 20:23:12 UTC 2021. [ 519s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Feb 23 20:53:53 2021 From: admin at opensuse.org (OBS Notification) Date: Tue, 23 Feb 2021 20:53:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_10/armv7l In-Reply-To: References: Message-ID: <60356b698ae86_d852b0a6e29c5f429835@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_10/armv7l Package network:osmocom:latest/osmo-cbc failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 1723s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 1723s] echo 0.2.1 > .version-t && mv .version-t .version [ 1723s] make all-recursive [ 1723s] make[2]: Entering directory '/usr/src/packages/BUILD' [ 1723s] Making all in src [ 1723s] make[3]: Entering directory '/usr/src/packages/BUILD/src' [ 1723s] gcc -DPACKAGE_NAME=\"osmo-cbc\" -DPACKAGE_TARNAME=\"osmo-cbc\" -DPACKAGE_VERSION=\"0.2.1\" -DPACKAGE_STRING=\"osmo-cbc\ 0.2.1\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-cbc\" -DVERSION=\"0.2.1\" -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/\" -I. -I../src -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wall -g -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/arm-linux-gnueabihf -I/usr/include/p11-kit-1 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wall -c -o cbc_main.o cbc_main.c [ 1723s] In file included from internal.h:8, [ 1723s] from cbc_main.c:47: [ 1723s] cbc_data.h:6:10: fatal error: osmocom/core/it_q.h: No such file or directory [ 1723s] #include [ 1723s] ^~~~~~~~~~~~~~~~~~~~~ [ 1723s] compilation terminated. [ 1723s] make[3]: *** [Makefile:467: cbc_main.o] Error 1 [ 1723s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 1723s] make[2]: *** [Makefile:420: all-recursive] Error 1 [ 1723s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1723s] make[1]: *** [Makefile:367: all] Error 2 [ 1723s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1723s] dh_auto_build: make -j1 returned exit code 2 [ 1723s] make: *** [debian/rules:45: build] Error 2 [ 1723s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1723s] ### VM INTERACTION START ### [ 1726s] [ 1617.278271] sysrq: SysRq : Power Off [ 1727s] [ 1617.478481] reboot: Power down [ 1728s] ### VM INTERACTION END ### [ 1728s] [ 1728s] armbuild22 failed "build osmo-cbc_0.2.1.dsc" at Tue Feb 23 20:53:37 UTC 2021. [ 1728s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:32:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:32:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <6035aca3a0ba7_d852b0a6e29c5f4384056@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 172s] | .PHONY: code-coverage-cobertura [ 172s] | ABS_TAPSET_DIR='' [ 172s] | ACLOCAL='${SHELL} /home/abuild/rpmbuild/BUILD/libosmocore-1.5.0.1.1815/missing aclocal-1.15' [ 172s] | ALLOCA='' [ 172s] | AMDEPBACKSLASH='' [ 172s] | AMDEP_FALSE='' [ 172s] | AMDEP_TRUE='#' [ 172s] | AMTAR='$${TAR-tar}' [ 172s] | AM_BACKSLASH='\' [ 172s] | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' [ 172s] | AM_DEFAULT_VERBOSITY='0' [ 172s] | AM_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage [ 172s] | AM_DISTCHECK_CONFIGURE_FLAGS ?= [ 172s] | AM_V='$(V)' [ 172s] | AR='ar' [ 172s] | AUTOCONF='${SHELL} /home/abuild/rpmbuild/BUILD/libosmocore-1.5.0.1.1815/missing autoconf' [ 172s] | AUTOHEADER='${SHELL} /home/abuild/rpmbuild/BUILD/libosmocore-1.5.0.1.1815/missing autoheader' [ 172s] | AUTOMAKE='${SHELL} /home/abuild/rpmbuild/BUILD/libosmocore-1.5.0.1.1815/missing automake-1.15' [ 172s] | AWK='gawk' [ 172s] | BACKTRACE_LIB='' [ 172s] | CC='gcc' [ 172s] | CCDEPMODE='depmode=none' [ 172s] | CFLAGS='-fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -std=gnu11 -DBUILDING_LIBOSMOCORE -Wall' [ 174s] | CODE_CO[ 159.721341] sysrq: SysRq : Power Off [ 174s] [ 159.722766] reboot: Power down [ 174s] ### VM INTERACTION END ### [ 174s] [ 174s] obs-arm-9 failed "build libosmocore.spec" at Wed Feb 24 01:32:01 UTC 2021. [ 174s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:33:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:33:32 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <6035acfcce4d5_d852b0a6e29c5f4384684@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 116s] Requires: libc.so.6 libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.4) libosmocore.so.17 libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 116s] Processing files: libosmocodec-devel-1.5.0.1.1815-1.1.i586 [ 116s] Provides: libosmocodec-devel = 1.5.0.1.1815-1.1 libosmocodec-devel(x86-32) = 1.5.0.1.1815-1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 116s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 116s] Requires: /usr/bin/pkg-config [ 116s] Processing files: libosmocoding0-1.5.0.1.1815-1.1.i586 [ 116s] Provides: libosmocoding.so.0 libosmocoding.so.0(LIBOSMOCODING_1.0) libosmocoding0 = 1.5.0.1.1815-1.1 libosmocoding0(x86-32) = 1.5.0.1.1815-1.1 [ 116s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 116s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 116s] Requires(post): /sbin/ldconfig [ 116s] Requires(postun): /sbin/ldconfig [ 116s] Requires: libc.so.6 libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libosmocodec.so.0 libosmocore.so.17 libosmogsm.so.16 libosmogsm.so.16(LIBOSMOGSM_1.0) [ 116s] Processing files: libosmocoding-devel-1.5.0.1.1815-1.1.i586 [ 116s] Provides: libosmocoding-devel = 1.5.0.1.1815-1.1 libosmocoding-devel(x86-32) = 1.5.0.1.1815-1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 116s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 116s] Requires: /usr/bin/pkg-config [ 116s] Processing files: libosmocore17-1.5.0.1.1815-1.1.i586 [ 116s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.i386/usr/lib/libosmocore.so.16* [ 116s] [ 116s] [ 116s] RPM build errors: [ 116s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.i386/usr/lib/libosmocore.so.16* [ 116s] ### VM INTERACTION START ### [ 118s] [ 110.893804] sysrq: Power Off [ 118s] [ 110.899631] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] lamb05 failed "build libosmocore.spec" at Wed Feb 24 01:33:21 UTC 2021. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:38:22 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:38:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <6035ae2c24c1b_d852b0a6e29c5f438641b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 206s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocore.so.17()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 206s] Processing files: libosmocodec-devel-1.5.0.1.1815-1.1.aarch64 [ 206s] Provides: libosmocodec-devel = 1.5.0.1.1815-1.1 libosmocodec-devel(aarch-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 206s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 206s] Requires: /usr/bin/pkg-config [ 206s] Processing files: libosmocoding0-1.5.0.1.1815-1.1.aarch64 [ 206s] Provides: libosmocoding.so.0()(64bit) libosmocoding.so.0(LIBOSMOCODING_1.0)(64bit) libosmocoding0 = 1.5.0.1.1815-1.1 libosmocoding0(aarch-64) = 1.5.0.1.1815-1.1 [ 206s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 206s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 206s] Requires(post): /sbin/ldconfig [ 206s] Requires(postun): /sbin/ldconfig [ 206s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmocodec.so.0()(64bit) libosmocore.so.17()(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) [ 206s] Processing files: libosmocoding-devel-1.5.0.1.1815-1.1.aarch64 [ 206s] Provides: libosmocoding-devel = 1.5.0.1.1815-1.1 libosmocoding-devel(aarch-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 206s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 206s] Requires: /usr/bin/pkg-config [ 206s] Processing files: libosmocore17-1.5.0.1.1815-1.1.aarch64 [ 206s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.aarch64/usr/lib64/libosmocore.so.16* [ 206s] [ 206s] [ 206s] RPM build errors: [ 206s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.aarch64/usr/lib64/libosmocore.so.16* [ 206s] ### VM INTERACTION START ### [ 209s] [ 194.175410] sysrq: Power Off [ 209s] [ 194.212280] reboot: Power down [ 209s] ### VM INTERACTION END ### [ 209s] [ 209s] obs-arm-9 failed "build libosmocore.spec" at Wed Feb 24 01:38:04 UTC 2021. [ 209s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:39:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:39:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in CentOS_8/aarch64 In-Reply-To: References: Message-ID: <6035ae6492d30_d852b0a6e29c5f438679a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/CentOS_8/aarch64 Package network:osmocom:nightly/libosmocore failed to build in CentOS_8/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 265s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libdl.so.2()(64bit) libmnl.so.0()(64bit) libosmocore.so.17()(64bit) libpthread.so.0()(64bit) libsctp.so.1()(64bit) libsystemd.so.0()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) rtld(GNU_HASH) [ 265s] Processing files: libosmocodec-devel-1.5.0.1.1815-1.1.aarch64 [ 265s] Provides: libosmocodec-devel = 1.5.0.1.1815-1.1 libosmocodec-devel(aarch-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 265s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 265s] Requires: /usr/bin/pkg-config libosmocodec.so.0()(64bit) [ 265s] Processing files: libosmocoding0-1.5.0.1.1815-1.1.aarch64 [ 265s] Provides: libosmocoding.so.0()(64bit) libosmocoding.so.0(LIBOSMOCODING_1.0)(64bit) libosmocoding0 = 1.5.0.1.1815-1.1 libosmocoding0(aarch-64) = 1.5.0.1.1815-1.1 [ 265s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 265s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 265s] Requires(post): /sbin/ldconfig [ 265s] Requires(postun): /sbin/ldconfig [ 265s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libdl.so.2()(64bit) libgnutls.so.30()(64bit) libmnl.so.0()(64bit) libosmocodec.so.0()(64bit) libosmocore.so.17()(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libsctp.so.1()(64bit) libsystemd.so.0()(64bit) libtalloc.so.2()(64bit) rtld(GNU_HASH) [ 265s] Processing files: libosmocoding-devel-1.5.0.1.1815-1.1.aarch64 [ 265s] Provides: libosmocoding-devel = 1.5.0.1.1815-1.1 libosmocoding-devel(aarch-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 265s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 265s] Requires: /usr/bin/pkg-config libosmocoding.so.0()(64bit) [ 265s] Processing files: libosmocore17-1.5.0.1.1815-1.1.aarch64 [ 265s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.aarch64/usr/lib64/libosmocore.so.16* [ 265s] [ 265s] [ 265s] RPM build errors: [ 265s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.aarch64/usr/lib64/libosmocore.so.16* [ 265s] ### VM INTERACTION START ### [ 265s] Powering off. [ 265s] [ 243.082923] reboot: Power down [ 265s] ### VM INTERACTION END ### [ 265s] [ 265s] obs-arm-8 failed "build libosmocore.spec" at Wed Feb 24 01:39:07 UTC 2021. [ 265s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:39:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:39:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <6035ae8281c5a_d852b0a6e29c5f438716d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 97s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.17()(64bit) libpthread.so.0()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 97s] Processing files: libosmocodec-devel-1.5.0.1.1815-lp152.1.1.x86_64 [ 97s] Provides: libosmocodec-devel = 1.5.0.1.1815-lp152.1.1 libosmocodec-devel(x86-64) = 1.5.0.1.1815-lp152.1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 97s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 97s] Requires: /usr/bin/pkg-config [ 97s] Processing files: libosmocoding0-1.5.0.1.1815-lp152.1.1.x86_64 [ 97s] Provides: libosmocoding.so.0()(64bit) libosmocoding.so.0(LIBOSMOCODING_1.0)(64bit) libosmocoding0 = 1.5.0.1.1815-lp152.1.1 libosmocoding0(x86-64) = 1.5.0.1.1815-lp152.1.1 [ 97s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 97s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 97s] Requires(post): /sbin/ldconfig [ 97s] Requires(postun): /sbin/ldconfig [ 97s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocodec.so.0()(64bit) libosmocore.so.17()(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) [ 97s] Processing files: libosmocoding-devel-1.5.0.1.1815-lp152.1.1.x86_64 [ 97s] Provides: libosmocoding-devel = 1.5.0.1.1815-lp152.1.1 libosmocoding-devel(x86-64) = 1.5.0.1.1815-lp152.1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 97s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 97s] Requires: /usr/bin/pkg-config [ 97s] Processing files: libosmocore17-1.5.0.1.1815-lp152.1.1.x86_64 [ 97s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-lp152.1.1.x86_64/usr/lib64/libosmocore.so.16* [ 97s] [ 97s] [ 97s] RPM build errors: [ 97s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-lp152.1.1.x86_64/usr/lib64/libosmocore.so.16* [ 97s] ### VM INTERACTION START ### [ 101s] [ 92.867184] sysrq: Power Off [ 101s] [ 92.874838] reboot: Power down [ 101s] ### VM INTERACTION END ### [ 101s] [ 101s] lamb64 failed "build libosmocore.spec" at Wed Feb 24 01:39:45 UTC 2021. [ 101s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:40:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:40:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <6035ae83a6a30_d852b0a6e29c5f43872e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 114s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.17()(64bit) libpthread.so.0()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 114s] Processing files: libosmocodec-devel-1.5.0.1.1815-lp151.1.1.x86_64 [ 114s] Provides: libosmocodec-devel = 1.5.0.1.1815-lp151.1.1 libosmocodec-devel(x86-64) = 1.5.0.1.1815-lp151.1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 114s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 114s] Requires: /usr/bin/pkg-config [ 114s] Processing files: libosmocoding0-1.5.0.1.1815-lp151.1.1.x86_64 [ 114s] Provides: libosmocoding.so.0()(64bit) libosmocoding.so.0(LIBOSMOCODING_1.0)(64bit) libosmocoding0 = 1.5.0.1.1815-lp151.1.1 libosmocoding0(x86-64) = 1.5.0.1.1815-lp151.1.1 [ 114s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 114s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 114s] Requires(post): /sbin/ldconfig [ 114s] Requires(postun): /sbin/ldconfig [ 114s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocodec.so.0()(64bit) libosmocore.so.17()(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) [ 114s] Processing files: libosmocoding-devel-1.5.0.1.1815-lp151.1.1.x86_64 [ 114s] Provides: libosmocoding-devel = 1.5.0.1.1815-lp151.1.1 libosmocoding-devel(x86-64) = 1.5.0.1.1815-lp151.1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 114s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 114s] Requires: /usr/bin/pkg-config [ 114s] Processing files: libosmocore17-1.5.0.1.1815-lp151.1.1.x86_64 [ 114s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-lp151.1.1.x86_64/usr/lib64/libosmocore.so.16* [ 114s] [ 114s] [ 114s] RPM build errors: [ 114s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-lp151.1.1.x86_64/usr/lib64/libosmocore.so.16* [ 114s] ### VM INTERACTION START ### [ 118s] [ 109.077803] sysrq: SysRq : Power Off [ 118s] [ 109.083657] reboot: Power down [ 118s] ### VM INTERACTION END ### [ 118s] [ 118s] lamb73 failed "build libosmocore.spec" at Wed Feb 24 01:39:53 UTC 2021. [ 118s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:40:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:40:23 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <6035ae9e8a0e3_d852b0a6e29c5f43874ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 132s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocore.so.17()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 132s] Processing files: libosmocodec-devel-1.5.0.1.1815-1.1.x86_64 [ 132s] Provides: libosmocodec-devel = 1.5.0.1.1815-1.1 libosmocodec-devel(x86-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 132s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 132s] Requires: /usr/bin/pkg-config [ 132s] Processing files: libosmocoding0-1.5.0.1.1815-1.1.x86_64 [ 132s] Provides: libosmocoding.so.0()(64bit) libosmocoding.so.0(LIBOSMOCODING_1.0)(64bit) libosmocoding0 = 1.5.0.1.1815-1.1 libosmocoding0(x86-64) = 1.5.0.1.1815-1.1 [ 132s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 132s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 132s] Requires(post): /sbin/ldconfig [ 132s] Requires(postun): /sbin/ldconfig [ 132s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libosmocodec.so.0()(64bit) libosmocore.so.17()(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) [ 132s] Processing files: libosmocoding-devel-1.5.0.1.1815-1.1.x86_64 [ 132s] Provides: libosmocoding-devel = 1.5.0.1.1815-1.1 libosmocoding-devel(x86-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 132s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 132s] Requires: /usr/bin/pkg-config [ 132s] Processing files: libosmocore17-1.5.0.1.1815-1.1.x86_64 [ 132s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.x86_64/usr/lib64/libosmocore.so.16* [ 132s] [ 132s] [ 132s] RPM build errors: [ 132s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.x86_64/usr/lib64/libosmocore.so.16* [ 132s] ### VM INTERACTION START ### [ 134s] [ 126.638653] sysrq: Power Off [ 134s] [ 126.661941] reboot: Power down [ 134s] ### VM INTERACTION END ### [ 134s] [ 134s] lamb70 failed "build libosmocore.spec" at Wed Feb 24 01:40:15 UTC 2021. [ 134s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 01:42:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 01:42:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in CentOS_8/x86_64 In-Reply-To: References: Message-ID: <6035af01df7af_d852b0a6e29c5f438799b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/CentOS_8/x86_64 Package network:osmocom:nightly/libosmocore failed to build in CentOS_8/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 148s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.4)(64bit) libdl.so.2()(64bit) libmnl.so.0()(64bit) libosmocore.so.17()(64bit) libpthread.so.0()(64bit) libsctp.so.1()(64bit) libsystemd.so.0()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) rtld(GNU_HASH) [ 148s] Processing files: libosmocodec-devel-1.5.0.1.1815-1.1.x86_64 [ 148s] Provides: libosmocodec-devel = 1.5.0.1.1815-1.1 libosmocodec-devel(x86-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocodec) = 1.5.0.1.1815 [ 148s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 148s] Requires: /usr/bin/pkg-config libosmocodec.so.0()(64bit) [ 148s] Processing files: libosmocoding0-1.5.0.1.1815-1.1.x86_64 [ 148s] Provides: libosmocoding.so.0()(64bit) libosmocoding.so.0(LIBOSMOCODING_1.0)(64bit) libosmocoding0 = 1.5.0.1.1815-1.1 libosmocoding0(x86-64) = 1.5.0.1.1815-1.1 [ 148s] Requires(interp): /sbin/ldconfig /sbin/ldconfig [ 148s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 148s] Requires(post): /sbin/ldconfig [ 148s] Requires(postun): /sbin/ldconfig [ 148s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libdl.so.2()(64bit) libgnutls.so.30()(64bit) libmnl.so.0()(64bit) libosmocodec.so.0()(64bit) libosmocore.so.17()(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libpthread.so.0()(64bit) libsctp.so.1()(64bit) libsystemd.so.0()(64bit) libtalloc.so.2()(64bit) rtld(GNU_HASH) [ 148s] Processing files: libosmocoding-devel-1.5.0.1.1815-1.1.x86_64 [ 148s] Provides: libosmocoding-devel = 1.5.0.1.1815-1.1 libosmocoding-devel(x86-64) = 1.5.0.1.1815-1.1 pkgconfig(libosmocoding) = 1.5.0.1.1815 [ 148s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 148s] Requires: /usr/bin/pkg-config libosmocoding.so.0()(64bit) [ 148s] Processing files: libosmocore17-1.5.0.1.1815-1.1.x86_64 [ 148s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.x86_64/usr/lib64/libosmocore.so.16* [ 148s] [ 148s] [ 148s] RPM build errors: [ 148s] File not found: /home/abuild/rpmbuild/BUILDROOT/libosmocore-1.5.0.1.1815-1.1.x86_64/usr/lib64/libosmocore.so.16* [ 148s] ### VM INTERACTION START ### [ 149s] Powering off. [ 149s] [ 136.078293] reboot: Power down [ 149s] ### VM INTERACTION END ### [ 149s] [ 149s] lamb11 failed "build libosmocore.spec" at Wed Feb 24 01:41:59 UTC 2021. [ 149s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:48:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:48:23 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035be9258f4e_d852b0a6e29c5f44071ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_9.0/i586 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.271449] dracut-mount[381]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to viPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_6/root: 25535 [ 320s] qemu-kvm: terminating on signal 15 from pid 21578 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (25527) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:51:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:51:32 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/i586 In-Reply-To: References: Message-ID: <6035bf4797c33_d852b0a6e29c5f4407858@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 18432 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.686658] dracut-mount[421]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_6/root: 48085 [ 319s] qemu-kvm: terminating on signal 15 from pid 59447 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (48071) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:53:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:53:15 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_10/i586 In-Reply-To: References: Message-ID: <6035bfa027887_d852b0a6e29c5f44087cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_10/i586 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.272375] dracut-mount[382]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_6/root: 32667 [ 315s] qemu-kvm: terminating on signal 15 from pid 19732 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (32660) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:53:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:53:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035bfa17aa68_d852b0a6e29c5f44088a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 19s] cycle: debhelper -> dh-autoreconf [ 19s] breaking dependency debhelper -> dh-autoreconf [ 19s] cycle: dh-strip-nondeterminism -> debhelper [ 19s] breaking dependency debhelper -> dh-strip-nondeterminism [ 19s] done [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] Using UART console [ 20s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 20s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM... [ 26s] c[?7l[ 5.556825] dracut-mount[339]: Warning: Can't mount root filesystem [ 26s] [ 26s] Generating "/run/initramfs/rdsosreport.txt" [ 26s] [ 26s] [ 26s] Entering emergency mode. Exit the shell to continue. [ 26s] Type "journalctl" to view system logs. [ 26s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB sPress Enter for maintenance [ 330s] (or press Control-D to continue): [ 330s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_3/root: 29963 [ 331s] qemu-kvm: terminating on signal 15 from pid 2370 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (29955) - No such process [ 331s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 331s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:53:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:53:49 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035bfdc1491c_d852b0a6e29c5f4409070@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 16s] done [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] Using UART console [ 17s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 18s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM... [ 24s] c[?7l[ 5.628183] dracut-mount[342]: Warning: Can't mount root filesystem [ 24s] [ 24s] Generating "/run/initramfs/rdsosreport.txt" [ 24s] [ 24s] [ 24s] Entering emergency mode. Exit the shell to continue. [ 24s] Type "journalctl" to view system logs. [ 24s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 24s] after mounting them and attach it to a bug report. [ 24s] [ 24s] [ 24s] Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_1/root: 21039 [ 323s] qemu-kvm: terminating on signal 15 from pid 29012 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (21031) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:54:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:54:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035bfde86f06_d852b0a6e29c5f44091bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 8s] cycle: libc6 -> libgcc1 -> multiarch-support [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: dh-python -> python3 [ 8s] breaking dependency python3 -> dh-python [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.685117] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "jPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_7/root: 8018 [ 320s] qemu-kvm: terminating on signal 15 from pid 19826 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (8010) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:54:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:54:23 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035bff873ac1_d852b0a6e29c5f440928@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 11s] cycle: debhelper -> dh-autoreconf [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM... [ 18s] c[?7l[ 5.633715] dracut-mount[340]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_4/root: 3488 [ 319s] qemu-kvm: terminating on signal 15 from pid 11155 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (3480) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:54:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:54:23 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035bff9be558_d852b0a6e29c5f4409350@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 10s] Booting from ROM... [ 15s] c[?7l[ 5.133448] dracut-mount[341]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_3/root: 2990 [ 320s] qemu-kvm: terminating on signal 15 from pid 10763 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (2982) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:54:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:54:23 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035bffaaddc6_d852b0a6e29c5f44094c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.076024] dracut-mount[382]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_4/root: 5174 [ 316s] qemu-kvm: terminating on signal 15 from pid 12641 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (5166) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:55:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:55:49 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035c055b3869_d852b0a6e29c5f440969a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_8.0/i586 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 6s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 6s] done [ 6s] booting kvm... [ 6s] ### VM INTERACTION START ### [ 6s] Using UART console [ 6s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 4.739112] dracut-mount[361]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 12s] after mounting them and attach it to a bug report. [ 12s] [ 12s] [ 12s] Press Enter for maintenance [ 312s] (or press Control-D to continue): [ 312s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 312s] /var/cache/obs/worker/root_5/root: 51043 [ 312s] qemu-kvm: terminating on signal 15 from pid 22247 () [ 312s] ### VM INTERACTION END ### [ 312s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (51035) - No such process [ 312s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 312s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 02:57:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 02:57:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035c09351248_d852b0a6e29c5f44099b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.046746] dracut-mount[362]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_6/root: 11456 [ 315s] qemu-kvm: terminating on signal 15 from pid 544 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (11448) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:01:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:01:49 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_10/i586 In-Reply-To: References: Message-ID: <6035c1b9b3552_d852b0a6e29c5f4411034@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_10/i586 Package network:osmocom:nightly/libasn1c failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.322354] dracut-mount[373]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_4/root: 30989 [ 320s] qemu-kvm: terminating on signal 15 from pid 8391 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (30981) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:03:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:03:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035c2164d6af_d852b0a6e29c5f4411589@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 10s] Booting from ROM... [ 16s] c[?7l[ 5.155499] dracut-mount[339]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_1/root: 10117 [ 320s] qemu-kvm: terminating on signal 15 from pid 17235 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (10109) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:03:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:03:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035c215d0330_d852b0a6e29c5f441146b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 11s] Booting from ROM..c[?7l[ 3.765407] dracut-mount[332]: Warning: Can't mount root filesystem [ 11s] [ 11s] Generating "/run/initramfs/rdsosreport.txt" [ 11s] [ 11s] [ 11s] Entering emergency mode. Exit the shell to continue. [ 11s] Type "journalctl" to view system logs. [ 11s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 11s] after mounting them and attach it to a bug report. [ 11s] [ 11s] [ 11s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_2/root: 20588 [ 317s] qemu-kvm: terminating on signal 15 from pid 27920 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (20580) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:03:48 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:03:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035c2188e82e_d852b0a6e29c5f44116a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 12s] breaking dependency libcrypt1 -> libc6 [ 12s] cycle: debhelper -> dh-autoreconf [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] cycle: dh-strip-nondeterminism -> debhelper [ 12s] breaking dependency debhelper -> dh-strip-nondeterminism [ 12s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM... [ 18s] c[?7l[ 5.135911] dracut-mount[339]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "jPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_2/root: 16784 [ 318s] qemu-kvm: terminating on signal 15 from pid 27622 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (16776) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:06:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:06:23 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035c2c939de0_d852b0a6e29c5f441249f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_8.0/i586 Package network:osmocom:nightly/libasn1c failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: libc6 -> libgcc1 -> multiarch-support [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.387379] dracut-mount[366]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_8/root: 13166 [ 319s] qemu-kvm: terminating on signal 15 from pid 882 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (13158) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:07:14 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:07:14 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035c2e75317a_d852b0a6e29c5f44125f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/i586 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.982206] dracut-mount[380]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosrepPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_7/root: 19590 [ 314s] qemu-kvm: terminating on signal 15 from pid 15864 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (19581) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:11:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:11:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035c3d85c5bd_d852b0a6e29c5f441282c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] [16/16] preinstalling binutils... [ 9s] copying packages... [ 11s] reordering...cycle: libc6 -> libgcc-s1 [ 11s] breaking dependency libc6 -> libgcc-s1 [ 11s] cycle: libc6 -> libcrypt1 [ 11s] breaking dependency libcrypt1 -> libc6 [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 4.677960] dracut-mount[363]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to viPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_8/root: 64678 [ 317s] qemu-kvm: terminating on signal 15 from pid 34732 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (64670) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:12:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:12:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035c415b7816_d852b0a6e29c5f44133f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 4.586509] dracut-mount[360]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 12s] after mounting them and attach it to a bug report. [ 12s] [ 12s] [ 12s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_5/root: 6495 [ 318s] qemu-kvm: terminating on signal 15 from pid 42597 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (6487) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:12:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:12:23 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035c430cee04_d852b0a6e29c5f4413475@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_8.0/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.431233] dracut-mount[343]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_9/root: 15337 [ 319s] qemu-kvm: terminating on signal 15 from pid 10617 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (15325) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:12:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:12:40 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035c432d9e1b_d852b0a6e29c5f4413551@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_9.0/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 8s] breaking dependency python3 -> dh-python [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.179328] dracut-mount[372]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosrepPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_6/root: 8610 [ 319s] qemu-kvm: terminating on signal 15 from pid 9058 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (8588) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:12:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:12:40 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035c433c17a9_d852b0a6e29c5f44136b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_18.04/x86_64 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.212558] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_2/root: 25451 [ 315s] qemu-kvm: terminating on signal 15 from pid 12376 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (25443) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:12:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:12:57 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035c451de46a_d852b0a6e29c5f4413988@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_10/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.282566] dracut-mount[380]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_1/root: 7473 [ 321s] qemu-kvm: terminating on signal 15 from pid 5268 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (7457) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:19:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:19:57 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <6035c5f396252_d852b0a6e29c5f4415622@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_19.04/i586 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.037309] dracut-mount[381]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. Press Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_12/root: 7667 [ 314s] qemu-kvm: terminating on signal 15 from pid 13965 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (7659) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:20:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:20:15 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035c5f496e9b_d852b0a6e29c5f44157aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_9.0/i586 Package network:osmocom:latest/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: dh-python -> python3 [ 8s] breaking dependency python3 -> dh-python [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.406680] dracut-mount[382]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. ExitPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_3/root: 19144 [ 319s] qemu-kvm: terminating on signal 15 from pid 6473 (fuser) [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (19136) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:20:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:20:32 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <6035c60eb271b_d852b0a6e29c5f44158b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_18.04/i586 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 6.197060] dracut-mount[341]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_3/root: 26193 [ 321s] qemu-kvm: terminating on signal 15 from pid 20945 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (26185) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:21:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:21:23 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <6035c64cb3a8b_d852b0a6e29c5f441613a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_18.04/i586 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 20s] breaking dependency debhelper -> dh-strip-nondeterminism [ 20s] done [ 20s] booting kvm... [ 21s] ### VM INTERACTION START ### [ 21s] Using UART console [ 21s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 25600 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 21s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 29s] Booting from ROM..c[?7l[ 7.351854] dracut-mount[454]: Warning: Can't mount root filesystem [ 29s] [ 29s] Generating "/run/initramfs/rdsosreport.txt" [ 29s] [ 29s] [ 29s] Entering emergency mode. Exit the shell to continue. [ 29s] Type "journalctl" to view system logs. [ 29s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 29s] after mounting them and attach it to a bug report. [ 29s] [ 29s] [ 29s] Press Enter for maintenance [ 328s] (or press Control-D to continue): [ 328s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_2/root: 213208 [ 329s] qemu-kvm: terminating on signal 15 from pid 221419 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (213201) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:22:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:22:31 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_10/i586 In-Reply-To: References: Message-ID: <6035c689a0e3b_d852b0a6e29c5f4416593@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_10/i586 Package network:osmocom:latest/libosmocore failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 9s] reordering...cycle: libc6 -> libgcc1 [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 4.925543] dracut-mount[380]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to viPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_2/root: 5604 [ 320s] qemu-kvm: terminating on signal 15 from pid 24003 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (5596) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:23:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:23:56 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035c6e1770d1_d852b0a6e29c5f4417021@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_9.0/i586 Package network:osmocom:latest/libasn1c failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM... [ 20s] c[?7l[ 5.568691] dracut-mount[340]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 20s] after mounting them and attach it to a bug report. [ 20s] [ 20s] [ 20s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_2/root: 8453 [ 318s] qemu-kvm: terminating on signal 15 from pid 13628 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (8443) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:29:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:29:39 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035c82e1d107_d852b0a6e29c5f44189a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_8.0/i586 Package network:osmocom:latest/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 7s] breaking dependency multiarch-support -> libc6 [ 7s] cycle: dh-python -> python3 [ 7s] breaking dependency python3 -> dh-python [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.406533] dracut-mount[375]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. Press Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_1/root: 24189 [ 313s] qemu-kvm: terminating on signal 15 from pid 4603 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (24181) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:29:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:29:39 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035c82d91068_d852b0a6e29c5f44188ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_19.04/x86_64 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 6.547398] dracut-mount[380]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_1/root: 4589 [ 321s] qemu-kvm: terminating on signal 15 from pid 16461 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (4581) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:29:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:29:39 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035c830aa91c_d852b0a6e29c5f4419136@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 27s] copying packages... [ 35s] reordering...cycle: libc6 -> libgcc-s1 [ 35s] breaking dependency libc6 -> libgcc-s1 [ 35s] cycle: libc6 -> libcrypt1 [ 35s] breaking dependency libcrypt1 -> libc6 [ 35s] done [ 36s] booting kvm... [ 36s] ### VM INTERACTION START ### [ 36s] Using UART console [ 36s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_16/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_16/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_16/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 36s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 46s] Booting from ROM..c[?7l[ 8.738656] dracut-mount[381]: Warning: Can't mount root filesystem [ 46s] [ 46s] Generating "/run/initramfs/rdsosreport.txt" [ 46s] [ 46s] [ 46s] Entering emergency mode. Exit the shell to continue. [ 46s] Type "journalctl" to view system logs. [ 46s] You might want to save "/run/initramfs/rdsosrepPress Enter for maintenance [ 346s] (or press Control-D to continue): [ 346s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] /var/cache/obs/worker/root_16/root: 25193 [ 347s] qemu-kvm: terminating on signal 15 from pid 12239 () [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/16/build/build-vm: line 485: kill: (25156) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:29:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:29:56 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035c84b9e01b_d852b0a6e29c5f4419217@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_19.10/x86_64 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.950191] dracut-mount[363]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mountingPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_3/root: 23804 [ 318s] qemu-kvm: terminating on signal 15 from pid 62175 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (23796) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:29:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:29:56 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035c84d607d7_d852b0a6e29c5f44193bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/Debian_Testing/x86_64 Package network:osmocom:latest/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 10s] copying packages... [ 13s] reordering...cycle: libc6 -> libgcc-s1 [ 13s] breaking dependency libc6 -> libgcc-s1 [ 13s] cycle: libc6 -> libcrypt1 [ 13s] breaking dependency libcrypt1 -> libc6 [ 13s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.196227] dracut-mount[373]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USPress Enter for maintenance [ 324s] (or press Control-D to continue): [ 324s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 324s] /var/cache/obs/worker/root_2/root: 5677 [ 324s] qemu-kvm: terminating on signal 15 from pid 5242 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (5669) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:30:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:30:49 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <6035c8873386b_d852b0a6e29c5f4419721@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_19.04/i586 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 9s] reordering...cycle: libc6 -> libgcc1 [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.328173] dracut-mount[366]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "jPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_9/root: 23651 [ 315s] qemu-kvm: terminating on signal 15 from pid 14689 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (23643) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:32:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:32:15 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035c8e14f6cf_d852b0a6e29c5f44199f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_20.10/x86_64 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 4.715942] dracut-mount[362]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_7/root: 42447 [ 315s] qemu-kvm: terminating on signal 15 from pid 17487 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (42438) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:32:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:32:32 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035c8e3e7cdd_d852b0a6e29c5f44201e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/xUbuntu_20.04/x86_64 Package network:osmocom:latest/libosmocore failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: [ 16s] breaking dependency libcrypt1 -> libc6 [ 16s] cycle: debhelper -> dh-autoreconf [ 16s] breaking dependency debhelper -> dh-autoreconf [ 16s] cycle: dh-strip-nondeterminism -> debhelper [ 16s] breaking dependency debhelper -> dh-strip-nondeterminism [ 16s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 23s] Booting from ROM..c[?7l[ 5.993860] dracut-mount[381]: Warning: Can't mount root filesystem [ 24s] [ 24s] Generating "/run/initramfs/rdsosreport.txt" [ 24s] [ 24s] [ 24s] Entering emergency mode. Exit the shell to continue. [ 24s] Type "journalctl" to view system logs. [ 24s] You might want to save "/run/initramfs/rdsosreporPress Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_5/root: 31272 [ 323s] qemu-kvm: terminating on signal 15 from pid 21383 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (31264) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:32:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:32:49 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_10/i586 In-Reply-To: References: Message-ID: <6035c8ff5e257_d852b0a6e29c5f44202aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_10/i586 Package network:osmocom:latest/libasn1c failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.114060] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_9/root: 19257 [ 320s] qemu-kvm: terminating on signal 15 from pid 14921 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (19249) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:33:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:33:40 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035c91a2c4a6_d852b0a6e29c5f442049@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_8.0/i586 Package network:osmocom:latest/libasn1c failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 7s] cycle: libc6 -> libgcc1 -> multiarch-support [ 7s] breaking dependency multiarch-support -> libc6 [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] done [ 7s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.173426] dracut-mount[379]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mountingPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_6/root: 24723 [ 318s] qemu-kvm: terminating on signal 15 from pid 24226 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (24715) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:34:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:34:53 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035c973ac292_d852b0a6e29c5f4420525@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 6s] breaking dependency libgcc1 -> libc6 [ 6s] cycle: debhelper -> dh-autoreconf [ 6s] breaking dependency debhelper -> dh-autoreconf [ 6s] cycle: dh-strip-nondeterminism -> debhelper [ 6s] breaking dependency debhelper -> dh-strip-nondeterminism [ 6s] done [ 6s] booting kvm... [ 6s] ### VM INTERACTION START ### [ 6s] Using UART console [ 6s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 25600 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 6s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 7.260127] dracut-mount[457]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_4/root: 181874 [ 316s] qemu-kvm: terminating on signal 15 from pid 190278 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (181866) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:34:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:34:53 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035c97441da8_d852b0a6e29c5f44206f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.544586] dracut-mount[354]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mountingPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_11/root: 1393 [ 314s] qemu-kvm: terminating on signal 15 from pid 52993 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/11/build/build-vm: line 485: kill: (1377) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:34:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:34:53 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035c97683f6a_d852b0a6e29c5f44209bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.657453] dracut-mount[383]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_5/root: 18603 [ 315s] qemu-kvm: terminating on signal 15 from pid 29743 (fuser) [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (18595) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:34:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:34:53 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035c97621840_d852b0a6e29c5f44208c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.132811] dracut-mount[382]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_8/root: 4066 [ 319s] qemu-kvm: terminating on signal 15 from pid 27819 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (4052) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:41:27 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:41:27 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035cb01b1549_d852b0a6e29c5f442307c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_10/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] cycle: dh-strip-nondeterminism -> debhelper [ 12s] breaking dependency debhelper -> dh-strip-nondeterminism [ 12s] done [ 12s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM... [ 18s] c[?7l[ 5.077523] dracut-mount[341]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting thPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_4/root: 20820 [ 318s] qemu-kvm: terminating on signal 15 from pid 28038 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (20812) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:42:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:42:36 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035cb3db9740_d852b0a6e29c5f4423494@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_8.0/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 10s] Booting from ROM... [ 15s] c[?7l[ 5.073358] dracut-mount[339]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mountingPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 4833 [ 315s] qemu-kvm: terminating on signal 15 from pid 12153 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (4825) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:42:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:42:53 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035cb57b6c80_d852b0a6e29c5f44235ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.428911] dracut-mount[340]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 20s] after mounting them and attach it to a bug report. [ 20s] [ 20s] [ 20s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_4/root: 13119 [ 321s] qemu-kvm: terminating on signal 15 from pid 19232 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (13111) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:42:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:42:53 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035cb588a19e_d852b0a6e29c5f442364f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Testing/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM... [ 19s] c[?7l[ 5.074999] dracut-mount[338]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 19s] after mounting them and attach it to a bug report. [ 19s] [ 19s] [ 19s] Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 324s] /var/cache/obs/worker/root_4/root: 20727 [ 324s] qemu-kvm: terminating on signal 15 from pid 6568 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (20719) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:43:10 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:43:10 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035cb5bd3f75_d852b0a6e29c5f4423783@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_9.0/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 13s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM... [ 25s] c[?7l[ 5.304322] dracut-mount[340]: Warning: Can't mount root filesystem [ 25s] [ 25s] Generating "/run/initramfs/rdsosreport.txt" [ 25s] [ 25s] [ 25s] Entering emergency mode. Exit the shell to continue. [ 25s] Type "journalctl" to view system logs. [ 25s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 25s] after mounting them and attachPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_3/root: 5124 [ 319s] qemu-kvm: terminating on signal 15 from pid 16312 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (5116) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 03:59:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 03:59:26 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035cf311e883_d852b0a6e29c5f44279d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 34s] copying packages... [ 39s] reordering...cycle: libc6 -> libgcc-s1 [ 39s] breaking dependency libc6 -> libgcc-s1 [ 39s] cycle: libc6 -> libcrypt1 [ 39s] breaking dependency libcrypt1 -> libc6 [ 39s] done [ 40s] booting kvm... [ 40s] ### VM INTERACTION START ### [ 40s] Using UART console [ 40s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 41s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 51s] Booting from ROM..c[?7l[ 9.364359] dracut-mount[381]: Warning: Can't mount root filesystem [ 51s] [ 51s] Generating "/run/initramfs/rdsosreport.txt" [ 51s] [ 51s] [ 51s] Entering emergency mode. Exit the shell to continue. [ 51s] Type "journalctl" to view system logs. [ 51s] You might want to save "/run/inPress Enter for maintenance [ 346s] (or press Control-D to continue): [ 346s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 346s] /var/cache/obs/worker/root_2/root: 15971 [ 346s] qemu-kvm: terminating on signal 15 from pid 2035 () [ 346s] ### VM INTERACTION END ### [ 346s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (15945) - No such process [ 346s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 346s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:06:55 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:06:55 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035d0f73d3de_d852b0a6e29c5f44294d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/i586 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.101538] dracut-mount[379]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "jPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_9/root: 30806 [ 319s] qemu-kvm: terminating on signal 15 from pid 4521 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (30798) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:07:49 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:07:49 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035d13093498_d852b0a6e29c5f442979f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_20.04/x86_64 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.049117] dracut-mount[343]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_4/root: 23013 [ 318s] qemu-kvm: terminating on signal 15 from pid 17477 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (23006) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:08:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:08:57 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035d170330cc_d852b0a6e29c5f4430189@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_10/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.152812] dracut-mount[366]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attachPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_11/root: 19870 [ 320s] qemu-kvm: terminating on signal 15 from pid 19428 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/11/build/build-vm: line 485: kill: (19862) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:17:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:17:15 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035d3513102e_d852b0a6e29c5f4431980@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_18.04/x86_64 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 5s] breaking dependency debhelper -> dh-strip-nondeterminism [ 5s] done [ 5s] booting kvm... [ 5s] ### VM INTERACTION START ### [ 5s] Using UART console [ 5s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 25600 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 5s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 10s] Booting from ROM..c[?7l[ 5.002422] dracut-mount[419]: Warning: Can't mount root filesystem [ 11s] [ 11s] Generating "/run/initramfs/rdsosreport.txt" [ 11s] [ 11s] [ 11s] Entering emergency mode. Exit the shell to continue. [ 11s] Type "journalctl" to view system logs. [ 11s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 11s] after mounting them and attach it to a bug report. [ 11s] [ 11s] [ 11s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_4/root: 24030 [ 316s] qemu-kvm: terminating on signal 15 from pid 49763 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (24021) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:17:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:17:15 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035d351ac7e6_d852b0a6e29c5f44320ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_20.10/x86_64 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 8s] breaking dependency libnss-nisplus -> libnsl2 [ 8s] cycle: libc6 -> libnss-nisplus -> libtirpc3 -> libgssapi-krb5-2 -> libkrb5support0 [ 8s] breaking dependency libtirpc3 -> libgssapi-krb5-2 [ 8s] cycle: dh-autoreconf -> debhelper [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.993167] dracut-mount[380]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_1/root: 21982 [ 318s] qemu-kvm: terminating on signal 15 from pid 1310 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (21974) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:17:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:17:15 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035d35233fbe_d852b0a6e29c5f44321e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_19.04/x86_64 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 4.648943] dracut-mount[334]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 12s] after mounting them and attach it to a bug report. [ 12s] [ 12s] [ 12s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_1/root: 20045 [ 317s] qemu-kvm: terminating on signal 15 from pid 25797 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (20037) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:17:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:17:32 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035d36cb3b7c_d852b0a6e29c5f443221@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/xUbuntu_19.10/x86_64 Package network:osmocom:latest/libasn1c failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 6.988721] dracut-mount[379]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 19s] after mounting them and attach it to a bug report. [ 19s] [ 19s] [ 19s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_1/root: 26615 [ 318s] qemu-kvm: terminating on signal 15 from pid 16989 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (26607) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:17:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:17:32 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035d36d787fa_d852b0a6e29c5f44323d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_9.0/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.057367] dracut-mount[379]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug report. [ 13s] [ 13s] [ 13s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_2/root: 8602 [ 319s] qemu-kvm: terminating on signal 15 from pid 10546 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (8594) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:20:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:20:57 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035d43e463cc_d852b0a6e29c5f44329d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_8.0/i586 Package network:osmocom:nightly/libgtpnl failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 7s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: libc6 -> libgcc1 -> multiarch-support [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.194933] dracut-mount[366]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_1/root: 3210 [ 314s] qemu-kvm: terminating on signal 15 from pid 1548 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (3202) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:22:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:22:39 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_10/i586 In-Reply-To: References: Message-ID: <6035d498415a1_d852b0a6e29c5f443351c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_10/i586 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.231248] dracut-mount[382]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_1/root: 29868 [ 316s] qemu-kvm: terminating on signal 15 from pid 12353 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (29860) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:24:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:24:57 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035d52e83610_d852b0a6e29c5f443393e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Testing/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 15s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 16s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM... [ 21s] c[?7l[ 5.162368] dracut-mount[339]: Warning: Can't mount root filesystem [ 22s] [ 22s] Generating "/run/initramfs/rdsosreport.txt" [ 22s] [ 22s] [ 22s] Entering emergency mode. Exit the shell to continue. [ 22s] Type "journalctl" to view system logs. [ 22s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 22s] after mounting them and attach it to a bug report. [ 22s] [ 22s] [ 22s] Press Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_2/root: 4204 [ 326s] qemu-kvm: terminating on signal 15 from pid 12984 () [ 326s] ### VM INTERACTION END ### [ 326s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (4196) - No such process [ 326s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 326s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:25:14 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:25:14 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035d532c8238_d852b0a6e29c5f44342e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_8.0/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 12s] reordering...cycle: libc6 -> libgcc1 [ 12s] breaking dependency libgcc1 -> libc6 [ 12s] cycle: libc6 -> libgcc1 -> multiarch-support [ 12s] breaking dependency multiarch-support -> libc6 [ 12s] cycle: libdevmapper1.02.1 -> dmsetup [ 12s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 12s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 6.514300] dracut-mount[381]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to viPress Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_2/root: 6389 [ 323s] qemu-kvm: terminating on signal 15 from pid 20655 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (6382) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:25:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:25:31 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035d54d60744_d852b0a6e29c5f4434470@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_8.0/i586 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 16s] done [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] Using UART console [ 17s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM... [ 23s] c[?7l[ 5.137445] dracut-mount[339]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to continue. [ 23s] Type "journalctl" to view system logs. [ 23s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 23s] after mounting them and attach it to a bug report. [ 23s] [ 23s] [ 23s] Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_1/root: 3717 [ 323s] qemu-kvm: terminating on signal 15 from pid 15654 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (3708) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:26:22 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:26:22 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_10/i586 In-Reply-To: References: Message-ID: <6035d585e7ca9_d852b0a6e29c5f4434589@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_10/i586 Package network:osmocom:nightly/libgtpnl failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.135489] dracut-mount[382]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_8/root: 10921 [ 316s] qemu-kvm: terminating on signal 15 from pid 3236 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (10913) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:26:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:26:39 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035d58a2cc63_d852b0a6e29c5f44349e2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_8.0/i586 Package network:osmocom:nightly/libusrp failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 13s] cycle: libc6 -> libgcc1 -> multiarch-support [ 13s] breaking dependency multiarch-support -> libc6 [ 13s] cycle: libdevmapper1.02.1 -> dmsetup [ 13s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 21s] Booting from ROM..c[?7l[ 6.816271] dracut-mount[382]: Warning: Can't mount root filesystem [ 21s] [ 21s] Generating "/run/initramfs/rdsosreport.txt" [ 21s] [ 21s] [ 21s] Entering emergency mode. Exit the shell to continue. [ 21s] Type "journalctl" to view system logs. [ 21s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 21s] after mounting them and attach it to a bug repPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_3/root: 32678 [ 319s] qemu-kvm: terminating on signal 15 from pid 15359 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (32670) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:30:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:30:44 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <6035d695a165a_d852b0a6e29c5f44361f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_18.04/i586 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.498173] dracut-mount[381]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attachPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_7/root: 21023 [ 320s] qemu-kvm: terminating on signal 15 from pid 15199 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (21015) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:30:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:30:44 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035d69640dc3_d852b0a6e29c5f44362b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/i586 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_13/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_13/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_13/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.711388] dracut-mount[362]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug repPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_13/root: 44987 [ 314s] qemu-kvm: terminating on signal 15 from pid 20448 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/13/build/build-vm: line 485: kill: (44979) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:31:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:31:52 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035d6d45ae96_d852b0a6e29c5f443676@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/libasn1c failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 11s] cycle: libc6 -> libnss-nisplus -> libtirpc3 -> libgssapi-krb5-2 -> libkrb5support0 [ 11s] breaking dependency libtirpc3 -> libgssapi-krb5-2 [ 11s] cycle: dh-autoreconf -> debhelper [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 7.079676] dracut-mount[379]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 20s] Press Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_8/root: 31559 [ 322s] qemu-kvm: terminating on signal 15 from pid 19203 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (31550) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:31:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:31:52 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035d6d4e58f1_d852b0a6e29c5f4436875@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Testing/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 11s] [16/16] preinstalling binutils... [ 11s] copying packages... [ 13s] reordering...cycle: libc6 -> libgcc-s1 [ 13s] breaking dependency libc6 -> libgcc-s1 [ 13s] cycle: libc6 -> libcrypt1 [ 13s] breaking dependency libcrypt1 -> libc6 [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.247209] dracut-mount[382]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to viPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_9/root: 26845 [ 319s] qemu-kvm: terminating on signal 15 from pid 29892 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (26837) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:32:09 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:32:09 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <6035d6d598ada_d852b0a6e29c5f44369ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_18.04/i586 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 9s] Booting from ROM... [ 14s] c[?7l[ 5.113178] dracut-mount[339]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mountingPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_1/root: 13248 [ 319s] qemu-kvm: terminating on signal 15 from pid 21600 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (13240) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:32:45 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:32:45 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035d6f4a3748_d852b0a6e29c5f443749a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/i586 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 7s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.149770] dracut-mount[382]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. ExitPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_2/root: 29132 [ 314s] qemu-kvm: terminating on signal 15 from pid 19434 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (29124) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:33:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:33:53 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035d74a89f80_d852b0a6e29c5f4438129@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_Unstable/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 15s] reordering...cycle: libc6 -> libgcc-s1 [ 15s] breaking dependency libc6 -> libgcc-s1 [ 15s] cycle: libc6 -> libcrypt1 [ 15s] breaking dependency libcrypt1 -> libc6 [ 15s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM... [ 23s] c[?7l[ 6.545263] dracut-mount[382]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to continue. [ 23s] Type "journalctl" to view system logs. [ 23s] You might want Press Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_4/root: 17921 [ 326s] qemu-kvm: terminating on signal 15 from pid 26005 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (17914) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:39:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:39:36 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <6035d897c18e8_d852b0a6e29c5f4439887@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_19.04/i586 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 7s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.143363] dracut-mount[380]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_3/root: 21025 [ 320s] qemu-kvm: terminating on signal 15 from pid 21529 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (21017) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:39:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:39:53 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035d8b1b1bfd_d852b0a6e29c5f4439978@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_9.0/i586 Package network:osmocom:latest/libgtpnl failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 36s] done [ 37s] booting kvm... [ 37s] ### VM INTERACTION START ### [ 37s] Using UART console [ 37s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 38s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 38s] Booting from ROM... [ 49s] c[?7l[ 9.557307] dracut-mount[382]: Warning: Can't mount root filesystem [ 50s] [ 50s] Generating "/run/initramfs/rdsosreport.txt" [ 50s] [ 50s] [ 50s] Entering emergency mode. Exit the shell to continue. [ 50s] Type "journalctl" to view system logs. [ 50s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 50s] after mounting them and attach it to a bug report. [ 50s] [ 50s] [ 50s] Press Enter for maintenance [ 347s] (or press Control-D to continue): [ 347s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] /var/cache/obs/worker/root_4/root: 7568 [ 347s] qemu-kvm: terminating on signal 15 from pid 26794 () [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (7556) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:41:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:41:01 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_10/i586 In-Reply-To: References: Message-ID: <6035d8edb0193_d852b0a6e29c5f44402e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_10/i586 Package network:osmocom:nightly/libusrp failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 11s] breaking dependency libgcc1 -> libc6 [ 11s] cycle: debhelper -> dh-autoreconf [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.515586] dracut-mount[368]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_8/root: 15148 [ 318s] qemu-kvm: terminating on signal 15 from pid 11484 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (15140) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:41:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:41:18 +0000 Subject: Build failure of network:osmocom:latest/libasn1c in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035d90dca7c9_d852b0a6e29c5f44404dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libasn1c/Debian_8.0/x86_64 Package network:osmocom:latest/libasn1c failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libasn1c Last lines of build log: [ 6s] reordering...cycle: libc6 -> libgcc1 [ 6s] breaking dependency libgcc1 -> libc6 [ 6s] cycle: libc6 -> libgcc1 -> multiarch-support [ 6s] breaking dependency multiarch-support -> libc6 [ 6s] cycle: libdevmapper1.02.1 -> dmsetup [ 6s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 6s] done [ 6s] booting kvm... [ 6s] ### VM INTERACTION START ### [ 6s] Using UART console [ 6s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 18432 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 6s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 5.527832] dracut-mount[425]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to viPress Enter for maintenance [ 312s] (or press Control-D to continue): [ 312s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 312s] /var/cache/obs/worker/root_4/root: 46205 [ 312s] qemu-kvm: terminating on signal 15 from pid 63773 () [ 312s] ### VM INTERACTION END ### [ 312s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (46198) - No such process [ 312s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 312s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:44:45 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:44:45 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035d9c252ecb_d852b0a6e29c5f4441538@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libasn1c failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.129644] dracut-mount[381]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "jPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_12/root: 30781 [ 314s] qemu-kvm: terminating on signal 15 from pid 32429 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (30773) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:44:45 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:44:45 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035d9c3217b2_d852b0a6e29c5f4441662@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libasn1c failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.483922] dracut-mount[380]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_11/root: 16368 [ 314s] qemu-kvm: terminating on signal 15 from pid 17062 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/11/build/build-vm: line 485: kill: (16358) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:44:45 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:44:45 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035d9c3bd33f_d852b0a6e29c5f4441796@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/libasn1c failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 8s] cycle: libc6 -> libcrypt1 [ 8s] breaking dependency libcrypt1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.761426] dracut-mount[362]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to viPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_7/root: 57047 [ 318s] qemu-kvm: terminating on signal 15 from pid 37016 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (57039) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:48:10 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:48:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <6035da9670f2a_d852b0a6e29c5f444290@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 365s] | [ 365s] | CONFIG_FILES = [ 365s] | CONFIG_HEADERS = [ 365s] | CONFIG_LINKS = [ 365s] | CONFIG_COMMANDS = [ 365s] | $ ./config.status [ 365s] | [ 365s] | on armbuild02 [ 365s] | [ 365s] | config.status:1364: creating libosmocore.pc [ 365s] | config.status:1364: creating libosmocodec.pc [ 365s] | config.status:1364: creating libosmocoding.pc [ 365s] | config.status:1364: creating libosmovty.pc [ 365s] | config.status:1364: creating libosmogsm.pc [ 365s] | config.status:1364: creating libosmogb.pc [ 365s] | config.status:1364: creating libosmoctrl.pc [ 365s] | config.status:1364: creating libosmosim.pc [ 365s] | config.status:1364: creating libosmousb.pc [ 365s] | config.status:1364: creating include/Makefile [ 365s] | config.status:1364: creating src/Makefile [ 365s] | config.status:1364: creating src/vty/Makefile [ 365s] | config.status:1364: creating src/codec/Makefile [ 365s] | config.status:1364: creating src/coding/Makefile [ 367s] | config.status:136[ 334.682621] sysrq: SysRq : Power Off [ 367s] [ 334.686054] reboot: Power down [ 367s] ### VM INTERACTION END ### [ 367s] [ 367s] armbuild02 failed "build libosmocore.spec" at Wed Feb 24 04:48:02 UTC 2021. [ 367s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:50:27 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:50:27 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <6035db25aa1eb_d852b0a6e29c5f44437c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_19.04/i586 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 6.892608] dracut-mount[382]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_10/root: 25066 [ 315s] qemu-kvm: terminating on signal 15 from pid 7139 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (25058) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:59:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:59:35 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035dd46db3a_d852b0a6e29c5f44470fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_18.04/x86_64 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 4.713428] dracut-mount[363]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 12s] after mounting tPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_3/root: 27611 [ 317s] qemu-kvm: terminating on signal 15 from pid 49095 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (27602) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 04:59:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 04:59:35 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035dd468e9df_d852b0a6e29c5f44471cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_10/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 13s] reordering...cycle: libc6 -> libgcc1 [ 13s] breaking dependency libgcc1 -> libc6 [ 13s] cycle: debhelper -> dh-autoreconf [ 13s] breaking dependency debhelper -> dh-autoreconf [ 13s] cycle: dh-strip-nondeterminism -> debhelper [ 13s] breaking dependency debhelper -> dh-strip-nondeterminism [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.631214] dracut-mount[341]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "jouPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_3/root: 19120 [ 319s] qemu-kvm: terminating on signal 15 from pid 27974 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (19112) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:03:20 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:03:20 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035de3219d67_d852b0a6e29c5f44491a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_20.10/x86_64 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 49s] breaking dependency libnss-nisplus -> libnsl2 [ 49s] cycle: libc6 -> libnss-nisplus -> libtirpc3 -> libgssapi-krb5-2 -> libkrb5support0 [ 49s] breaking dependency libtirpc3 -> libgssapi-krb5-2 [ 49s] cycle: dh-autoreconf -> debhelper [ 49s] breaking dependency debhelper -> dh-autoreconf [ 49s] done [ 50s] booting kvm... [ 50s] ### VM INTERACTION START ### [ 50s] Using UART console [ 50s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_13/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_13/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_13/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 51s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 63s] Booting from ROM..c[?7l[ 12.278758] dracut-mount[380]: Warning: Can't mount root filesystem [ 64s] [ 64s] Generating "/run/initramfs/rdsosreport.txt" [ 64s] [ 64s] [ 64s] Entering emergency mode. Exit the shell to continue. [ 64s] Type "journalctl" to view system logs. Press Enter for maintenance [ 359s] (or press Control-D to continue): [ 359s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 360s] /var/cache/obs/worker/root_13/root: 11072 [ 360s] qemu-kvm: terminating on signal 15 from pid 6781 (fuser) [ 360s] ### VM INTERACTION END ### [ 360s] /var/run/obs/worker/13/build/build-vm: line 485: kill: (11053) - No such process [ 360s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 360s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:06:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:06:32 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035dee9be20a_d852b0a6e29c5f444986c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_9.0/i586 Package network:osmocom:latest/libsmpp34 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.905403] dracut-mount[340]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_1/root: 2467 [ 316s] qemu-kvm: terminating on signal 15 from pid 21760 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (2459) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:07:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:07:23 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035df2215632_d852b0a6e29c5f445009b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_8.0/i586 Package network:osmocom:latest/libsmpp34 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 9s] cycle: libc6 -> libgcc1 -> multiarch-support [ 9s] breaking dependency multiarch-support -> libc6 [ 9s] cycle: libdevmapper1.02.1 -> dmsetup [ 9s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 11s] Booting from ROM... [ 17s] c[?7l[ 5.572418] dracut-mount[339]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosrepPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_1/root: 20692 [ 317s] qemu-kvm: terminating on signal 15 from pid 25561 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (20684) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:07:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:07:57 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035df42e4a79_d852b0a6e29c5f4450178@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_8.0/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 7s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: libc6 -> libgcc1 -> multiarch-support [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.241386] dracut-mount[382]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emerPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_3/root: 4910 [ 320s] qemu-kvm: terminating on signal 15 from pid 25473 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (4901) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:08:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:08:32 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035df5eb384c_d852b0a6e29c5f445029b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_10/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 36s] [71/72] preinstalling sysv-rc... [ 37s] [72/72] preinstalling initscripts... [ 37s] [ 37s] [1/1] preinstalling libdevmapper1.02.1... [ 38s] copying packages... [ 45s] reordering...cycle: libc6 -> libgcc1 [ 45s] breaking dependency libgcc1 -> libc6 [ 45s] cycle: debhelper -> dh-autoreconf [ 45s] breaking dependency debhelper -> dh-autoreconf [ 45s] cycle: dh-strip-nondeterminism -> debhelper [ 45s] breaking dependency debhelper -> dh-strip-nondeterminism [ 45s] done [ 45s] booting kvm... [ 46s] ### VM INTERACTION START ### [ 46s] Using UART console [ 46s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 46s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 59s] Booting from ROM..c[?7l[ 10.748333] dracut-mount[386]: Warning: Can't mount root filesystem [ 59s] Press Enter for maintenance [ 353s] (or press Control-D to continue): [ 353s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 353s] /var/cache/obs/worker/root_1/root: 14655 [ 353s] qemu-kvm: terminating on signal 15 from pid 30085 () [ 353s] ### VM INTERACTION END ### [ 353s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (14648) - No such process [ 353s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 353s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:09:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:09:40 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_10/i586 In-Reply-To: References: Message-ID: <6035dfa0e9983_d852b0a6e29c5f4450842@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_10/i586 Package network:osmocom:latest/libgtpnl failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 7s] copying packages... [ 9s] reordering...cycle: libc6 -> libgcc1 [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 4.753270] dracut-mount[364]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_4/root: 11984 [ 319s] qemu-kvm: terminating on signal 15 from pid 47414 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (11976) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:11:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:11:06 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035dff5ab0ea_d852b0a6e29c5f44510ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_19.04/x86_64 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.753250] dracut-mount[359]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mountingPress Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_12/root: 41682 [ 313s] qemu-kvm: terminating on signal 15 from pid 11668 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (41668) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:11:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:11:40 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_10/i586 In-Reply-To: References: Message-ID: <6035e018d82d1_d852b0a6e29c5f4451245@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_10/i586 Package network:osmocom:latest/libsmpp34 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 6.469363] dracut-mount[382]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_3/root: 10924 [ 318s] qemu-kvm: terminating on signal 15 from pid 32090 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (10917) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:11:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:11:40 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035e0194afa0_d852b0a6e29c5f445132b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_19.10/x86_64 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.197896] dracut-mount[381]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_7/root: 4966 [ 319s] qemu-kvm: terminating on signal 15 from pid 21737 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (4950) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:11:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:11:40 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035e01ad34f0_d852b0a6e29c5f44514c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/xUbuntu_20.04/x86_64 Package network:osmocom:latest/libgtpnl failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 7s] breaking dependency libcrypt1 -> libc6 [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 18432 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.744797] dracut-mount[419]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_2/root: 9624 [ 313s] qemu-kvm: terminating on signal 15 from pid 23223 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (9616) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:11:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:11:57 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035e030bce4e_d852b0a6e29c5f445169e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_9.0/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.167123] dracut-mount[368]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_3/root: 5361 [ 319s] qemu-kvm: terminating on signal 15 from pid 21750 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (5352) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:12:14 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:12:14 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035e03448bb1_d852b0a6e29c5f44518d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_8.0/i586 Package network:osmocom:latest/libgtpnl failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 51s] done [ 51s] booting kvm... [ 51s] ### VM INTERACTION START ### [ 51s] Using UART console [ 51s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 52s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 52s] Booting from ROM... [ 66s] c[?7l[ 12.848013] dracut-mount[386]: Warning: Can't mount root filesystem [ 66s] [ 66s] Generating "/run/initramfs/rdsosreport.txt" [ 66s] [ 66s] [ 66s] Entering emergency mode. Exit the shell to continue. [ 66s] Type "journalctl" to view system logs. [ 66s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 66s] after mounting them and attach it to a bug report. [ 66s] [ 66s] [ 66s] Press Enter for maintenance [ 357s] (or press Control-D to continue): [ 357s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 357s] /var/cache/obs/worker/root_4/root: 29592 [ 357s] qemu-kvm: terminating on signal 15 from pid 7767 () [ 358s] ### VM INTERACTION END ### [ 358s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (29561) - No such process [ 358s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 358s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:15:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:15:57 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035e12268fd5_d852b0a6e29c5f4452828@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libasn1c failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 13s] breaking dependency debhelper -> dh-strip-nondeterminism [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 23s] Booting from ROM..c[?7l[ 9.125703] dracut-mount[380]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to continue. [ 23s] Type "journalctl" to view system logs. [ 23s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 23s] after mounting them and attach it to a bug report. [ 23s] [ 23s] [ 23s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_5/root: 457 [ 319s] qemu-kvm: terminating on signal 15 from pid 21954 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (449) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:19:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:19:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_10/i586 In-Reply-To: References: Message-ID: <6035e1f44c697_d852b0a6e29c5f4453579@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_10/i586 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 11s] reordering...cycle: libc6 -> libgcc1 [ 11s] breaking dependency libgcc1 -> libc6 [ 11s] cycle: debhelper -> dh-autoreconf [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.204754] dracut-mount[366]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "jPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_8/root: 14337 [ 318s] qemu-kvm: terminating on signal 15 from pid 31044 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (14330) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:23:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:23:39 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035e2e511a56_d852b0a6e29c5f44550df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_8.0/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.461086] dracut-mount[371]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_7/root: 16626 [ 314s] qemu-kvm: terminating on signal 15 from pid 3691 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (16618) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:25:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:25:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals-debian8 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035e3783435_d852b0a6e29c5f44554b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals-debian8/Debian_8.0/i586 Package network:osmocom:latest/osmo-gsm-manuals-debian8 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals-debian8 Last lines of build log: [ 15s] cycle: dh-python -> python3 [ 15s] breaking dependency python3 -> dh-python [ 15s] cycle: libdevmapper1.02.1 -> dmsetup [ 15s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 15s] cycle: libcupsimage2 -> libcupsfilters1 [ 15s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 15s] done [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] Using UART console [ 17s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM... [ 23s] c[?7l[ 5.581617] dracut-mount[341]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_3/root: 26506 [ 323s] qemu-kvm: terminating on signal 15 from pid 5227 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (26498) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:29:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:29:56 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035e46891161_d852b0a6e29c5f4456429@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_9.0/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 9s] Booting from ROM... [ 14s] c[?7l[ 5.124304] dracut-mount[381]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_5/root: 32063 [ 314s] qemu-kvm: terminating on signal 15 from pid 13978 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (32055) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:31:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:31:56 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035e4e01899b_d852b0a6e29c5f44575a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 16s] done [ 18s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] Using UART console [ 19s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 20s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM... [ 28s] c[?7l[ 7.536017] dracut-mount[339]: Warning: Can't mount root filesystem [ 29s] [ 29s] Generating "/run/initramfs/rdsosreport.txt" [ 29s] [ 29s] [ 29s] Entering emergency mode. Exit the shell to continue. [ 29s] Type "journalctl" to view system logs. [ 29s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 29s] after mounting them and attach it to a bug report. [ 29s] [ 29s] [ 29s] Press Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_1/root: 4097 [ 326s] qemu-kvm: terminating on signal 15 from pid 8743 () [ 326s] ### VM INTERACTION END ### [ 326s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (4089) - No such process [ 326s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 326s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:38:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:38:31 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035e66a1bcad_d852b0a6e29c5f446015a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Unstable/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 13s] breaking dependency libcrypt1 -> libc6 [ 13s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.268464] dracut-mount[380]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 19s] after mounting them and attach it to a bug report. [ 19s] [ 19s] [ 19s] Press Enter for maintenance [ 324s] (or press Control-D to continue): [ 324s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 324s] /var/cache/obs/worker/root_1/root: 15558 [ 324s] qemu-kvm: terminating on signal 15 from pid 15764 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (15543) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:39:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:39:39 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035e6a64f929_d852b0a6e29c5f446051d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_20.10/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 6s] breaking dependency debhelper -> dh-autoreconf [ 6s] done [ 6s] booting kvm... [ 6s] ### VM INTERACTION START ### [ 6s] Using UART console [ 6s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 25600 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 6s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 11s] Booting from ROM..c[?7l[ 4.934029] dracut-mount[414]: Warning: Can't mount root filesystem [ 11s] [ 11s] Generating "/run/initramfs/rdsosreport.txt" [ 11s] [ 11s] [ 11s] Entering emergency mode. Exit the shell to continue. [ 11s] Type "journalctl" to view system logs. [ 11s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 11s] after mounting them and attach it to a bug report. [ 11s] [ 11s] [ 11s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_3/root: 159503 [ 316s] qemu-kvm: terminating on signal 15 from pid 172317 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (159495) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:39:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:39:56 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035e6c0a16f7_d852b0a6e29c5f446072d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_18.04/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.345578] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_3/root: 31384 [ 320s] qemu-kvm: terminating on signal 15 from pid 32755 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (31377) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:41:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:41:06 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035e6ff423e9_d852b0a6e29c5f44612f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM... [ 17s] c[?7l[ 5.193677] dracut-mount[341]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_3/root: 14267 [ 322s] qemu-kvm: terminating on signal 15 from pid 22076 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (14259) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:43:05 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:43:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035e7743af82_d852b0a6e29c5f44614da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.951829] dracut-mount[363]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_4/root: 28461 [ 317s] qemu-kvm: terminating on signal 15 from pid 12184 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (28449) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:43:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:43:39 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035e7959d210_d852b0a6e29c5f4461537@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.283878] dracut-mount[371]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug repPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_3/root: 882 [ 320s] qemu-kvm: terminating on signal 15 from pid 29365 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (874) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:45:22 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:45:22 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035e81068a9c_d852b0a6e29c5f44624ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Unstable/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 11s] breaking dependency libcrypt1 -> libc6 [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 4.671027] dracut-mount[361]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_1/root: 35501 [ 317s] qemu-kvm: terminating on signal 15 from pid 11402 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (35483) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:45:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:45:40 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035e8172f487_d852b0a6e29c5f446275b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.154310] dracut-mount[367]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_8/root: 25862 [ 321s] qemu-kvm: terminating on signal 15 from pid 3197 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (25846) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:46:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:46:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035e84d5adc9_d852b0a6e29c5f446299a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_9.0/i586 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: dh-python -> python3 [ 10s] breaking dependency python3 -> dh-python [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 5.558607] dracut-mount[369]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. ExitPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_1/root: 30230 [ 317s] qemu-kvm: terminating on signal 15 from pid 17035 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (30222) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:48:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:48:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals-debian8 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035e8a3341a0_d852b0a6e29c5f44635c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals-debian8/Debian_8.0/i586 Package network:osmocom:nightly/osmo-gsm-manuals-debian8 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals-debian8 Last lines of build log: [ 7s] breaking dependency python3 -> dh-python [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] cycle: libcupsimage2 -> libcupsfilters1 [ 7s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.706150] dracut-mount[362]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/inPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_3/root: 46845 [ 318s] qemu-kvm: terminating on signal 15 from pid 14485 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (46837) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:49:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:49:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035e8fe23fd3_d852b0a6e29c5f44642eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_9.0/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 11s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM... [ 18s] c[?7l[ 5.066730] dracut-mount[341]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_3/root: 22236 [ 323s] qemu-kvm: terminating on signal 15 from pid 30939 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (22227) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:50:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:50:01 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035e918cd655_d852b0a6e29c5f44643c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_8.0/i586 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.944482] dracut-mount[343]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug report. [ 13s] [ 13s] [ 13s] Press Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_10/root: 1941 [ 313s] qemu-kvm: terminating on signal 15 from pid 25767 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (1933) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:52:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:52:02 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035e98f92f3c_d852b0a6e29c5f44648ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 12s] cycle: libc6 -> libnss-nisplus -> libtirpc3 -> libgssapi-krb5-2 -> libkrb5support0 [ 12s] breaking dependency libtirpc3 -> libgssapi-krb5-2 [ 12s] cycle: dh-autoreconf -> debhelper [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.397266] dracut-mount[381]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug repPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_8/root: 19894 [ 318s] qemu-kvm: terminating on signal 15 from pid 20511 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (19882) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:52:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:52:02 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035e9909637f_d852b0a6e29c5f446491a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.429017] dracut-mount[373]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/inPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 27173 [ 315s] qemu-kvm: terminating on signal 15 from pid 23144 (fuser) [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (27165) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:52:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:52:02 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035e99131230_d852b0a6e29c5f44650c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.296834] dracut-mount[363]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_4/root: 31205 [ 316s] qemu-kvm: terminating on signal 15 from pid 16383 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (31198) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:52:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:52:02 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035e992ecb0_d852b0a6e29c5f4465258@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Testing/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 10s] [16/16] preinstalling binutils... [ 10s] copying packages... [ 14s] reordering...cycle: libc6 -> libgcc-s1 [ 14s] breaking dependency libc6 -> libgcc-s1 [ 14s] cycle: libc6 -> libcrypt1 [ 14s] breaking dependency libcrypt1 -> libc6 [ 14s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.389140] dracut-mount[381]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to viPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_2/root: 20209 [ 320s] qemu-kvm: terminating on signal 15 from pid 18074 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (20197) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:52:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:52:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals-debian8 in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035e991a2e5c_d852b0a6e29c5f446518f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals-debian8/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-gsm-manuals-debian8 failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals-debian8 Last lines of build log: [ 10s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 6.134299] dracut-mount[380]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_8/root: 21615 [ 316s] qemu-kvm: terminating on signal 15 from pid 24732 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (21601) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:56:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:56:53 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035eabfde584_d852b0a6e29c5f4467122@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_10/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.027321] dracut-mount[344]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_5/root: 24970 [ 315s] qemu-kvm: terminating on signal 15 from pid 16583 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (24962) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:58:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:58:01 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6035eaf889cd2_d852b0a6e29c5f4467254@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_8.0/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.194766] dracut-mount[370]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_2/root: 7669 [ 314s] qemu-kvm: terminating on signal 15 from pid 27220 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (7660) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:58:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:58:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035eaf9acb4e_d852b0a6e29c5f44674cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_8.0/i586 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 20s] breaking dependency multiarch-support -> libc6 [ 20s] cycle: dh-python -> python3 [ 20s] breaking dependency python3 -> dh-python [ 20s] cycle: libdevmapper1.02.1 -> dmsetup [ 20s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 20s] done [ 21s] booting kvm... [ 21s] ### VM INTERACTION START ### [ 21s] Using UART console [ 21s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 22s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 34s] Booting from ROM..c[?7l[ 10.212829] dracut-mount[381]: Warning: Can't mount root filesystem [ 34s] [ 34s] Generating "/run/initramfs/rdsosreport.txt" [ 34s] [ 34s] [ 34s] Entering emergency mode. Exit the shell to continue. [ 34s] Type "journalctl" to view system logs. [ 34s] You might want to save "/run/initramfs/rdsosreport.txt" to a USPress Enter for maintenance [ 329s] (or press Control-D to continue): [ 329s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_7/root: 20524 [ 329s] qemu-kvm: terminating on signal 15 from pid 6533 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (20511) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:58:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:58:35 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035eb1a4bca1_d852b0a6e29c5f44676c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_20.04/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 44s] done [ 44s] booting kvm... [ 45s] ### VM INTERACTION START ### [ 45s] Using UART console [ 45s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 45s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 45s] Booting from ROM... [ 59s] c[?7l[ 11.272135] dracut-mount[345]: Warning: Can't mount root filesystem [ 60s] [ 60s] Generating "/run/initramfs/rdsosreport.txt" [ 60s] [ 60s] [ 60s] Entering emergency mode. Exit the shell to continue. [ 60s] Type "journalctl" to view system logs. [ 60s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 60s] after mounting them and attach it to a bug report. [ 60s] [ 60s] [ 60s] Press Enter for maintenance [ 355s] (or press Control-D to continue): [ 355s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 355s] /var/cache/obs/worker/root_3/root: 20837 [ 355s] qemu-kvm: terminating on signal 15 from pid 4796 () [ 355s] ### VM INTERACTION END ### [ 355s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (20820) - No such process [ 355s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 355s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:59:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:59:26 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_10/i586 In-Reply-To: References: Message-ID: <6035eb53ac8da_d852b0a6e29c5f44680c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_10/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.480747] dracut-mount[382]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/inPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_10/root: 28920 [ 316s] qemu-kvm: terminating on signal 15 from pid 27399 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (28912) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 05:59:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 05:59:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_10/i586 In-Reply-To: References: Message-ID: <6035eb546bc7a_d852b0a6e29c5f44681b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_10/i586 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 12s] breaking dependency debhelper -> dh-strip-nondeterminism [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.003027] dracut-mount[362]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_3/root: 17481 [ 323s] qemu-kvm: terminating on signal 15 from pid 30924 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (17473) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:02:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:02:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <6035ebe964225_d852b0a6e29c5f4470080@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_18.04/i586 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 6s] copying packages... [ 10s] reordering...cycle: libc6 -> libgcc1 [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.115219] dracut-mount[366]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_7/root: 12667 [ 321s] qemu-kvm: terminating on signal 15 from pid 9794 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (12660) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:06:19 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:06:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035ecf883b97_d852b0a6e29c5f44710f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_19.04/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.007091] dracut-mount[374]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_3/root: 16716 [ 321s] qemu-kvm: terminating on signal 15 from pid 15999 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (16708) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:08:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:08:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_10/i586 In-Reply-To: References: Message-ID: <6035ed7262d6d_d852b0a6e29c5f44716c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_10/i586 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.567521] dracut-mount[343]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_8/root: 17768 [ 320s] qemu-kvm: terminating on signal 15 from pid 15463 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (17760) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:11:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:11:44 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035ee246ad3b_d852b0a6e29c5f44722c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 2000 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.354892] dracut-mount[334]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug report. [ 13s] [ 13s] [ 13s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_2/root: 22918 [ 318s] qemu-kvm: terminating on signal 15 from pid 23453 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (22905) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:12:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:12:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_19.04/i586 In-Reply-To: References: Message-ID: <6035ee3fc1620_d852b0a6e29c5f4472533@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_19.04/i586 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_19.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 14s] breaking dependency debhelper -> dh-strip-nondeterminism [ 14s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 16s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 22s] Booting from ROM..c[?7l[ 5.497967] dracut-mount[339]: Warning: Can't mount root filesystem [ 22s] [ 22s] Generating "/run/initramfs/rdsosreport.txt" [ 22s] [ 22s] [ 22s] Entering emergency mode. Exit the shell to continue. [ 22s] Type "journalctl" to view system logs. [ 22s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 22s] after mounting them and attach it to a bug report. [ 22s] [ 22s] [ 22s] Press Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_4/root: 22965 [ 326s] qemu-kvm: terminating on signal 15 from pid 27990 () [ 326s] ### VM INTERACTION END ### [ 326s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (22957) - No such process [ 326s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 326s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:14:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:14:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035eebcd5cf1_d852b0a6e29c5f4473130@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 9s] [ 9s] [1/1] preinstalling libdevmapper1.02.1... [ 9s] copying packages... [ 12s] reordering...cycle: libc6 -> libgcc1 [ 12s] breaking dependency libgcc1 -> libc6 [ 12s] cycle: dh-python -> python3 [ 12s] breaking dependency python3 -> dh-python [ 12s] cycle: debhelper -> dh-autoreconf [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] cycle: dh-strip-nondeterminism -> debhelper [ 12s] breaking dependency debhelper -> dh-strip-nondeterminism [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 21s] Booting from ROM..c[?7l[ 6.896716] dracut-mount[378]: Warning: Can't mount root filesystem [ 22s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_2/root: 463 [ 319s] qemu-kvm: terminating on signal 15 from pid 20302 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (455) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:14:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:14:35 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035eedde0563_d852b0a6e29c5f44733fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Unstable/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 14s] breaking dependency libcrypt1 -> libc6 [ 14s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.603046] dracut-mount[381]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 20s] after mounting them and attach it to a bug report. [ 20s] [ 20s] [ 20s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_8/root: 19383 [ 320s] qemu-kvm: terminating on signal 15 from pid 3167 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (19374) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:16:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:16:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035ef3122847_d852b0a6e29c5f44735cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 15s] breaking dependency libcrypt1 -> libc6 [ 15s] cycle: libdevmapper1.02.1 -> dmsetup [ 15s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 15s] cycle: systemd -> systemd-timesyncd [ 15s] breaking dependency systemd -> systemd-timesyncd [ 15s] done [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] Using UART console [ 17s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 22s] Booting from ROM..c[?7l[ 5.295382] dracut-mount[366]: Warning: Can't mount root filesystem [ 22s] [ 22s] Generating "/run/initramfs/rdsosreport.txt" [ 22s] [ 22s] [ 22s] Entering emergency mode. Exit the shell to continue. [ 22s] Type "journalctl" to view system logs. Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_12/root: 29203 [ 323s] qemu-kvm: terminating on signal 15 from pid 29468 (fuser) [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (29194) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:18:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:18:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035efa9bfa05_d852b0a6e29c5f447473c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_19.10/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 6s] copying packages... [ 10s] reordering...cycle: libc6 -> libgcc1 [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 5.331561] dracut-mount[380]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. ExitPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_6/root: 12945 [ 317s] qemu-kvm: terminating on signal 15 from pid 1112 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (12936) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:18:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:18:36 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035efcc205bc_d852b0a6e29c5f4475258@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 6.127657] dracut-mount[382]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_3/root: 30955 [ 321s] qemu-kvm: terminating on signal 15 from pid 18399 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (30947) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:23:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:23:44 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035f0f560f55_d852b0a6e29c5f4476977@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_19.04/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 7s] reordering...cycle: libc6 -> libgcc1 [ 7s] breaking dependency libgcc1 -> libc6 [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.093903] dracut-mount[382]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "jPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_4/root: 1352 [ 314s] qemu-kvm: terminating on signal 15 from pid 22851 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (1344) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:24:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:24:01 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035f1118a144_d852b0a6e29c5f44771f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/Debian_Testing/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 10s] copying packages... [ 12s] reordering...cycle: libc6 -> libgcc-s1 [ 12s] breaking dependency libc6 -> libgcc-s1 [ 12s] cycle: libc6 -> libcrypt1 [ 12s] breaking dependency libcrypt1 -> libc6 [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.618014] dracut-mount[341]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want Press Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_2/root: 29808 [ 323s] qemu-kvm: terminating on signal 15 from pid 28276 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (29800) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:24:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:24:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035f12fc8a4f_d852b0a6e29c5f44773b1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_10/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 17s] done [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] Using UART console [ 20s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 20s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 21s] Booting from ROM... [ 26s] c[?7l[ 5.108462] dracut-mount[339]: Warning: Can't mount root filesystem [ 26s] [ 26s] Generating "/run/initramfs/rdsosreport.txt" [ 26s] [ 26s] [ 26s] Entering emergency mode. Exit the shell to continue. [ 26s] Type "journalctl" to view system logs. [ 26s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 26s] after mounting them and attach it to a bug report. [ 26s] [ 26s] [ 26s] Press Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_3/root: 25465 [ 326s] qemu-kvm: terminating on signal 15 from pid 6477 () [ 326s] ### VM INTERACTION END ### [ 326s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (25452) - No such process [ 326s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 326s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:25:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:25:44 +0000 Subject: Build failure of network:osmocom:latest/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035f16ec7f8e_d852b0a6e29c5f447798e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:latest/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libgtpnl Last lines of build log: [ 10s] breaking dependency libcrypt1 -> libc6 [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_13/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_13/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_13/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 4.660548] dracut-mount[362]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_13/root: 64678 [ 316s] qemu-kvm: terminating on signal 15 from pid 54579 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/13/build/build-vm: line 485: kill: (64670) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:27:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:27:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035f1e523d0_d852b0a6e29c5f44784d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_20.04/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 22s] breaking dependency debhelper -> dh-strip-nondeterminism [ 22s] done [ 23s] booting kvm... [ 23s] ### VM INTERACTION START ### [ 23s] Using UART console [ 23s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 23s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 31s] Booting from ROM..c[?7l[ 7.332548] dracut-mount[379]: Warning: Can't mount root filesystem [ 31s] [ 31s] Generating "/run/initramfs/rdsosreport.txt" [ 31s] [ 31s] [ 31s] Entering emergency mode. Exit the shell to continue. [ 31s] Type "journalctl" to view system logs. [ 31s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 31s] after mounting them and attach it to a bug report. [ 31s] [ 31s] [ 31s] Press Enter for maintenance [ 330s] (or press Control-D to continue): [ 330s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_7/root: 8111 [ 330s] qemu-kvm: terminating on signal 15 from pid 17536 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (8103) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:27:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:27:44 +0000 Subject: Build failure of network:osmocom:latest/libsmpp34 in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6035f1e6cc31c_d852b0a6e29c5f44786db@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libsmpp34/xUbuntu_19.10/x86_64 Package network:osmocom:latest/libsmpp34 failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libsmpp34 Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.761870] dracut-mount[342]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_1/root: 19217 [ 316s] qemu-kvm: terminating on signal 15 from pid 11427 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (19209) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:28:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:28:18 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035f220b89be_d852b0a6e29c5f4478818@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_Unstable/x86_64 Package network:osmocom:nightly/libasn1c failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 14s] breaking dependency libcrypt1 -> libc6 [ 14s] done [ 15s] booting kvm... [ 15s] ### VM INTERACTION START ### [ 15s] Using UART console [ 15s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.152563] dracut-mount[381]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 20s] after mounting them and attach it to a bug report. [ 20s] [ 20s] [ 20s] Press Enter for maintenance [ 325s] (or press Control-D to continue): [ 325s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 325s] /var/cache/obs/worker/root_12/root: 539 [ 325s] qemu-kvm: terminating on signal 15 from pid 30557 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (531) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:34:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:34:18 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035f387bb6d7_d852b0a6e29c5f448073@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_9.0/i586 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.007536] dracut-mount[383]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_10/root: 25378 [ 315s] qemu-kvm: terminating on signal 15 from pid 26788 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (25369) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:38:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:38:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035f475d1c91_d852b0a6e29c5f448228a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_9.0/i586 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.584641] dracut-mount[343]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug repPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_6/root: 25268 [ 320s] qemu-kvm: terminating on signal 15 from pid 24141 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (25260) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:39:09 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:39:09 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6035f49734341_d852b0a6e29c5f44828b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 14s] done [ 19s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] Using UART console [ 19s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 20s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM... [ 25s] c[?7l[ 5.086619] dracut-mount[341]: Warning: Can't mount root filesystem [ 26s] [ 26s] Generating "/run/initramfs/rdsosreport.txt" [ 26s] [ 26s] [ 26s] Entering emergency mode. Exit the shell to continue. [ 26s] Type "journalctl" to view system logs. [ 26s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 26s] after mounting them and attach it to a bug report. [ 26s] [ 26s] [ 26s] Press Enter for maintenance [ 325s] (or press Control-D to continue): [ 325s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 325s] /var/cache/obs/worker/root_4/root: 24084 [ 325s] qemu-kvm: terminating on signal 15 from pid 31024 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (24076) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:39:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:39:26 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6035f4b0c7a38_d852b0a6e29c5f4482955@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_10/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 14s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 15s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM... [ 21s] c[?7l[ 5.881422] dracut-mount[341]: Warning: Can't mount root filesystem [ 21s] [ 21s] Generating "/run/initramfs/rdsosreport.txt" [ 21s] [ 21s] [ 21s] Entering emergency mode. Exit the shell to continue. [ 21s] Type "journalctl" to view system logs. [ 21s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 21s] after mounting them and attach it to a bug report. [ 21s] [ 21s] [ 21s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_3/root: 9181 [ 322s] qemu-kvm: terminating on signal 15 from pid 18037 (fuser) [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (9173) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:40:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:40:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035f4f375a33_d852b0a6e29c5f448369@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 5s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_14/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_14/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_14/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 4.620365] dracut-mount[363]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_14/root: 46692 [ 319s] qemu-kvm: terminating on signal 15 from pid 26036 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/14/build/build-vm: line 485: kill: (46684) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:45:09 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:45:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035f601a6912_d852b0a6e29c5f4485210@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/xUbuntu_20.10/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 15s] breaking dependency ubuntu-mono -> adwaita-icon-theme [ 15s] cycle: humanity-icon-theme -> adwaita-icon-theme -> ubuntu-mono [ 15s] breaking dependency adwaita-icon-theme -> ubuntu-mono [ 15s] cycle: dh-autoreconf -> debhelper [ 15s] breaking dependency debhelper -> dh-autoreconf [ 15s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 22s] Booting from ROM..c[?7l[ 5.332201] dracut-mount[373]: Warning: Can't mount root filesystem [ 22s] [ 22s] Generating "/run/initramfs/rdsosreport.txt" [ 22s] [ 22s] [ 22s] Entering emergency mode. Exit the shell to continue. [ 22s] Type "journalctl" to view system logs. [ 22s] You might want Press Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_12/root: 17924 [ 327s] qemu-kvm: terminating on signal 15 from pid 15086 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (17916) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:46:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:46:52 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6035f677c0c59_d852b0a6e29c5f448563e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 46s] cycle: libc6 -> libnss-nisplus -> libtirpc3 -> libgssapi-krb5-2 -> libkrb5support0 [ 46s] breaking dependency libtirpc3 -> libgssapi-krb5-2 [ 46s] cycle: dh-autoreconf -> debhelper [ 46s] breaking dependency debhelper -> dh-autoreconf [ 46s] done [ 47s] booting kvm... [ 47s] ### VM INTERACTION START ### [ 47s] Using UART console [ 47s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 48s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 48s] Booting from ROM... [ 56s] c[?7l[ 6.723577] dracut-mount[339]: Warning: Can't mount root filesystem [ 56s] [ 56s] Generating "/run/initramfs/rdsosreport.txt" [ 56s] [ 56s] [ 56s] Entering emergency mode. Exit the shell to continue. [ 56s] Type "journalctl" to view system logs. [ 56s] You might want to save "/run/inPress Enter for maintenance [ 354s] (or press Control-D to continue): [ 354s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 354s] /var/cache/obs/worker/root_3/root: 6293 [ 354s] qemu-kvm: terminating on signal 15 from pid 8113 (fuser) [ 354s] ### VM INTERACTION END ### [ 354s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (6286) - No such process [ 354s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 354s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:46:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:46:52 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6035f67a378d7_d852b0a6e29c5f44857df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 16s] breaking dependency debhelper -> dh-strip-nondeterminism [ 16s] done [ 16s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] Using UART console [ 17s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 23s] Booting from ROM..c[?7l[ 5.673018] dracut-mount[339]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to continue. [ 23s] Type "journalctl" to view system logs. [ 23s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 23s] after mounting them and attach it to a bug report. [ 23s] [ 23s] [ 23s] Press Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_3/root: 20408 [ 322s] qemu-kvm: terminating on signal 15 from pid 1967 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (20400) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:47:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:47:44 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6035f6b16f5ca_d852b0a6e29c5f4485984@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 15s] breaking dependency libcrypt1 -> libc6 [ 15s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 17s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 23s] Booting from ROM..c[?7l[ 5.628968] dracut-mount[339]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to continue. [ 23s] Type "journalctl" to view system logs. [ 23s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 23s] after mounting them and attach it to a bug report. [ 23s] [ 23s] [ 23s] Press Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_4/root: 22900 [ 322s] qemu-kvm: terminating on signal 15 from pid 2366 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (22892) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:48:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:48:18 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035f6d1bb182_d852b0a6e29c5f448623d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 5s] breaking dependency debhelper -> dh-strip-nondeterminism [ 5s] done [ 6s] booting kvm... [ 6s] ### VM INTERACTION START ### [ 6s] Using UART console [ 6s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 7250 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 3 [ 6s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 9s] Booting from ROM..c[?7l[ 3.579697] dracut-mount[333]: Warning: Can't mount root filesystem [ 10s] [ 10s] Generating "/run/initramfs/rdsosreport.txt" [ 10s] [ 10s] [ 10s] Entering emergency mode. Exit the shell to continue. [ 10s] Type "journalctl" to view system logs. [ 10s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 10s] after mounting them and attach it to a bug report. [ 10s] [ 10s] [ 10s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_2/root: 3645 [ 316s] qemu-kvm: terminating on signal 15 from pid 10515 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (3637) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 06:54:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 06:54:36 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6035f83b70b89_d852b0a6e29c5f448795d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 3s] copying packages... [ 4s] reordering...cycle: libc6 -> libgcc1 [ 4s] breaking dependency libgcc1 -> libc6 [ 4s] cycle: debhelper -> dh-autoreconf [ 4s] breaking dependency debhelper -> dh-autoreconf [ 4s] cycle: dh-strip-nondeterminism -> debhelper [ 4s] breaking dependency debhelper -> dh-strip-nondeterminism [ 4s] done [ 5s] booting kvm... [ 5s] ### VM INTERACTION START ### [ 5s] Using UART console [ 5s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 25600 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 5s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 10s] Booting from ROM..c[?7l[ 4.992037] dracut-mount[421]: Warning: Can't mount root filesystem [ 10s] [ 10s] Generating "/run/initramfs/rdsosreport.txt" [ 10s] [ 10s] [ 10s] Entering emergency mode. ExitPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_1/root: 31237 [ 315s] qemu-kvm: terminating on signal 15 from pid 47173 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (31224) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:00:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:00:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035f99e8426c_d852b0a6e29c5f44890ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_9.0/i586 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 10s] breaking dependency python3 -> dh-python [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 6.561069] dracut-mount[381]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_5/root: 15563 [ 316s] qemu-kvm: terminating on signal 15 from pid 685 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (15552) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:00:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:00:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6035f99f4d1e2_d852b0a6e29c5f4489153@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 18s] breaking dependency libcrypt1 -> libc6 [ 18s] cycle: libdevmapper1.02.1 -> dmsetup [ 18s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 18s] cycle: systemd -> systemd-timesyncd [ 18s] breaking dependency systemd -> systemd-timesyncd [ 18s] done [ 19s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] Using UART console [ 19s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 19s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 25s] Booting from ROM..c[?7l[ 5.369096] dracut-mount[365]: Warning: Can't mount root filesystem [ 25s] [ 25s] Generating "/run/initramfs/rdsosreport.txt" [ 25s] [ 25s] [ 25s] Entering emergency mode. Exit the shell to continue. [ 25s] Type "journalctl" to view system logs. [ 25s] You might want to save "/run/inPress Enter for maintenance [ 325s] (or press Control-D to continue): [ 325s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 325s] /var/cache/obs/worker/root_3/root: 17628 [ 325s] qemu-kvm: terminating on signal 15 from pid 20596 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (17621) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:02:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:02:35 +0000 Subject: Build failure of network:osmocom:nightly/neocon in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035fa1696809_d852b0a6e29c5f44896bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/neocon/Debian_8.0/i586 Package network:osmocom:nightly/neocon failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly neocon Last lines of build log: [ 7s] breaking dependency libgcc1 -> libc6 [ 7s] cycle: libc6 -> libgcc1 -> multiarch-support [ 7s] breaking dependency multiarch-support -> libc6 [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.178262] dracut-mount[371]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/inPress Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_2/root: 29241 [ 313s] qemu-kvm: terminating on signal 15 from pid 27886 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (29230) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:03:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:03:26 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <6035fa5197e0e_d852b0a6e29c5f4489895@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.474888] dracut-mount[383]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mountingPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_6/root: 12434 [ 314s] qemu-kvm: terminating on signal 15 from pid 13545 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (12426) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:06:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:06:53 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_10/i586 In-Reply-To: References: Message-ID: <6035fb268c3b4_d852b0a6e29c5f44910fd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_10/i586 Package network:osmocom:nightly/rtl-sdr failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: [ 9s] reordering...cycle: libc6 -> libgcc1 [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.051419] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "jPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_5/root: 15259 [ 315s] qemu-kvm: terminating on signal 15 from pid 28328 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (15251) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:08:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:08:36 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_10/i586 In-Reply-To: References: Message-ID: <6035fb83b0948_d852b0a6e29c5f44915f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_10/i586 Package network:osmocom:latest/simtrace2 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.875653] dracut-mount[381]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_2/root: 30854 [ 320s] qemu-kvm: terminating on signal 15 from pid 31440 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (30846) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:14:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:14:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6035fce74134b_d852b0a6e29c5f44933e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_8.0/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.624853] dracut-mount[381]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_8/root: 2786 [ 319s] qemu-kvm: terminating on signal 15 from pid 12334 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (2777) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:14:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:14:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_10/i586 In-Reply-To: References: Message-ID: <6035fd0680a33_d852b0a6e29c5f44934b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_10/i586 Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 4.873100] dracut-mount[380]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug repPress Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_3/root: 16018 [ 321s] qemu-kvm: terminating on signal 15 from pid 8215 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (16010) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:16:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:16:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_10/i586 In-Reply-To: References: Message-ID: <6035fd416c71e_d852b0a6e29c5f44940c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_10/i586 Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.049992] dracut-mount[362]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_4/root: 25834 [ 316s] qemu-kvm: terminating on signal 15 from pid 26230 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (25826) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:16:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:16:36 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035fd63a6abe_d852b0a6e29c5f4494350@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_9.0/i586 Package network:osmocom:latest/simtrace2 failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 13s] breaking dependency debhelper -> dh-strip-nondeterminism [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 21s] Booting from ROM..c[?7l[ 7.521643] dracut-mount[383]: Warning: Can't mount root filesystem [ 22s] [ 22s] Generating "/run/initramfs/rdsosreport.txt" [ 22s] [ 22s] [ 22s] Entering emergency mode. Exit the shell to continue. [ 22s] Type "journalctl" to view system logs. [ 22s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 22s] after mounting them and attach it to a bug report. [ 22s] [ 22s] [ 22s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_6/root: 29012 [ 319s] qemu-kvm: terminating on signal 15 from pid 3360 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (29004) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:20:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:20:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6035fe52343e0_d852b0a6e29c5f4495668@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 2000 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 4.371718] dracut-mount[334]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 14365 [ 315s] qemu-kvm: terminating on signal 15 from pid 11110 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (14358) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:32:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:32:02 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <6036010215e78_d852b0a6e29c5f4498647@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.155991] dracut-mount[378]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_6/root: 24386 [ 322s] qemu-kvm: terminating on signal 15 from pid 9651 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (24378) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:37:10 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:37:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_10/x86_64 In-Reply-To: References: Message-ID: <6036022f4756b_d852b0a6e29c5f450008f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_10/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.008361] dracut-mount[363]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_8/root: 23336 [ 316s] qemu-kvm: terminating on signal 15 from pid 7264 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (23329) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:37:10 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:37:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6036022fb1033_d852b0a6e29c5f4500124@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 18432 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.698173] dracut-mount[452]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug report. [ 13s] [ 13s] [ 13s] Press Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_6/root: 41457 [ 313s] qemu-kvm: terminating on signal 15 from pid 54282 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (41449) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:40:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:40:52 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <6036031d17cdd_d852b0a6e29c5f45008cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 8s] copying packages... [ 10s] reordering...cycle: libc6 -> libgcc-s1 [ 10s] breaking dependency libc6 -> libgcc-s1 [ 10s] cycle: libc6 -> libcrypt1 [ 10s] breaking dependency libcrypt1 -> libc6 [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.098028] dracut-mount[379]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_8/root: 30924 [ 320s] qemu-kvm: terminating on signal 15 from pid 3149 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (30909) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:41:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:41:26 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60360339e4da3_d852b0a6e29c5f45010c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 12s] [16/16] preinstalling binutils... [ 12s] copying packages... [ 15s] reordering...cycle: libc6 -> libgcc-s1 [ 15s] breaking dependency libc6 -> libgcc-s1 [ 15s] cycle: libc6 -> libcrypt1 [ 15s] breaking dependency libcrypt1 -> libc6 [ 15s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 22s] Booting from ROM..c[?7l[ 5.340487] dracut-mount[381]: Warning: Can't mount root filesystem [ 22s] [ 22s] Generating "/run/initramfs/rdsosreport.txt" [ 22s] [ 22s] [ 22s] Entering emergency mode. Exit the shell to continue. [ 22s] Type "journalctl" to viPress Enter for maintenance [ 326s] (or press Control-D to continue): [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_7/root: 10037 [ 326s] qemu-kvm: terminating on signal 15 from pid 10849 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (10029) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:41:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:41:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals-debian8 in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6036033ab14e5_d852b0a6e29c5f45011e3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals-debian8/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals-debian8 failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals-debian8 Last lines of build log: [ 9s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.192373] dracut-mount[380]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_4/root: 1789 [ 316s] qemu-kvm: terminating on signal 15 from pid 11657 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (1780) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:42:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:42:18 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6036037aef94d_d852b0a6e29c5f45013d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 13s] cycle: libc6 -> libcrypt1 [ 13s] breaking dependency libcrypt1 -> libc6 [ 13s] cycle: debhelper -> dh-autoreconf [ 13s] breaking dependency debhelper -> dh-autoreconf [ 13s] cycle: dh-strip-nondeterminism -> debhelper [ 13s] breaking dependency debhelper -> dh-strip-nondeterminism [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 21s] Booting from ROM..c[?7l. [ 6.808443] dracut-mount[379]: Warning: Can't mount root filesystem [ 21s] [ 21s] Generating "/run/initramfs/rdsosreport.txt" [ 21s] [ 21s] [ 21s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_10/root: 20655 [ 319s] qemu-kvm: terminating on signal 15 from pid 10796 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (20643) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:42:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:42:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_10/i586 In-Reply-To: References: Message-ID: <603603968c026_d852b0a6e29c5f45014ec@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_10/i586 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 7s] copying packages... [ 9s] reordering...cycle: libc6 -> libgcc1 [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.012447] dracut-mount[383]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 18460 [ 315s] qemu-kvm: terminating on signal 15 from pid 6011 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (18452) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:45:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:45:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-smlc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6036042e3849b_d852b0a6e29c5f4502475@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-smlc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-smlc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-smlc Last lines of build log: [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] cycle: libcupsimage2 -> libcupsfilters1 [ 7s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.349642] dracut-mount[381]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug reporPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_2/root: 2458 [ 318s] qemu-kvm: terminating on signal 15 from pid 27229 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (2450) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:47:09 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:47:09 +0000 Subject: Build failure of network:osmocom:nightly/neocon in Debian_10/i586 In-Reply-To: References: Message-ID: <603604898b125_d852b0a6e29c5f4502872@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/neocon/Debian_10/i586 Package network:osmocom:nightly/neocon failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly neocon Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.321622] dracut-mount[377]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_5/root: 24993 [ 316s] qemu-kvm: terminating on signal 15 from pid 11910 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (24974) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:48:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:48:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_9.0/i586 In-Reply-To: References: Message-ID: <603604e59d1cb_d852b0a6e29c5f4503754@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_9.0/i586 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 6s] breaking dependency libgcc1 -> libc6 [ 6s] cycle: debhelper -> dh-autoreconf [ 6s] breaking dependency debhelper -> dh-autoreconf [ 6s] cycle: dh-strip-nondeterminism -> debhelper [ 6s] breaking dependency debhelper -> dh-strip-nondeterminism [ 6s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 5.143075] dracut-mount[382]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_4/root: 23226 [ 317s] qemu-kvm: terminating on signal 15 from pid 21964 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (23218) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:50:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:50:35 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6036055e252e0_d852b0a6e29c5f4504662@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 4.968843] dracut-mount[369]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_3/root: 32075 [ 320s] qemu-kvm: terminating on signal 15 from pid 20279 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (32067) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 07:54:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 07:54:35 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60360646298c8_d852b0a6e29c5f4505649@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 13s] cycle: libc6 -> libnss-nisplus -> libtirpc3 -> libgssapi-krb5-2 -> libkrb5support0 [ 13s] breaking dependency libtirpc3 -> libgssapi-krb5-2 [ 13s] cycle: dh-autoreconf -> debhelper [ 13s] breaking dependency debhelper -> dh-autoreconf [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.186444] dracut-mount[383]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 19s] after mounting them and attachPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_3/root: 12912 [ 319s] qemu-kvm: terminating on signal 15 from pid 7627 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (12904) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:00:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:00:09 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Add missing break statement References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23081 ) Change subject: hnbgw: Add missing break statement ...................................................................... hnbgw: Add missing break statement We don't want to print usage information after the VTY reference XML. Change-Id: Ia729134a8f18d53274bbc063aa39508c7dcc1f72 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/23081/1 diff --git a/src/hnbgw.c b/src/hnbgw.c index 965e8a4..9211a7e 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -472,6 +472,7 @@ switch (c) { case 0: handle_long_options(argv[0], long_option); + break; case 'h': print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia729134a8f18d53274bbc063aa39508c7dcc1f72 Gerrit-Change-Number: 23081 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 08:00:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:00:52 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <603607cc29621_d852b0a6e29c5f450762e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_9.0/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 7s] reordering...cycle: libc6 -> libgcc1 [ 7s] breaking dependency libgcc1 -> libc6 [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.709110] dracut-mount[362]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "jPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_5/root: 64706 [ 318s] qemu-kvm: terminating on signal 15 from pid 41985 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (64698) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:01:09 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:01:09 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_10/x86_64 In-Reply-To: References: Message-ID: <603607cea2e1a_d852b0a6e29c5f450784c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_10/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.041038] dracut-mount[367]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_2/root: 19862 [ 321s] qemu-kvm: terminating on signal 15 from pid 7710 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (19853) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:01:45 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:01:45 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_10/x86_64 In-Reply-To: References: Message-ID: <603608067fe84_d852b0a6e29c5f45080e6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_10/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 10s] reordering...cycle: libc6 -> libgcc1 [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.081823] dracut-mount[376]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to viPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_11/root: 22219 [ 316s] qemu-kvm: terminating on signal 15 from pid 18934 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/11/build/build-vm: line 485: kill: (22201) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:04:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:04:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_8.0/i586 In-Reply-To: References: Message-ID: <603608bf247d4_d852b0a6e29c5f45090bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_8.0/i586 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: [ 7s] breaking dependency multiarch-support -> libc6 [ 7s] cycle: dh-python -> python3 [ 7s] breaking dependency python3 -> dh-python [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] cycle: libcupsimage2 -> libcupsfilters1 [ 7s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 18432 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.600188] dracut-mount[422]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. ExitPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_6/root: 52529 [ 317s] qemu-kvm: terminating on signal 15 from pid 3801 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (52521) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:06:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:06:01 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <603608fab700f_d852b0a6e29c5f450939e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Testing/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 12s] breaking dependency libcrypt1 -> libc6 [ 12s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.238312] dracut-mount[343]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_9/root: 10492 [ 318s] qemu-kvm: terminating on signal 15 from pid 11702 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (10484) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:07:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:07:36 +0000 Subject: Change in libosmocore[master]: attempt to fix PRM spec file after recent soversion bump References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23082 ) Change subject: attempt to fix PRM spec file after recent soversion bump ...................................................................... attempt to fix PRM spec file after recent soversion bump In I3bc0826c0000be4d76235ed6b5be86d216ea2e4d the soversion was chhanged (e.g. libosmocore.so.16 to libosmocore.so.17) but the spec.in file was not adjusted accordingly. Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 --- M contrib/libosmocore.spec.in 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/23082/1 diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index b6791eb..4661e0c 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -367,7 +367,7 @@ %files -n libosmocore17 %defattr(-,root,root) -%_libdir/libosmocore.so.16* +%_libdir/libosmocore.so.17* %files -n libosmocore-devel %defattr(-,root,root) @@ -393,7 +393,7 @@ %files -n libosmogb12 %defattr(-,root,root) -%_libdir/libosmogb.so.11* +%_libdir/libosmogb.so.12* %files -n libosmogb-devel %defattr(-,root,root) @@ -405,7 +405,7 @@ %files -n libosmogsm16 %defattr(-,root,root) -%_libdir/libosmogsm.so.15* +%_libdir/libosmogsm.so.16* %files -n libosmogsm-devel %defattr(-,root,root) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 Gerrit-Change-Number: 23082 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 08:07:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:07:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gbproxy in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6036095692148_d852b0a6e29c5f45097b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gbproxy/Debian_8.0/i586 Package network:osmocom:nightly/osmo-gbproxy failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gbproxy Last lines of build log: [ 9s] breaking dependency libcupsfilters1 -> libcupsimage2 [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.138585] dracut-mount[365]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_12/root: 26028 [ 315s] qemu-kvm: terminating on signal 15 from pid 25177 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (26020) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:10:02 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:10:02 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <603609f14da00_d852b0a6e29c5f4511222@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 15s] breaking dependency debhelper -> dh-strip-nondeterminism [ 15s] done [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] Using UART console [ 16s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_14/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_14/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_14/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 16s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 23s] Booting from ROM..c[?7l[ 6.450174] dracut-mount[382]: Warning: Can't mount root filesystem [ 23s] [ 23s] Generating "/run/initramfs/rdsosreport.txt" [ 23s] [ 23s] [ 23s] Entering emergency mode. Exit the shell to continue. [ 23s] Type "journalctl" to view system logs. [ 23s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 23s] after mounting them and attach it to a bug report. [ 23s] [ 23s] [ 23s] Press Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_14/root: 11450 [ 322s] qemu-kvm: terminating on signal 15 from pid 28934 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/14/build/build-vm: line 485: kill: (11434) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:10:19 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:10:19 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <60360a079a53c_d852b0a6e29c5f4511321@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 11s] breaking dependency python3 -> dh-python [ 11s] cycle: libdevmapper1.02.1 -> dmsetup [ 11s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM... [ 19s] c[?7l[ 5.147242] dracut-mount[339]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 19s] aPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_4/root: 22713 [ 318s] qemu-kvm: terminating on signal 15 from pid 27484 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (22706) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:10:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:10:36 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60360a0a2dda5_d852b0a6e29c5f451144e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 20s] breaking dependency libcrypt1 -> libc6 [ 20s] done [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] Using UART console [ 20s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_16/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_16/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_16/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 21s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 29s] Booting from ROM..c[?7l[ 8.197452] dracut-mount[381]: Warning: Can't mount root filesystem [ 30s] [ 30s] Generating "/run/initramfs/rdsosreport.txt" [ 30s] [ 30s] [ 30s] Entering emergency mode. Exit the shell to continue. [ 30s] Type "journalctl" to view system logs. [ 30s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 30s] after mounting them and attach it to a bug report. [ 30s] [ 30s] [ 30s] Press Enter for maintenance [ 329s] (or press Control-D to continue): [ 329s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_16/root: 12187 [ 330s] qemu-kvm: terminating on signal 15 from pid 17622 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/16/build/build-vm: line 485: kill: (12174) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:11:27 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:11:27 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/i586 In-Reply-To: References: Message-ID: <60360a437063d_d852b0a6e29c5f45123b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.647985] dracut-mount[363]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mountingPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_5/root: 12504 [ 318s] qemu-kvm: terminating on signal 15 from pid 47142 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (12485) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:11:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:11:44 +0000 Subject: Build failure of network:osmocom:nightly/neocon in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <60360a45b030a_d852b0a6e29c5f45127ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/neocon/Debian_8.0/x86_64 Package network:osmocom:nightly/neocon failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly neocon Last lines of build log: [ 8s] cycle: libc6 -> libgcc1 -> multiarch-support [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.511499] dracut-mount[365]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mountingPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_9/root: 1003 [ 314s] qemu-kvm: terminating on signal 15 from pid 19287 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (995) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:11:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:11:44 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <60360a4695917_d852b0a6e29c5f45128a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 5.208415] dracut-mount[380]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug report. [ 13s] [ 13s] [ 13s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_6/root: 24402 [ 318s] qemu-kvm: terminating on signal 15 from pid 4493 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (24394) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:12:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:12:01 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <60360a65a8af4_d852b0a6e29c5f4513219@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] breaking dependency python3 -> dh-python [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.378108] dracut-mount[367]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_12/root: 4387 [ 315s] qemu-kvm: terminating on signal 15 from pid 19350 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (4379) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:12:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:12:01 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/x86_64 In-Reply-To: References: Message-ID: <60360a664164a_d852b0a6e29c5f45133ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 10s] reordering...cycle: libc6 -> libgcc1 [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.073113] dracut-mount[369]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to viPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_5/root: 22917 [ 316s] qemu-kvm: terminating on signal 15 from pid 7622 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (22909) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:12:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:12:01 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <60360a66aa096_d852b0a6e29c5f451348f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_Testing/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 12s] reordering...cycle: libc6 -> libgcc-s1 [ 12s] breaking dependency libc6 -> libgcc-s1 [ 12s] cycle: libc6 -> libcrypt1 [ 12s] breaking dependency libcrypt1 -> libc6 [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.129035] dracut-mount[382]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attachPress Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_2/root: 12641 [ 323s] qemu-kvm: terminating on signal 15 from pid 31119 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (12633) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:12:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:12:18 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <60360a7dbccc2_d852b0a6e29c5f45135ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 10s] [16/16] preinstalling binutils... [ 11s] copying packages... [ 13s] reordering...cycle: libc6 -> libgcc-s1 [ 13s] breaking dependency libc6 -> libgcc-s1 [ 13s] cycle: libc6 -> libcrypt1 [ 13s] breaking dependency libcrypt1 -> libc6 [ 13s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.408611] dracut-mount[382]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to viPress Enter for maintenance [ 324s] (or press Control-D to continue): [ 324s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 324s] /var/cache/obs/worker/root_3/root: 24052 [ 324s] qemu-kvm: terminating on signal 15 from pid 4267 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (24044) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:14:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:14:35 +0000 Subject: Build failure of network:osmocom:nightly/neocon in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60360af8dea52_d852b0a6e29c5f4514323@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/neocon/Debian_9.0/i586 Package network:osmocom:nightly/neocon failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly neocon Last lines of build log: [ 6s] cycle: debhelper -> dh-autoreconf [ 6s] breaking dependency debhelper -> dh-autoreconf [ 6s] cycle: dh-strip-nondeterminism -> debhelper [ 6s] breaking dependency debhelper -> dh-strip-nondeterminism [ 6s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 4.610030] dracut-mount[362]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 12s] after mounting them and attach it to a bug repPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_11/root: 1122 [ 317s] qemu-kvm: terminating on signal 15 from pid 41728 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/11/build/build-vm: line 485: kill: (1113) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:17:10 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:17:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60360b8f9ec99_d852b0a6e29c5f45152b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_9.0/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 7s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc1 [ 8s] breaking dependency libgcc1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.250999] dracut-mount[380]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to coPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_7/root: 20248 [ 320s] qemu-kvm: terminating on signal 15 from pid 14170 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (20239) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:20:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:20:01 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <60360c3f8af0a_d852b0a6e29c5f45166a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/x86_64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.606323] dracut-mount[361]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] after mounting them and attach it to a bug report. [ 13s] [ 13s] [ 13s] Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_4/root: 48011 [ 319s] qemu-kvm: terminating on signal 15 from pid 28626 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (48003) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:20:01 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:20:01 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-dsp in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <60360c40414d0_d852b0a6e29c5f45167a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-dsp/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmo-dsp failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-dsp Last lines of build log: [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.265890] dracut-mount[340]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 18s] after mounting them and attach it to a bug report. [ 18s] [ 18s] [ 18s] Press Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_4/root: 9816 [ 322s] qemu-kvm: terminating on signal 15 from pid 12169 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (9808) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:20:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:20:52 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <60360c7cae50b_d852b0a6e29c5f4517062@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: libc6 -> libgcc1 -> multiarch-support [ 9s] breaking dependency multiarch-support -> libc6 [ 9s] cycle: dh-python -> python3 [ 9s] breaking dependency python3 -> dh-python [ 9s] cycle: libdevmapper1.02.1 -> dmsetup [ 9s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_7/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_7/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_7/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 6.970527] dracut-mount[383]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to contPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_7/root: 15224 [ 315s] qemu-kvm: terminating on signal 15 from pid 10959 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/7/build/build-vm: line 485: kill: (15200) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:21:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:21:26 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/i586 In-Reply-To: References: Message-ID: <60360c9e38f1e_d852b0a6e29c5f45174fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 11s] cycle: debhelper -> dh-autoreconf [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 5.201174] dracut-mount[364]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug repPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_8/root: 11666 [ 317s] qemu-kvm: terminating on signal 15 from pid 10499 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (11658) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:23:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:23:26 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60360d1a1b647_d852b0a6e29c5f4518343@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.418922] dracut-mount[376]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting tPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_8/root: 25113 [ 316s] qemu-kvm: terminating on signal 15 from pid 19739 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (25098) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:24:35 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:24:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60360d53532e2_d852b0a6e29c5f45193f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_14/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_14/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_14/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 4.685044] dracut-mount[362]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_14/root: 49290 [ 315s] qemu-kvm: terminating on signal 15 from pid 23597 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/14/build/build-vm: line 485: kill: (49282) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:25:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:25:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60360d8c44204_d852b0a6e29c5f451951c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 19s] breaking dependency systemd -> systemd-timesyncd [ 19s] cycle: adwaita-icon-theme -> ubuntu-mono [ 19s] breaking dependency ubuntu-mono -> adwaita-icon-theme [ 19s] cycle: humanity-icon-theme -> adwaita-icon-theme -> ubuntu-mono [ 19s] breaking dependency adwaita-icon-theme -> ubuntu-mono [ 19s] cycle: dh-autoreconf -> debhelper [ 19s] breaking dependency debhelper -> dh-autoreconf [ 19s] done [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] Using UART console [ 20s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 20s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 26s] Booting from ROM..c[?7l[ 5.779115] dracut-mount[384]: Warning: Can't mount root filesystem [ 26s] [ 26s] Generating "/run/initramfs/rdsosreport.txt" [ 26s] [ 26s] [ 26s] Entering emergency mode. ExitPress Enter for maintenance [ 330s] (or press Control-D to continue): [ 330s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_4/root: 30915 [ 330s] qemu-kvm: terminating on signal 15 from pid 3978 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (30903) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:25:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:25:52 +0000 Subject: Change in libosmocore[master]: attempt to fix PRM spec file after recent soversion bump In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/23082 to look at the new patch set (#2). Change subject: attempt to fix PRM spec file after recent soversion bump ...................................................................... attempt to fix PRM spec file after recent soversion bump In I3bc0826c0000be4d76235ed6b5be86d216ea2e4d the soversion was chhanged (e.g. libosmocore.so.16 to libosmocore.so.17) but the spec.in file was not adjusted accordingly. Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 --- M contrib/libosmocore.spec.in 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/23082/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 Gerrit-Change-Number: 23082 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:26:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:26:30 +0000 Subject: Change in libosmocore[master]: attempt to fix PRM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23082 ) Change subject: attempt to fix PRM spec file after recent soversion bump ...................................................................... Patch Set 2: Verified+1 Code-Review+2 I could build libosmocore RPM locally in a CentOS8 jail with this version of the change. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 Gerrit-Change-Number: 23082 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 24 Feb 2021 08:26:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 08:26:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:26:18 +0000 Subject: Build failure of network:osmocom:latest/orcania in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60360dc8daa7a_d852b0a6e29c5f4519728@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/orcania/Debian_Unstable/x86_64 Package network:osmocom:latest/orcania failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest orcania Last lines of build log: [ 14s] breaking dependency libcrypt1 -> libc6 [ 14s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 15s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.426311] dracut-mount[364]: Warning: Can't mount root filesystem [ 21s] [ 21s] Generating "/run/initramfs/rdsosreport.txt" [ 21s] [ 21s] [ 21s] Entering emergency mode. Exit the shell to continue. [ 21s] Type "journalctl" to view system logs. [ 21s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 21s] after mounting them and attach it to a bug report. [ 21s] [ 21s] [ 21s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_5/root: 19853 [ 320s] qemu-kvm: terminating on signal 15 from pid 14673 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (19846) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:26:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:26:18 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_10/i586 In-Reply-To: References: Message-ID: <60360dc945dc3_d852b0a6e29c5f451982e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_10/i586 Package network:osmocom:nightly/open5gs failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 11s] breaking dependency libgcc1 -> libc6 [ 11s] cycle: debhelper -> dh-autoreconf [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 18s] Booting from ROM..c[?7l[ 5.219078] dracut-mount[383]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_9/root: 24992 [ 322s] qemu-kvm: terminating on signal 15 from pid 15665 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (24984) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:28:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:28:30 +0000 Subject: Change in libosmocore[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/23082 to look at the new patch set (#3). Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... attempt to fix RPM spec file after recent soversion bump In I3bc0826c0000be4d76235ed6b5be86d216ea2e4d the soversion was chhanged (e.g. libosmocore.so.16 to libosmocore.so.17) but the spec.in file was not adjusted accordingly. Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 --- M contrib/libosmocore.spec.in 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/23082/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 Gerrit-Change-Number: 23082 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:28:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:28:34 +0000 Subject: Change in libosmocore[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23082 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 Gerrit-Change-Number: 23082 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 08:28:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:28:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:28:41 +0000 Subject: Change in libosmocore[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23082 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... attempt to fix RPM spec file after recent soversion bump In I3bc0826c0000be4d76235ed6b5be86d216ea2e4d the soversion was chhanged (e.g. libosmocore.so.16 to libosmocore.so.17) but the spec.in file was not adjusted accordingly. Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 --- M contrib/libosmocore.spec.in 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index b6791eb..df36e89 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -367,7 +367,7 @@ %files -n libosmocore17 %defattr(-,root,root) -%_libdir/libosmocore.so.16* +%_libdir/libosmocore.so.17* %files -n libosmocore-devel %defattr(-,root,root) @@ -393,7 +393,7 @@ %files -n libosmogb12 %defattr(-,root,root) -%_libdir/libosmogb.so.11* +%_libdir/libosmogb.so.12* %files -n libosmogb-devel %defattr(-,root,root) @@ -405,7 +405,7 @@ %files -n libosmogsm16 %defattr(-,root,root) -%_libdir/libosmogsm.so.15* +%_libdir/libosmogsm.so.16* %files -n libosmogsm-devel %defattr(-,root,root) @@ -430,7 +430,7 @@ %files -n libosmovty9 %defattr(-,root,root) -%_libdir/libosmovty.so.4* +%_libdir/libosmovty.so.9* %files -n libosmovty-devel %defattr(-,root,root) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7e1e3feef6bda1a2d2a615a61635e22d550b5a3 Gerrit-Change-Number: 23082 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:31:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:31:03 +0000 Subject: Change in libosmo-abis[master]: attempt to fix RPM spec file after recent soversion bump References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23083 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... attempt to fix RPM spec file after recent soversion bump In Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 the soversion was chhanged (e.g. libosmoabis.so.9 to libosmoabis.so.10) but the spec.in file was not adjusted accordingly. Change-Id: I0ca9eb5a60557a1bc8e3611fdd2668469ac19031 --- M contrib/libosmo-abis.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/83/23083/1 diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in index 2448564..629db97 100644 --- a/contrib/libosmo-abis.spec.in +++ b/contrib/libosmo-abis.spec.in @@ -127,7 +127,7 @@ %files -n libosmoabis10 %defattr(-,root,root) -%_libdir/libosmoabis.so.9* +%_libdir/libosmoabis.so.10* %files -n libosmoabis-devel %defattr(-,root,root) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0ca9eb5a60557a1bc8e3611fdd2668469ac19031 Gerrit-Change-Number: 23083 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:31:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:31:20 +0000 Subject: Change in libosmo-abis[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23083 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0ca9eb5a60557a1bc8e3611fdd2668469ac19031 Gerrit-Change-Number: 23083 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 24 Feb 2021 08:31:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:32:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:32:50 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0_=E2=86=92_1=2E1=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23084 ) Change subject: Bump version: 1.1.0 ? 1.1.1 ...................................................................... Bump version: 1.1.0 ? 1.1.1 Change-Id: If65dbee5a5be447df1b280240132d13d6b524b85 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/84/23084/1 diff --git a/debian/changelog b/debian/changelog index d5e9e71..0d69185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-abis (1.1.1) unstable; urgency=medium + + * attempt to fix RPM spec file after recent soversion bump + + -- Harald Welte Wed, 24 Feb 2021 09:32:29 +0100 + libosmo-abis (1.1.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If65dbee5a5be447df1b280240132d13d6b524b85 Gerrit-Change-Number: 23084 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:32:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:32:58 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0_=E2=86=92_1=2E1=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23084 ) Change subject: Bump version: 1.1.0 ? 1.1.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If65dbee5a5be447df1b280240132d13d6b524b85 Gerrit-Change-Number: 23084 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 24 Feb 2021 08:32:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:33:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:33:03 +0000 Subject: Change in libosmo-abis[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23083 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... attempt to fix RPM spec file after recent soversion bump In Ic66eb67254d35f02ec8cdea4d79fa4b1899e8230 the soversion was chhanged (e.g. libosmoabis.so.9 to libosmoabis.so.10) but the spec.in file was not adjusted accordingly. Change-Id: I0ca9eb5a60557a1bc8e3611fdd2668469ac19031 --- M contrib/libosmo-abis.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in index 2448564..629db97 100644 --- a/contrib/libosmo-abis.spec.in +++ b/contrib/libosmo-abis.spec.in @@ -127,7 +127,7 @@ %files -n libosmoabis10 %defattr(-,root,root) -%_libdir/libosmoabis.so.9* +%_libdir/libosmoabis.so.10* %files -n libosmoabis-devel %defattr(-,root,root) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0ca9eb5a60557a1bc8e3611fdd2668469ac19031 Gerrit-Change-Number: 23083 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:35:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:35:49 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E3-45cf_=E2=86=92_1=2E5=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23085 ) Change subject: Bump version: 1.5.0.3-45cf ? 1.5.1 ...................................................................... Bump version: 1.5.0.3-45cf ? 1.5.1 Change-Id: I6eea93d9723f7e6ffd1f9eb3d260a5b666cb2124 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/23085/1 diff --git a/debian/changelog b/debian/changelog index d83a232..8fffac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libosmocore (1.5.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines + + [ Harald Welte ] + * attempt to fix RPM spec file after recent soversion bump + + -- Harald Welte Wed, 24 Feb 2021 09:35:21 +0100 + libosmocore (1.5.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6eea93d9723f7e6ffd1f9eb3d260a5b666cb2124 Gerrit-Change-Number: 23085 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:35:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:35:55 +0000 Subject: =?UTF-8?Q?Change_in_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0_=E2=86=92_1=2E1=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/23084 ) Change subject: Bump version: 1.1.0 ? 1.1.1 ...................................................................... Bump version: 1.1.0 ? 1.1.1 Change-Id: If65dbee5a5be447df1b280240132d13d6b524b85 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index d5e9e71..0d69185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-abis (1.1.1) unstable; urgency=medium + + * attempt to fix RPM spec file after recent soversion bump + + -- Harald Welte Wed, 24 Feb 2021 09:32:29 +0100 + libosmo-abis (1.1.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/23084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If65dbee5a5be447df1b280240132d13d6b524b85 Gerrit-Change-Number: 23084 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 08:37:26 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:37:26 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <6036105bd9d77_d852b0a6e29c5f4525878@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.125771] dracut-mount[379]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attachPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 22183 [ 315s] qemu-kvm: terminating on signal 15 from pid 24349 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (22175) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:41:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:41:33 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E3-45cf_=E2=86=92_1=2E5=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23085 ) Change subject: Bump version: 1.5.0.3-45cf ? 1.5.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6eea93d9723f7e6ffd1f9eb3d260a5b666cb2124 Gerrit-Change-Number: 23085 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 24 Feb 2021 08:41:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:43:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:43:26 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bmaster=5D=3A_Bump_version=3A_1=2E5=2E0=2E3-45cf_=E2=86=92_1=2E5=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23085 ) Change subject: Bump version: 1.5.0.3-45cf ? 1.5.1 ...................................................................... Bump version: 1.5.0.3-45cf ? 1.5.1 Change-Id: I6eea93d9723f7e6ffd1f9eb3d260a5b666cb2124 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index d83a232..8fffac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libosmocore (1.5.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * osmo-release.sh: Fix rc!=0 on TODO-RELEASE file without comment lines + + [ Harald Welte ] + * attempt to fix RPM spec file after recent soversion bump + + -- Harald Welte Wed, 24 Feb 2021 09:35:21 +0100 + libosmocore (1.5.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6eea93d9723f7e6ffd1f9eb3d260a5b666cb2124 Gerrit-Change-Number: 23085 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:43:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:43:47 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Add missing break statement In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23081 ) Change subject: hnbgw: Add missing break statement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia729134a8f18d53274bbc063aa39508c7dcc1f72 Gerrit-Change-Number: 23081 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 24 Feb 2021 08:43:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 08:43:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 08:43:49 +0000 Subject: Change in osmo-iuh[master]: hnbgw: Add missing break statement In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/23081 ) Change subject: hnbgw: Add missing break statement ...................................................................... hnbgw: Add missing break statement We don't want to print usage information after the VTY reference XML. Change-Id: Ia729134a8f18d53274bbc063aa39508c7dcc1f72 --- M src/hnbgw.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw.c b/src/hnbgw.c index 965e8a4..9211a7e 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -472,6 +472,7 @@ switch (c) { case 0: handle_long_options(argv[0], long_option); + break; case 'h': print_usage(); print_help(); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/23081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia729134a8f18d53274bbc063aa39508c7dcc1f72 Gerrit-Change-Number: 23081 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 08:43:45 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:43:45 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <603611c8b29ab_d852b0a6e29c5f4527858@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libsmpp34 failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] cycle: dh-strip-nondeterminism -> debhelper [ 12s] breaking dependency debhelper -> dh-strip-nondeterminism [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM... [ 20s] c[?7l[ 5.178933] dracut-mount[340]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_2/root: 12298 [ 319s] qemu-kvm: terminating on signal 15 from pid 17847 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (12282) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:49:09 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:49:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_10/i586 In-Reply-To: References: Message-ID: <60361310e571a_d852b0a6e29c5f45292d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_10/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 12s] breaking dependency libgcc1 -> libc6 [ 12s] cycle: debhelper -> dh-autoreconf [ 12s] breaking dependency debhelper -> dh-autoreconf [ 12s] cycle: dh-strip-nondeterminism -> debhelper [ 12s] breaking dependency debhelper -> dh-strip-nondeterminism [ 12s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.546821] dracut-mount[370]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosrepPress Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 324s] /var/cache/obs/worker/root_9/root: 19644 [ 324s] qemu-kvm: terminating on signal 15 from pid 8435 () [ 324s] ### VM INTERACTION END ### [ 324s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (19636) - No such process [ 324s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 324s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 08:52:52 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 08:52:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sysmon in Debian_10/i586 In-Reply-To: References: Message-ID: <603613fdd1ef3_d852b0a6e29c5f4530663@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sysmon/Debian_10/i586 Package network:osmocom:nightly/osmo-sysmon failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sysmon Last lines of build log: [ 10s] breaking dependency libgcc1 -> libc6 [ 10s] cycle: debhelper -> dh-autoreconf [ 10s] breaking dependency debhelper -> dh-autoreconf [ 10s] cycle: dh-strip-nondeterminism -> debhelper [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_13/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_13/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_13/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.191624] dracut-mount[368]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USPress Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_13/root: 13004 [ 316s] qemu-kvm: terminating on signal 15 from pid 17967 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/13/build/build-vm: line 485: kill: (12986) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:01:27 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:01:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <603615fe14a22_d852b0a6e29c5f45333d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/osmo-python-tests failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: [ 8s] breaking dependency libcrypt1 -> libc6 [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.661053] dracut-mount[362]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USPress Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_5/root: 64393 [ 319s] qemu-kvm: terminating on signal 15 from pid 53594 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (64384) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:04:36 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:04:36 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <603616afbf0d9_d852b0a6e29c5f45342d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 9s] reordering...cycle: libc6 -> libgcc1 [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.186874] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "jPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 19058 [ 315s] qemu-kvm: terminating on signal 15 from pid 23508 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (19050) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:09:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:09:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_9.0/i586 In-Reply-To: References: Message-ID: <603617dec11d3_d852b0a6e29c5f45356f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_9.0/i586 Package network:osmocom:latest/osmo-e1d failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 10s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 11s] Booting from ROM... [ 17s] c[?7l[ 5.045525] dracut-mount[339]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 321s] (or press Control-D to continue): [ 321s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_2/root: 12543 [ 321s] qemu-kvm: terminating on signal 15 from pid 20010 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (12535) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:20:19 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:20:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60361a7135b0d_d852b0a6e29c5f45387fe@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_9.0/i586 Package network:osmocom:latest/osmo-remsim failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 11s] cycle: debhelper -> dh-strip-nondeterminism [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] cycle: dmsetup -> libdevmapper1.02.1 [ 11s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 11s] done [ 12s] booting kvm... [ 12s] ### VM INTERACTION START ### [ 12s] Using UART console [ 12s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 5.245345] dracut-mount[370]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mountingPress Enter for maintenance [ 322s] (or press Control-D to continue): [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_4/root: 7913 [ 322s] qemu-kvm: terminating on signal 15 from pid 13488 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (7905) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:20:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:20:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_10/i586 In-Reply-To: References: Message-ID: <60361a8fe33cc_d852b0a6e29c5f453892@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_10/i586 Package network:osmocom:latest/osmo-remsim failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 13s] breaking dependency debhelper -> dh-autoreconf [ 13s] cycle: debhelper -> dh-strip-nondeterminism [ 13s] breaking dependency debhelper -> dh-strip-nondeterminism [ 13s] cycle: dmsetup -> libdevmapper1.02.1 [ 13s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 13s] done [ 14s] booting kvm... [ 14s] ### VM INTERACTION START ### [ 14s] Using UART console [ 14s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 14s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 20s] Booting from ROM..c[?7l[ 5.161739] dracut-mount[366]: Warning: Can't mount root filesystem [ 20s] [ 20s] Generating "/run/initramfs/rdsosreport.txt" [ 20s] [ 20s] [ 20s] Entering emergency mode. Exit the shell to continue. [ 20s] Type "journalctl" to view system logs. [ 20s] You might want to save "/run/initramfs/rdsosreport.txt" to a USPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_8/root: 13090 [ 320s] qemu-kvm: terminating on signal 15 from pid 13918 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (13082) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:30:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:30:18 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_10/x86_64 In-Reply-To: References: Message-ID: <60361cc62388_d852b0a6e29c5f4541314@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_10/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.192140] dracut-mount[377]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug repPress Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_6/root: 25677 [ 321s] qemu-kvm: terminating on signal 15 from pid 22844 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (25669) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:31:44 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:31:44 +0000 Subject: Build failure of network:osmocom:latest/osmo-sysmon in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <60361d0691f4b_d852b0a6e29c5f45417e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-sysmon failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sysmon Last lines of build log: [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 5.042112] dracut-mount[381]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attach it to a bug report. [ 14s] [ 14s] [ 14s] Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_9/root: 17461 [ 319s] qemu-kvm: terminating on signal 15 from pid 16700 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (17453) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:32:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Feb 2021 09:32:30 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23005 to look at the new patch set (#5). Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... ttcn3-ggsn-test: add kernel test Make it possible to run ttcn3-ggsn-test against osmo-ggsn with the GTP kernel module. This feature is enabled by environment variables explained in ttcn3-ggsn-test/jenkins.sh, and can either use the pre-built kernel from Debian, or build a kernel from source. The kernel runs inside QEMU inside the usual osmo-ggsn-master docker image. Thanks to Pau for providing the kernel config and kernel-test scripts that this patch is based on! I ended up modifying them quite a bit to fit the docker use case, and to build the initrd (so we can use the stock debian kernel). Related: OS#3208 Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d --- M .gitignore M README.md M jenkins-common.sh M osmo-ggsn-latest/Dockerfile M osmo-ggsn-master/Dockerfile A scripts/kernel-test/initrd-build.sh A scripts/kernel-test/initrd-init.sh A scripts/kernel-test/kernel-build.sh A scripts/kernel-test/prepare.sh A scripts/kernel-test/qemu-ifdown.sh A scripts/kernel-test/qemu-ifup.sh A scripts/kernel-test/run-qemu.sh A ttcn3-ggsn-test/fragment.config A ttcn3-ggsn-test/initrd-ggsn.sh M ttcn3-ggsn-test/jenkins.sh A ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 16 files changed, 773 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/23005/5 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:33:52 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Feb 2021 09:33:52 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 5: The fragment was missing CONFIG_GTP, it works now :) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 24 Feb 2021 09:33:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 09:40:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:40:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <60361f20ea301_d852b0a6e29c5f45445f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 56s] + export LC_ALL=C [ 56s] + LC_ALL=C [ 56s] + export LICENSEDIR [ 56s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.i386/usr/share/licenses/osmo-mgw [ 56s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.i386/usr/share/licenses/osmo-mgw [ 56s] + RPM_EC=0 [ 56s] ++ jobs -p [ 56s] + exit 0 [ 56s] Provides: config(osmo-mgw) = 1.8.0-2.1 osmo-mgw = 1.8.0-2.1 osmo-mgw(x86-32) = 1.8.0-2.1 [ 56s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 56s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 56s] Requires(pre): /bin/sh systemd [ 56s] Requires(post): /bin/sh systemd [ 56s] Requires(preun): /bin/sh systemd [ 56s] Requires(postun): /bin/sh systemd [ 56s] Requires: libc.so.6 libc.so.6(GLIBC_2.0) libc.so.6(GLIBC_2.1.3) libc.so.6(GLIBC_2.17) libc.so.6(GLIBC_2.3) libc.so.6(GLIBC_2.3.4) libc.so.6(GLIBC_2.4) libc.so.6(GLIBC_2.7) libosmoabis.so.10 libosmocore.so.17 libosmoctrl.so.0 libosmoctrl.so.0(LIBOSMOCTRL_1.0) libosmogsm.so.16 libosmogsm.so.16(LIBOSMOGSM_1.0) libosmonetif.so.8 libosmotrau.so.2 libosmovty.so.9 libtalloc.so.2 libtalloc.so.2(TALLOC_2.0.2) [ 56s] Processing files: libosmo-mgcp-client8-1.8.0-2.1.i586 [ 56s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.i386/usr/lib/libosmo-mgcp-client.so.6* [ 56s] [ 56s] [ 56s] RPM build errors: [ 56s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.i386/usr/lib/libosmo-mgcp-client.so.6* [ 56s] ### VM INTERACTION START ### [ 59s] [ 52.369615] sysrq: Power Off [ 59s] [ 52.377587] reboot: Power down [ 60s] ### VM INTERACTION END ### [ 60s] [ 60s] lamb08 failed "build osmo-mgw.spec" at Wed Feb 24 09:40:12 UTC 2021. [ 60s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 09:48:18 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 09:48:18 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <603621023a2ad_d852b0a6e29c5f454698a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Testing/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 13s] reordering...cycle: libc6 -> libgcc-s1 [ 13s] breaking dependency libc6 -> libgcc-s1 [ 13s] cycle: libc6 -> libcrypt1 [ 13s] breaking dependency libcrypt1 -> libc6 [ 13s] done [ 13s] booting kvm... [ 13s] ### VM INTERACTION START ### [ 13s] Using UART console [ 13s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 13s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 19s] Booting from ROM..c[?7l[ 5.231482] dracut-mount[343]: Warning: Can't mount root filesystem [ 19s] [ 19s] Generating "/run/initramfs/rdsosreport.txt" [ 19s] [ 19s] [ 19s] Entering emergency mode. Exit the shell to continue. [ 19s] Type "journalctl" to view system logs. [ 19s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 19s] after mounting them and attachPress Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_9/root: 22622 [ 319s] qemu-kvm: terminating on signal 15 from pid 22831 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (22613) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:54:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:54:42 +0000 Subject: Change in osmo-mgw[master]: attempt to fix RPM spec file after recent soversion bump References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23086 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... attempt to fix RPM spec file after recent soversion bump In I64ff22193ab2a95a9a7d66e9957a875d096e23de the soversion was chhanged, but the spec.in file was not adjusted accordingly. Change-Id: I45d7321adb2db8e7b9ea41b6bcf0c6cc59984a0e --- M contrib/osmo-mgw.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/23086/1 diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in index efb166a..ee85db3 100644 --- a/contrib/osmo-mgw.spec.in +++ b/contrib/osmo-mgw.spec.in @@ -120,7 +120,7 @@ %config(noreplace) %{_sysconfdir}/osmocom/osmo-mgw.cfg %files -n libosmo-mgcp-client8 -%{_libdir}/libosmo-mgcp-client.so.6* +%{_libdir}/libosmo-mgcp-client.so.8* %files -n libosmo-mgcp-client-devel %{_libdir}/libosmo-mgcp-client.so -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I45d7321adb2db8e7b9ea41b6bcf0c6cc59984a0e Gerrit-Change-Number: 23086 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:56:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:56:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E8=2E0=2E1-535e_=E2=86=92_1=2E8=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23087 ) Change subject: Bump version: 1.8.0.1-535e ? 1.8.1 ...................................................................... Bump version: 1.8.0.1-535e ? 1.8.1 Change-Id: Ib92e6ca89e1406d3707a94063975fe338cf67a9e --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/87/23087/1 diff --git a/debian/changelog b/debian/changelog index 9f04449..a2f5c4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-mgw (1.8.1) unstable; urgency=medium + + * attempt to fix RPM spec file after recent soversion bump + + -- Harald Welte Wed, 24 Feb 2021 10:56:17 +0100 + osmo-mgw (1.8.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib92e6ca89e1406d3707a94063975fe338cf67a9e Gerrit-Change-Number: 23087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:57:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:57:11 +0000 Subject: Change in osmo-mgw[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23086 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I45d7321adb2db8e7b9ea41b6bcf0c6cc59984a0e Gerrit-Change-Number: 23086 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 09:57:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:57:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:57:39 +0000 Subject: Change in osmo-mgw[master]: attempt to fix RPM spec file after recent soversion bump In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23086 ) Change subject: attempt to fix RPM spec file after recent soversion bump ...................................................................... attempt to fix RPM spec file after recent soversion bump In I64ff22193ab2a95a9a7d66e9957a875d096e23de the soversion was chhanged, but the spec.in file was not adjusted accordingly. Change-Id: I45d7321adb2db8e7b9ea41b6bcf0c6cc59984a0e --- M contrib/osmo-mgw.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in index efb166a..ee85db3 100644 --- a/contrib/osmo-mgw.spec.in +++ b/contrib/osmo-mgw.spec.in @@ -120,7 +120,7 @@ %config(noreplace) %{_sysconfdir}/osmocom/osmo-mgw.cfg %files -n libosmo-mgcp-client8 -%{_libdir}/libosmo-mgcp-client.so.6* +%{_libdir}/libosmo-mgcp-client.so.8* %files -n libosmo-mgcp-client-devel %{_libdir}/libosmo-mgcp-client.so -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I45d7321adb2db8e7b9ea41b6bcf0c6cc59984a0e Gerrit-Change-Number: 23086 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:59:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:59:10 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E8=2E0=2E1-535e_=E2=86=92_1=2E8=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23087 ) Change subject: Bump version: 1.8.0.1-535e ? 1.8.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib92e6ca89e1406d3707a94063975fe338cf67a9e Gerrit-Change-Number: 23087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 09:59:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:59:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:59:11 +0000 Subject: =?UTF-8?Q?Change_in_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E8=2E0=2E1-535e_=E2=86=92_1=2E8=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/23087 ) Change subject: Bump version: 1.8.0.1-535e ? 1.8.1 ...................................................................... Bump version: 1.8.0.1-535e ? 1.8.1 Change-Id: Ib92e6ca89e1406d3707a94063975fe338cf67a9e --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 9f04449..a2f5c4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-mgw (1.8.1) unstable; urgency=medium + + * attempt to fix RPM spec file after recent soversion bump + + -- Harald Welte Wed, 24 Feb 2021 10:56:17 +0100 + osmo-mgw (1.8.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/23087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib92e6ca89e1406d3707a94063975fe338cf67a9e Gerrit-Change-Number: 23087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 09:59:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 09:59:56 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 09:59:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 10:00:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 24 Feb 2021 10:00:26 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Feb 2021 10:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 10:02:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:02:06 +0000 Subject: Build failure of network:osmocom:latest/yder in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60362430b7dcf_d852b0a6e29c5f45531db@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/yder/Debian_Unstable/x86_64 Package network:osmocom:latest/yder failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest yder Last lines of build log: [ 7s] copying packages... [ 8s] reordering...cycle: libc6 -> libgcc-s1 [ 8s] breaking dependency libc6 -> libgcc-s1 [ 8s] cycle: libc6 -> libcrypt1 [ 8s] breaking dependency libcrypt1 -> libc6 [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 25600 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 4.926774] dracut-mount[424]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. Press Enter for maintenance [ 319s] (or press Control-D to continue): [ 319s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_5/root: 202514 [ 319s] qemu-kvm: terminating on signal 15 from pid 213393 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (202506) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:16:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:16:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_9.0/i586 In-Reply-To: References: Message-ID: <6036278454e36_d852b0a6e29c5f456068d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_9.0/i586 Package network:osmocom:latest/osmo-iuh failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 11s] breaking dependency python3 -> dh-python [ 11s] cycle: debhelper -> dh-autoreconf [ 11s] breaking dependency debhelper -> dh-autoreconf [ 11s] cycle: dh-strip-nondeterminism -> debhelper [ 11s] breaking dependency debhelper -> dh-strip-nondeterminism [ 11s] done [ 11s] booting kvm... [ 11s] ### VM INTERACTION START ### [ 11s] Using UART console [ 11s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 12s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 5.434114] dracut-mount[381]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosrepPress Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_6/root: 23386 [ 318s] qemu-kvm: terminating on signal 15 from pid 11964 () [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (23378) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:16:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:16:23 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <60362787bf420_d852b0a6e29c5f456087d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: dh-python -> python3 [ 8s] breaking dependency python3 -> dh-python [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 7.961662] dracut-mount[380]: Warning: Can't mount root filesystem [ 18s] [ 18s] Generating "/run/initramfs/rdsosreport.txt" [ 18s] [ 18s] [ 18s] Entering emergency mode. Exit the shell to continue. [ 18s] Type "journalctl" to view system logs. [ 18s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_11/root: 21005 [ 316s] qemu-kvm: terminating on signal 15 from pid 3115 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/11/build/build-vm: line 485: kill: (20998) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:16:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:16:40 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/i586 In-Reply-To: References: Message-ID: <60362796d56fd_d852b0a6e29c5f456127f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 23s] breaking dependency debhelper -> dh-strip-nondeterminism [ 23s] done [ 23s] booting kvm... [ 23s] ### VM INTERACTION START ### [ 23s] Using UART console [ 23s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 24s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 32s] Booting from ROM..c[?7l[ 7.643942] dracut-mount[381]: Warning: Can't mount root filesystem [ 32s] [ 32s] Generating "/run/initramfs/rdsosreport.txt" [ 32s] [ 32s] [ 32s] Entering emergency mode. Exit the shell to continue. [ 32s] Type "journalctl" to view system logs. [ 32s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 32s] after mounting them and attach it to a bug report. [ 32s] [ 32s] [ 32s] Press Enter for maintenance [ 330s] (or press Control-D to continue): [ 330s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_12/root: 4961 [ 330s] qemu-kvm: terminating on signal 15 from pid 4581 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/12/build/build-vm: line 485: kill: (4955) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:18:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:18:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <603627ebc7581_d852b0a6e29c5f456232c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.064670] dracut-mount[344]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_6/root: 10481 [ 315s] qemu-kvm: terminating on signal 15 from pid 2015 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/6/build/build-vm: line 485: kill: (10473) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:19:14 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:19:14 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_8.0/i586 In-Reply-To: References: Message-ID: <6036282c7e36c_d852b0a6e29c5f456321b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_8.0/i586 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 8s] breaking dependency multiarch-support -> libc6 [ 8s] cycle: libdevmapper1.02.1 -> dmsetup [ 8s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 3072 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 9s] Booting from ROM... [ 14s] c[?7l[ 5.120749] dracut-mount[339]: Warning: Can't mount root filesystem [ 14s] [ 14s] Generating "/run/initramfs/rdsosreport.txt" [ 14s] [ 14s] [ 14s] Entering emergency mode. Exit the shell to continue. [ 14s] Type "journalctl" to view system logs. [ 14s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 14s] after mounting them and attachPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_2/root: 525 [ 314s] qemu-kvm: terminating on signal 15 from pid 7753 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (517) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:22:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:22:23 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_9.0/i586 In-Reply-To: References: Message-ID: <603628f6cb90_d852b0a6e29c5f4565045@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_9.0/i586 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 7s] breaking dependency libgcc1 -> libc6 [ 7s] cycle: debhelper -> dh-autoreconf [ 7s] breaking dependency debhelper -> dh-autoreconf [ 7s] cycle: dh-strip-nondeterminism -> debhelper [ 7s] breaking dependency debhelper -> dh-strip-nondeterminism [ 7s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 12s] Booting from ROM..c[?7l[ 4.628781] dracut-mount[362]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /bootPress Enter for maintenance [ 313s] (or press Control-D to continue): [ 313s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 313s] /var/cache/obs/worker/root_5/root: 57094 [ 313s] qemu-kvm: terminating on signal 15 from pid 18035 () [ 313s] ### VM INTERACTION END ### [ 313s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (57086) - No such process [ 313s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 313s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:24:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:24:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6036295280455_d852b0a6e29c5f4566977@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 39s] done [ 39s] booting kvm... [ 39s] ### VM INTERACTION START ### [ 39s] Using UART console [ 39s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_13/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_13/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_13/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 40s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 40s] Booting from ROM... [ 50s] c[?7l[ 9.046039] dracut-mount[380]: Warning: Can't mount root filesystem [ 50s] [ 50s] Generating "/run/initramfs/rdsosreport.txt" [ 50s] [ 50s] [ 50s] Entering emergency mode. Exit the shell to continue. [ 50s] Type "journalctl" to view system logs. [ 50s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 50s] after mounting them and attach it to a bug report. [ 50s] [ 50s] [ 50s] Press Enter for maintenance [ 347s] (or press Control-D to continue): [ 347s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] /var/cache/obs/worker/root_13/root: 13328 [ 347s] qemu-kvm: terminating on signal 15 from pid 23683 () [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/13/build/build-vm: line 485: kill: (13316) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:26:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:26:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <603629ceeb82c_d852b0a6e29c5f456804a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.394072] dracut-mount[363]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_1/root: 32033 [ 320s] qemu-kvm: terminating on signal 15 from pid 19708 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (32025) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:26:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:26:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <603629cfc6961_d852b0a6e29c5f456818a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 6s] breaking dependency debhelper -> dh-strip-nondeterminism [ 6s] done [ 7s] booting kvm... [ 7s] ### VM INTERACTION START ### [ 7s] Using UART console [ 7s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 7s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 11s] Booting from ROM..c[?7l[ 4.631657] dracut-mount[360]: Warning: Can't mount root filesystem [ 12s] [ 12s] Generating "/run/initramfs/rdsosreport.txt" [ 12s] [ 12s] [ 12s] Entering emergency mode. Exit the shell to continue. [ 12s] Type "journalctl" to view system logs. [ 12s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 12s] after mounting them and attach it to a bug report. [ 12s] [ 12s] [ 12s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_10/root: 2374 [ 317s] qemu-kvm: terminating on signal 15 from pid 44189 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (2366) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:26:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:26:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <603629e8eb23f_d852b0a6e29c5f45683a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 278s] + cd osmo-mgw-1.8.0 [ 278s] + LICENSEDIR=/home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.aarch64/usr/share/licenses/osmo-mgw [ 278s] + export LC_ALL=C [ 278s] + LC_ALL=C [ 278s] + export LICENSEDIR [ 278s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.aarch64/usr/share/licenses/osmo-mgw [ 278s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.aarch64/usr/share/licenses/osmo-mgw [ 278s] + exit 0 [ 278s] Provides: config(osmo-mgw) = 1.8.0-lp151.2.1 osmo-mgw = 1.8.0-lp151.2.1 osmo-mgw(aarch-64) = 1.8.0-lp151.2.1 [ 278s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 278s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 278s] Requires(pre): /bin/sh systemd [ 278s] Requires(post): /bin/sh systemd [ 278s] Requires(preun): /bin/sh systemd [ 278s] Requires(postun): /bin/sh systemd [ 278s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 278s] Processing files: libosmo-mgcp-client8-1.8.0-lp151.2.1.aarch64 [ 278s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 278s] [ 278s] [ 278s] RPM build errors: [ 278s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 278s] ### VM INTERACTION START ### [ 282s] [ 221.036604] sysrq: SysRq : Power Off [ 282s] [ 221.054332] reboot: Power down [ 282s] ### VM INTERACTION END ### [ 282s] [ 282s] obs-arm-1 failed "build osmo-mgw.spec" at Wed Feb 24 10:26:09 UTC 2021. [ 282s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:26:40 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:26:40 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_10/x86_64 In-Reply-To: References: Message-ID: <603629ea21f7_d852b0a6e29c5f45684b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_4/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_4/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_4/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.362469] dracut-mount[380]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_4/root: 27471 [ 321s] qemu-kvm: terminating on signal 15 from pid 20777 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/4/build/build-vm: line 485: kill: (27463) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:26:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:26:57 +0000 Subject: Build failure of network:osmocom:nightly/osmocom-nightly in Debian_10/i586 In-Reply-To: References: Message-ID: <60362a06a25c6_d852b0a6e29c5f45685b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmocom-nightly/Debian_10/i586 Package network:osmocom:nightly/osmocom-nightly failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmocom-nightly Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.068340] dracut-mount[369]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 15s] after mounting them and attach it to a bug report. [ 15s] [ 15s] [ 15s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_8/root: 18039 [ 320s] qemu-kvm: terminating on signal 15 from pid 822 () [ 320s] ### VM INTERACTION END ### [ 320s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (18031) - No such process [ 320s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 320s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:27:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:27:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_10/i586 In-Reply-To: References: Message-ID: <60362a2a27af6_d852b0a6e29c5f45688f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_10/i586 Package network:osmocom:latest/osmo-iuh failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 18432 -drive file=/var/cache/obs/worker/root_2/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_2/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_2/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 16 [ 10s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.651336] dracut-mount[429]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 320s] (or press Control-D to continue): [ 320s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 320s] /var/cache/obs/worker/root_2/root: 61811 [ 320s] qemu-kvm: terminating on signal 15 from pid 5453 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/2/build/build-vm: line 485: kill: (61803) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:31:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:31:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_19.10/x86_64 In-Reply-To: References: Message-ID: <60362afc9f41b_d852b0a6e29c5f456983@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_19.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_19.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 8s] cycle: debhelper -> dh-autoreconf [ 8s] breaking dependency debhelper -> dh-autoreconf [ 8s] cycle: dh-strip-nondeterminism -> debhelper [ 8s] breaking dependency debhelper -> dh-strip-nondeterminism [ 8s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_10/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_10/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_10/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 6 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 13s] Booting from ROM..c[?7l[ 4.636191] dracut-mount[361]: Warning: Can't mount root filesystem [ 13s] [ 13s] Generating "/run/initramfs/rdsosreport.txt" [ 13s] [ 13s] [ 13s] Entering emergency mode. Exit the shell to continue. [ 13s] Type "journalctl" to view system logs. [ 13s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 13s] aPress Enter for maintenance [ 314s] (or press Control-D to continue): [ 314s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 314s] /var/cache/obs/worker/root_10/root: 41194 [ 314s] qemu-kvm: terminating on signal 15 from pid 13819 () [ 314s] ### VM INTERACTION END ### [ 314s] /var/run/obs/worker/10/build/build-vm: line 485: kill: (41186) - No such process [ 314s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 314s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:31:15 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:31:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60362afd964cd_d852b0a6e29c5f456996e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_1/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_1/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_1/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 16s] Booting from ROM..c[?7l[ 5.161443] dracut-mount[368]: Warning: Can't mount root filesystem [ 16s] [ 16s] Generating "/run/initramfs/rdsosreport.txt" [ 16s] [ 16s] [ 16s] Entering emergency mode. Exit the shell to continue. [ 16s] Type "journalctl" to view system logs. [ 16s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 16s] after mounting them and attach it to a bug report. [ 16s] [ 16s] [ 16s] Press Enter for maintenance [ 316s] (or press Control-D to continue): [ 316s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_1/root: 25272 [ 316s] qemu-kvm: terminating on signal 15 from pid 1009 () [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/1/build/build-vm: line 485: kill: (25265) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:32:23 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:32:23 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_8.0/i586 In-Reply-To: References: Message-ID: <60362b509dc6e_d852b0a6e29c5f45706d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_8.0/i586 Package network:osmocom:nightly/libasn1c failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 7s] breaking dependency libgcc1 -> libc6 [ 7s] cycle: libc6 -> libgcc1 -> multiarch-support [ 7s] breaking dependency multiarch-support -> libc6 [ 7s] cycle: libdevmapper1.02.1 -> dmsetup [ 7s] breaking dependency libdevmapper1.02.1 -> dmsetup [ 7s] done [ 8s] booting kvm... [ 8s] ### VM INTERACTION START ### [ 8s] Using UART console [ 8s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_9/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_9/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_9/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 8s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 14s] Booting from ROM..c[?7l[ 6.056226] dracut-mount[381]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want Press Enter for maintenance [ 318s] (or press Control-D to continue): [ 318s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_9/root: 27034 [ 319s] qemu-kvm: terminating on signal 15 from pid 3727 () [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/9/build/build-vm: line 485: kill: (27026) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:33:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:33:31 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/i586 In-Reply-To: References: Message-ID: <60362b89786a3_d852b0a6e29c5f45710dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/i586 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 9s] breaking dependency libgcc1 -> libc6 [ 9s] cycle: debhelper -> dh-autoreconf [ 9s] breaking dependency debhelper -> dh-autoreconf [ 9s] cycle: dh-strip-nondeterminism -> debhelper [ 9s] breaking dependency debhelper -> dh-strip-nondeterminism [ 9s] done [ 9s] booting kvm... [ 9s] ### VM INTERACTION START ### [ 9s] Using UART console [ 9s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 9s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 15s] Booting from ROM..c[?7l[ 5.393170] dracut-mount[364]: Warning: Can't mount root filesystem [ 15s] [ 15s] Generating "/run/initramfs/rdsosreport.txt" [ 15s] [ 15s] [ 15s] Entering emergency mode. Exit the shell to continue. [ 15s] Type "journalctl" to view system logs. [ 15s] You might want Press Enter for maintenance [ 315s] (or press Control-D to continue): [ 315s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 315s] /var/cache/obs/worker/root_3/root: 9030 [ 315s] qemu-kvm: terminating on signal 15 from pid 3672 () [ 315s] ### VM INTERACTION END ### [ 315s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (9022) - No such process [ 315s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 315s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:33:48 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:33:48 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_10/i586 In-Reply-To: References: Message-ID: <60362ba9113ef_d852b0a6e29c5f45711a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_10/i586 Package network:osmocom:nightly/libasn1c failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 10s] breaking dependency debhelper -> dh-strip-nondeterminism [ 10s] done [ 10s] booting kvm... [ 10s] ### VM INTERACTION START ### [ 10s] Using UART console [ 10s] linux64 /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 11s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 17s] Booting from ROM..c[?7l[ 5.896863] dracut-mount[382]: Warning: Can't mount root filesystem [ 17s] [ 17s] Generating "/run/initramfs/rdsosreport.txt" [ 17s] [ 17s] [ 17s] Entering emergency mode. Exit the shell to continue. [ 17s] Type "journalctl" to view system logs. [ 17s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 17s] after mounting them and attach it to a bug report. [ 17s] [ 17s] [ 17s] Press Enter for maintenance [ 317s] (or press Control-D to continue): [ 317s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_3/root: 23778 [ 317s] qemu-kvm: terminating on signal 15 from pid 13571 () [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/3/build/build-vm: line 485: kill: (23770) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:34:22 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:34:22 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_19.04/x86_64 In-Reply-To: References: Message-ID: <60362bc661926_d852b0a6e29c5f45713e8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_19.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_19.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 38s] cycle: debhelper -> dh-autoreconf [ 38s] breaking dependency debhelper -> dh-autoreconf [ 38s] cycle: dh-strip-nondeterminism -> debhelper [ 38s] breaking dependency debhelper -> dh-strip-nondeterminism [ 38s] done [ 38s] booting kvm... [ 38s] ### VM INTERACTION START ### [ 38s] Using UART console [ 38s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_13/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_13/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_13/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 39s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 51s] Booting from ROM..c[?7l[ 10.922418] dracut-mount[380]: Warning: Can't mount root filesystem [ 51s] [ 51s] Generating "/run/initramfs/rdsosreport.txt" [ 51s] [ 51s] [ 51s] Entering emergency mode. Exit the shell to continue. [ 51s] Type "journalctl" to view system logs. [ 51s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 51s] after mounting them and attachPress Enter for maintenance [ 349s] (or press Control-D to continue): [ 349s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 349s] /var/cache/obs/worker/root_13/root: 18824 [ 349s] qemu-kvm: terminating on signal 15 from pid 26207 () [ 350s] ### VM INTERACTION END ### [ 350s] /var/run/obs/worker/13/build/build-vm: line 485: kill: (18809) - No such process [ 350s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 350s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:34:56 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:34:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <60362be92faa8_d852b0a6e29c5f45717ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Testing/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 25s] breaking dependency libcrypt1 -> libc6 [ 25s] done [ 25s] booting kvm... [ 25s] ### VM INTERACTION START ### [ 25s] Using UART console [ 25s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 4096 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 26s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 32s] Booting from ROM..c[?7l[ 5.559701] dracut-mount[342]: Warning: Can't mount root filesystem [ 32s] [ 32s] Generating "/run/initramfs/rdsosreport.txt" [ 32s] [ 32s] [ 32s] Entering emergency mode. Exit the shell to continue. [ 32s] Type "journalctl" to view system logs. [ 32s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 32s] after mounting them and attach it to a bug report. [ 32s] [ 32s] [ 32s] Press Enter for maintenance [ 335s] (or press Control-D to continue): [ 335s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_8/root: 28190 [ 335s] qemu-kvm: terminating on signal 15 from pid 19559 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/8/build/build-vm: line 485: kill: (28182) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:39:53 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:39:53 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <60362d12dcc62_d852b0a6e29c5f4573188@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 14s] [16/16] preinstalling binutils... [ 14s] copying packages... [ 17s] reordering...cycle: libc6 -> libgcc-s1 [ 17s] breaking dependency libc6 -> libgcc-s1 [ 17s] cycle: libc6 -> libcrypt1 [ 17s] breaking dependency libcrypt1 -> libc6 [ 17s] done [ 17s] booting kvm... [ 17s] ### VM INTERACTION START ### [ 17s] Using UART console [ 17s] /usr/bin/qemu-kvm -nodefaults -no-reboot -nographic -vga none -cpu host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-pci,rng=rng0 -runas qemu -net none -kernel /boot/kernel.obs.guest -initrd /boot/initrd.obs.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 mitigations=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyS0 init=/.build/build -m 8192 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,cache=unsafe -device virtio-blk-pci,drive=disk,serial=0 -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,cache=unsafe -device virtio-blk-pci,drive=swap,serial=1 -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 18s] c[?7lSeaBIOS (version rel-1.14.0-0-g155821a-rebuilt.opensuse.org) [ 25s] Booting from ROM..c[?7l[ 6.823720] dracut-mount[382]: Warning: Can't mount root filesystem [ 25s] [ 25s] Generating "/run/initramfs/rdsosreport.txt" [ 25s] [ 25s] [ 25s] Entering emergency mode. Exit the shell to continue. [ 25s] Type "journalctl" to viPress Enter for maintenance [ 323s] (or press Control-D to continue): [ 323s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 323s] /var/cache/obs/worker/root_5/root: 24512 [ 323s] qemu-kvm: terminating on signal 15 from pid 31564 () [ 323s] ### VM INTERACTION END ### [ 323s] /var/run/obs/worker/5/build/build-vm: line 485: kill: (24496) - No such process [ 323s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 323s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:44:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:44:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in CentOS_8/aarch64 In-Reply-To: References: Message-ID: <60362e217919e_d852b0a6e29c5f4575469@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/CentOS_8/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in CentOS_8/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 174s] + umask 022 [ 174s] + cd /home/abuild/rpmbuild/BUILD [ 174s] + cd osmo-mgw-1.8.0 [ 174s] + LICENSEDIR=/home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/share/licenses/osmo-mgw [ 174s] + export LC_ALL=C [ 174s] + LC_ALL=C [ 174s] + export LICENSEDIR [ 174s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/share/licenses/osmo-mgw [ 174s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/share/licenses/osmo-mgw [ 174s] + exit 0 [ 174s] Provides: config(osmo-mgw) = 1.8.0-2.1 osmo-mgw = 1.8.0-2.1 osmo-mgw(aarch-64) = 1.8.0-2.1 [ 174s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 174s] Requires(post): systemd [ 174s] Requires(preun): systemd [ 174s] Requires(postun): systemd [ 174s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) rtld(GNU_HASH) [ 174s] Processing files: libosmo-mgcp-client8-1.8.0-2.1.aarch64 [ 174s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 174s] [ 174s] [ 174s] RPM build errors: [ 174s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 174s] ### VM INTERACTION START ### [ 175s] Powering off. [ 175s] [ 151.645361] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] obs-arm-9 failed "build osmo-mgw.spec" at Wed Feb 24 10:44:17 UTC 2021. [ 175s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:51:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:51:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <60362fa9852d8_d852b0a6e29c5f457718c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 56s] + cd osmo-mgw-1.8.0 [ 56s] + LICENSEDIR=/home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.x86_64/usr/share/licenses/osmo-mgw [ 56s] + export LC_ALL=C [ 56s] + LC_ALL=C [ 56s] + export LICENSEDIR [ 56s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.x86_64/usr/share/licenses/osmo-mgw [ 56s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.x86_64/usr/share/licenses/osmo-mgw [ 56s] + exit 0 [ 56s] Provides: config(osmo-mgw) = 1.8.0-lp151.2.1 osmo-mgw = 1.8.0-lp151.2.1 osmo-mgw(x86-64) = 1.8.0-lp151.2.1 [ 56s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 56s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 56s] Requires(pre): /bin/sh systemd [ 56s] Requires(post): /bin/sh systemd [ 56s] Requires(preun): /bin/sh systemd [ 56s] Requires(postun): /bin/sh systemd [ 56s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 56s] Processing files: libosmo-mgcp-client8-1.8.0-lp151.2.1.x86_64 [ 56s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 56s] [ 56s] [ 56s] RPM build errors: [ 56s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp151.2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 56s] ### VM INTERACTION START ### [ 60s] [ 51.157720] sysrq: SysRq : Power Off [ 60s] [ 51.162200] reboot: Power down [ 60s] ### VM INTERACTION END ### [ 60s] [ 60s] lamb58 failed "build osmo-mgw.spec" at Wed Feb 24 10:50:57 UTC 2021. [ 60s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:51:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:51:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <60362fe138a79_d852b0a6e29c5f45772bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 85s] + export LC_ALL=C [ 85s] + LC_ALL=C [ 85s] + export LICENSEDIR [ 85s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/share/licenses/osmo-mgw [ 85s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/share/licenses/osmo-mgw [ 85s] + RPM_EC=0 [ 85s] ++ jobs -p [ 85s] + exit 0 [ 85s] Provides: config(osmo-mgw) = 1.8.0-2.1 osmo-mgw = 1.8.0-2.1 osmo-mgw(x86-64) = 1.8.0-2.1 [ 85s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 85s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 85s] Requires(pre): /bin/sh systemd [ 85s] Requires(post): /bin/sh systemd [ 85s] Requires(preun): /bin/sh systemd [ 85s] Requires(postun): /bin/sh systemd [ 85s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 85s] Processing files: libosmo-mgcp-client8-1.8.0-2.1.x86_64 [ 85s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 85s] [ 85s] [ 85s] RPM build errors: [ 85s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 85s] ### VM INTERACTION START ### [ 88s] [ 72.658534] sysrq: Power Off [ 88s] [ 72.685121] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] lamb25 failed "build osmo-mgw.spec" at Wed Feb 24 10:51:52 UTC 2021. [ 89s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 10:54:32 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 10:54:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <6036307e7f505_d852b0a6e29c5f457801c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 93s] + export LC_ALL=C [ 93s] + LC_ALL=C [ 93s] + export LICENSEDIR [ 93s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/share/licenses/osmo-mgw [ 93s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/share/licenses/osmo-mgw [ 93s] + RPM_EC=0 [ 93s] ++ jobs -p [ 93s] + exit 0 [ 93s] Provides: config(osmo-mgw) = 1.8.0-2.1 osmo-mgw = 1.8.0-2.1 osmo-mgw(aarch-64) = 1.8.0-2.1 [ 93s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 93s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 93s] Requires(pre): /bin/sh systemd [ 93s] Requires(post): /bin/sh systemd [ 93s] Requires(preun): /bin/sh systemd [ 93s] Requires(postun): /bin/sh systemd [ 93s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 93s] Processing files: libosmo-mgcp-client8-1.8.0-2.1.aarch64 [ 93s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 93s] [ 93s] [ 93s] RPM build errors: [ 93s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 93s] ### VM INTERACTION START ### [ 96s] [ 79.939604] sysrq: Power Off [ 96s] [ 79.941096] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] obs-arm-8 failed "build osmo-mgw.spec" at Wed Feb 24 10:54:26 UTC 2021. [ 96s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 10:55:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 10:55:05 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 10:55:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 10:57:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 10:57:49 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 10:57:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 10:57:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 10:57:55 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 ) Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 10:57:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 11:17:05 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:17:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <603635c0201b_d852b0a6e29c5f4583646@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 101s] + cd osmo-mgw-1.8.0 [ 101s] + LICENSEDIR=/home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp152.2.1.x86_64/usr/share/licenses/osmo-mgw [ 101s] + export LC_ALL=C [ 101s] + LC_ALL=C [ 101s] + export LICENSEDIR [ 101s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp152.2.1.x86_64/usr/share/licenses/osmo-mgw [ 101s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp152.2.1.x86_64/usr/share/licenses/osmo-mgw [ 101s] + exit 0 [ 101s] Provides: config(osmo-mgw) = 1.8.0-lp152.2.1 osmo-mgw = 1.8.0-lp152.2.1 osmo-mgw(x86-64) = 1.8.0-lp152.2.1 [ 101s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 101s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 101s] Requires(pre): /bin/sh systemd [ 101s] Requires(post): /bin/sh systemd [ 101s] Requires(preun): /bin/sh systemd [ 101s] Requires(postun): /bin/sh systemd [ 101s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 101s] Processing files: libosmo-mgcp-client8-1.8.0-lp152.2.1.x86_64 [ 101s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp152.2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 101s] [ 101s] [ 101s] RPM build errors: [ 101s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-lp152.2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 102s] ### VM INTERACTION START ### [ 105s] [ 72.841518] sysrq: Power Off [ 105s] [ 72.883393] reboot: Power down [ 105s] ### VM INTERACTION END ### [ 105s] [ 105s] lamb57 failed "build osmo-mgw.spec" at Wed Feb 24 11:16:48 UTC 2021. [ 105s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 11:29:57 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:29:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in CentOS_8/x86_64 In-Reply-To: References: Message-ID: <603638c8cfdc9_d852b0a6e29c5f458641b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/CentOS_8/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in CentOS_8/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 166s] + umask 022 [ 166s] + cd /home/abuild/rpmbuild/BUILD [ 166s] + cd osmo-mgw-1.8.0 [ 166s] + LICENSEDIR=/home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/share/licenses/osmo-mgw [ 166s] + export LC_ALL=C [ 166s] + LC_ALL=C [ 166s] + export LICENSEDIR [ 166s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/share/licenses/osmo-mgw [ 166s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/share/licenses/osmo-mgw [ 166s] + exit 0 [ 166s] Provides: config(osmo-mgw) = 1.8.0-2.1 osmo-mgw = 1.8.0-2.1 osmo-mgw(x86-64) = 1.8.0-2.1 [ 166s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 166s] Requires(post): systemd [ 166s] Requires(preun): systemd [ 166s] Requires(postun): systemd [ 166s] Requires: libc.so.6()(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.7)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.2.5)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) rtld(GNU_HASH) [ 166s] Processing files: libosmo-mgcp-client8-1.8.0-2.1.x86_64 [ 166s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 166s] [ 166s] [ 166s] RPM build errors: [ 166s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.0-2.1.x86_64/usr/lib64/libosmo-mgcp-client.so.6* [ 166s] ### VM INTERACTION START ### [ 167s] Powering off. [ 167s] [ 145.024707] reboot: Power down [ 167s] ### VM INTERACTION END ### [ 167s] [ 167s] lamb21 failed "build osmo-mgw.spec" at Wed Feb 24 11:29:49 UTC 2021. [ 167s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 11:41:06 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:41:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <60363b6230437_d852b0a6e29c5f45888df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 43s] gcc-PIE-7-lp151.3.2 ######################################## [ 43s] brp-check-suse-84.87+git20170602.cec54######################################## [ 43s] zlib-devel-1.2.11-lp151.4.1 ######################################## [ 43s] attr-2.4.47-lp151.3.3 ######################################## [ 43s] brp-extract-appdata-2016.05.04-lp151.2######################################## [ 43s] build-mkbaselibs-20190128-lp151.1.2 ######################################## [ 43s] net-tools-deprecated-2.0+git20170221.4######################################## [ 44s] kernel-obs-build-4.12.14-lp151.27.1 ######################################## [ 44s] now finalizing build dir... [ 45s] SIOCSIFADDR: File exists [ 46s] ----------------------------------------------------------------- [ 46s] I have the following modifications for osmo-mgw.spec: [ 46s] 21c21 [ 46s] < Release: 0 [ 46s] --- [ 46s] > Release: lp151.1.1 [ 46s] ----------------------------------------------------------------- [ 46s] ----- building osmo-mgw.spec (user abuild) [ 46s] ----------------------------------------------------------------- [ 46s] ----------------------------------------------------------------- [ 47s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Leap_15.1_ARM/b5e44b379279f66d79935a4956dc6792-osmo-mgw' /home/abuild/rpmbuild/SOURCES/osmo-mgw.spec [ 47s] error: File /home/abuild/rpmbuild/SOURCES/osmo-mgw_1.8.1.tar.xz: No such file or directory [ 47s] ### VM INTERACTION START ### [ 51s] [ 39.235385] sysrq: SysRq : Power Off [ 51s] [ 39.238308] reboot: Power down [ 51s] ### VM INTERACTION END ### [ 51s] [ 51s] obs-arm-7 failed "build osmo-mgw.spec" at Wed Feb 24 11:41:00 UTC 2021. [ 51s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 11:42:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:42:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in CentOS_8/aarch64 In-Reply-To: References: Message-ID: <60363bb77fcf7_d852b0a6e29c5f4589248@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/CentOS_8/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in CentOS_8/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 131s] [405/412] installing perl-inc-latest-2:0.500-9.el8 [ 131s] [406/412] installing perl-devel-4:5.26.3-416.el8 [ 132s] [407/412] installing perl-ExtUtils-Embed-1.34-416.el8 [ 132s] [408/412] installing perl-ExtUtils-CBuilder-1:0.280230-2.el8 [ 132s] [409/412] installing perl-ExtUtils-Miniperl-1.06-416.el8 [ 132s] [410/412] installing perl-Module-Build-2:0.42.24-5.el8 [ 132s] [411/412] installing perl-CPAN-2.18-397.el8 [ 133s] [412/412] installing perl-4:5.26.3-416.el8 [ 133s] now finalizing build dir... [ 133s] SIOCSIFADDR: File exists [ 135s] ----------------------------------------------------------------- [ 135s] I have the following modifications for osmo-mgw.spec: [ 135s] 21c21 [ 135s] < Release: 0 [ 135s] --- [ 135s] > Release: 1.1 [ 135s] ----------------------------------------------------------------- [ 135s] ----- building osmo-mgw.spec (user abuild) [ 135s] ----------------------------------------------------------------- [ 135s] ----------------------------------------------------------------- [ 135s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/CentOS_8/b5e44b379279f66d79935a4956dc6792-osmo-mgw' /home/abuild/rpmbuild/SOURCES/osmo-mgw.spec [ 135s] error: Bad source: /home/abuild/rpmbuild/SOURCES/osmo-mgw_1.8.1.tar.xz: No such file or directory [ 135s] ### VM INTERACTION START ### [ 137s] Powering off. [ 137s] [ 113.209923] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] obs-arm-9 failed "build osmo-mgw.spec" at Wed Feb 24 11:42:29 UTC 2021. [ 137s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 11:42:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:42:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <60363bb8822fc_d852b0a6e29c5f458936b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 112s] hostname-3.23-2.2 ######################################## [ 112s] attr-2.4.48-3.12 ######################################## [ 112s] build-mkbaselibs-20210120-1.2 ######################################## [ 113s] kernel-obs-build-5.10.16-1.1 ######################################## [ 117s] now finalizing build dir... [ 117s] ... running 01-add_abuild_user_to_trusted_group [ 117s] ... running 02-set_timezone_to_utc [ 117s] ... running 11-hack_uname_version_to_kernel_version [ 117s] RTNETLINK answers: File exists [ 117s] RTNETLINK answers: File exists [ 123s] ----------------------------------------------------------------- [ 123s] I have the following modifications for osmo-mgw.spec: [ 123s] 21c21 [ 123s] < Release: 0 [ 123s] --- [ 123s] > Release: 1.1 [ 123s] ----------------------------------------------------------------- [ 123s] ----- building osmo-mgw.spec (user abuild) [ 123s] ----------------------------------------------------------------- [ 123s] ----------------------------------------------------------------- [ 125s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Factory_ARM/b5e44b379279f66d79935a4956dc6792-osmo-mgw' /home/abuild/rpmbuild/SOURCES/osmo-mgw.spec [ 125s] error: Bad source: /home/abuild/rpmbuild/SOURCES/osmo-mgw_1.8.1.tar.xz: No such file or directory [ 125s] ### VM INTERACTION START ### [ 128s] [ 77.923670] sysrq: Power Off [ 128s] [ 77.939232] reboot: Power down [ 128s] ### VM INTERACTION END ### [ 129s] [ 129s] obs-arm-2 failed "build osmo-mgw.spec" at Wed Feb 24 11:42:19 UTC 2021. [ 129s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 11:42:48 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:42:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <60363bd719f08_d852b0a6e29c5f45894d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 36s] hostname-3.23-2.2 ######################################## [ 36s] attr-2.4.48-3.20 ######################################## [ 36s] build-mkbaselibs-20210120-1.2 ######################################## [ 37s] kernel-obs-build-5.10.16-1.3 ######################################## [ 37s] now finalizing build dir... [ 37s] ... running 01-add_abuild_user_to_trusted_group [ 37s] ... running 02-set_timezone_to_utc [ 37s] ... running 11-hack_uname_version_to_kernel_version [ 38s] RTNETLINK answers: File exists [ 38s] RTNETLINK answers: File exists [ 39s] ----------------------------------------------------------------- [ 39s] I have the following modifications for osmo-mgw.spec: [ 39s] 21c21 [ 39s] < Release: 0 [ 39s] --- [ 39s] > Release: 1.1 [ 39s] ----------------------------------------------------------------- [ 39s] ----- building osmo-mgw.spec (user abuild) [ 39s] ----------------------------------------------------------------- [ 39s] ----------------------------------------------------------------- [ 39s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/network:osmocom:nightly/openSUSE_Tumbleweed/b5e44b379279f66d79935a4956dc6792-osmo-mgw' /home/abuild/rpmbuild/SOURCES/osmo-mgw.spec [ 39s] error: Bad source: /home/abuild/rpmbuild/SOURCES/osmo-mgw_1.8.1.tar.xz: No such file or directory [ 39s] ### VM INTERACTION START ### [ 42s] [ 25.878130] sysrq: Power Off [ 42s] [ 25.881913] reboot: Power down [ 42s] ### VM INTERACTION END ### [ 42s] [ 42s] cloud121 failed "build osmo-mgw.spec" at Wed Feb 24 11:42:45 UTC 2021. [ 42s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 11:44:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 24 Feb 2021 11:44:37 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 24 Feb 2021 11:44:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 11:45:39 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:45:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <60363c725bdd5_d852b0a6e29c5f459058b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 82s] + export LC_ALL=C [ 82s] + LC_ALL=C [ 82s] + export LICENSEDIR [ 82s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.1-2.1.aarch64/usr/share/licenses/osmo-mgw [ 82s] + cp -pr COPYING /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.1-2.1.aarch64/usr/share/licenses/osmo-mgw [ 82s] + RPM_EC=0 [ 82s] ++ jobs -p [ 82s] + exit 0 [ 83s] Provides: config(osmo-mgw) = 1.8.1-2.1 osmo-mgw = 1.8.1-2.1 osmo-mgw(aarch-64) = 1.8.1-2.1 [ 83s] Requires(interp): /bin/sh /bin/sh /bin/sh /bin/sh [ 83s] Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 [ 83s] Requires(pre): /bin/sh systemd [ 83s] Requires(post): /bin/sh systemd [ 83s] Requires(preun): /bin/sh systemd [ 83s] Requires(postun): /bin/sh systemd [ 83s] Requires: ld-linux-aarch64.so.1()(64bit) ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.17)(64bit) libosmoabis.so.10()(64bit) libosmocore.so.17()(64bit) libosmoctrl.so.0()(64bit) libosmoctrl.so.0(LIBOSMOCTRL_1.0)(64bit) libosmogsm.so.16()(64bit) libosmogsm.so.16(LIBOSMOGSM_1.0)(64bit) libosmonetif.so.8()(64bit) libosmotrau.so.2()(64bit) libosmovty.so.9()(64bit) libpthread.so.0()(64bit) libpthread.so.0(GLIBC_2.17)(64bit) libtalloc.so.2()(64bit) libtalloc.so.2(TALLOC_2.0.2)(64bit) [ 83s] Processing files: libosmo-mgcp-client8-1.8.1-2.1.aarch64 [ 83s] error: File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.1-2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 83s] [ 83s] [ 83s] RPM build errors: [ 83s] File not found: /home/abuild/rpmbuild/BUILDROOT/osmo-mgw-1.8.1-2.1.aarch64/usr/lib64/libosmo-mgcp-client.so.6* [ 83s] ### VM INTERACTION START ### [ 86s] [ 70.848707] sysrq: Power Off [ 86s] [ 70.849867] reboot: Power down [ 86s] ### VM INTERACTION END ### [ 86s] [ 86s] obs-arm-8 failed "build osmo-mgw.spec" at Wed Feb 24 11:45:36 UTC 2021. [ 86s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 11:47:22 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 11:47:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <60363ce32d089_d852b0a6e29c5f45908b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-mgw failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 11:50:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 11:50:12 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Check configure.ac dependency versions match those i... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23088 ) Change subject: osmo-release.sh: Check configure.ac dependency versions match those in rpm *.spec.in ...................................................................... osmo-release.sh: Check configure.ac dependency versions match those in rpm *.spec.in Change-Id: I694f4055b39f91aaa0cf5997af67feefad99fdf5 --- M osmo-release.sh 1 file changed, 48 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/23088/1 diff --git a/osmo-release.sh b/osmo-release.sh index b63f981..52ccfeb 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -21,16 +21,19 @@ echo "$major" } -# Make sure that depedency requirement versions match in configure.ac vs debian/control. -#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," -check_configureac_debctrl_deps_match() { +get_configureac_pkg_check_modules_list() { if [ -f "${GIT_TOPDIR}/openbsc/configure.ac" ]; then configureac_file="openbsc/configure.ac" else configureac_file="configure.ac" fi - configureac_list=$(grep -e "PKG_CHECK_MODULES(" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d "[" | tr -d "]" | tr -d " " | sed "s/>=/ /g") - echo "$configureac_list" | \ + grep -e "PKG_CHECK_MODULES(" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d "[" | tr -d "]" | tr -d " " | sed "s/>=/ /g" +} + +# Make sure that depedency requirement versions match in configure.ac vs debian/control. +#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," +check_configureac_debctrl_deps_match() { + get_configureac_pkg_check_modules_list | \ { return_error=0 while read -r dep ver; do @@ -66,6 +69,45 @@ echo "OK: dependency specific versions in configure.ac and debian/control match" } +# Make sure that depedency requirement versions match in configure.ac vs contrib/*.spec.in. +#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "pkgconfig(libosmocore-dev) >= 1.0.0," +check_configureac_rpmspecin_deps_match() { + get_configureac_pkg_check_modules_list | \ + { return_error=0 + while read -r dep ver; do + + rpmspecin_match="$(grep -e "pkgconfig(${dep})" ${GIT_TOPDIR}/contrib/*.spec.in | grep BuildRequires | grep pkgconfig | grep ">=")" + rpmspecin_match_count="$(echo "$rpmspecin_match" | grep -c ">=")" + if [ "z$rpmspecin_match_count" != "z0" ]; then + #echo "Dependency <$dep, $ver> from configure.ac matched in contrib/*.spec.in! ($rpmspecin_match_count)" + if [ "z$rpmspecin_match_count" != "z1" ]; then + echo "WARN: configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!" + else # 1 match: + parsed_match=$(echo "$rpmspecin_match" | tr -d "(" | tr -d ")" | tr -d ":" | tr -d " " | tr -d "\t" | sed "s/BuildRequires//g" | sed "s/pkgconfig//g" |sed "s/>=/ /g") + rpmspecin_dep=$(echo "$parsed_match" | cut -d " " -f 1) + rpmspecin_ver=$(echo "$parsed_match" | cut -d " " -f 2) + if [ "z$dep" != "z$rpmspecin_dep" ] || [ "z$ver" != "z$rpmspecin_ver" ]; then + echo "ERROR: configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!" + return_error=1 + #else + # echo "OK: configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>" + fi + fi + fi + done + if [ $return_error -ne 0 ]; then + exit 1 + fi + } + + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + echo "ERROR: exiting due to previous errors" + exit 1 + fi + echo "OK: dependency specific versions in configure.ac and contrib/*.spec.in match" +} + # Make sure that patches under debian/patches/ apply: check_debian_patch_apply() { if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then @@ -102,6 +144,7 @@ echo "Releasing $VERSION -> $NEW_VER..." check_configureac_debctrl_deps_match +check_configureac_rpmspecin_deps_match check_debian_patch_apply if [ "z$LIBVERS" != "z" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I694f4055b39f91aaa0cf5997af67feefad99fdf5 Gerrit-Change-Number: 23088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 11:50:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 24 Feb 2021 11:50:31 +0000 Subject: Change in osmo-bsc[master]: remove obsolete dependency on libosmo-sccp In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23068 ) Change subject: remove obsolete dependency on libosmo-sccp ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Gerrit-Change-Number: 23068 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 11:50:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 12:21:05 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 12:21:05 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <603644bd7a312_d852b0a6e29c5f46014ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 116s] [COMPILING apps/dfu/main.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 116s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 116s] Memory region Used Size Region Size %age Used [ 116s] rom: 16580 B 16 KB 101.20% [ 116s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 116s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 116s] collect2: error: ld returned 1 exit status [ 116s] % [ 116s] make[2]: *** [Makefile:234: flash] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 116s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] dh_auto_build: error: make -j1 returned exit code 2 [ 116s] make: *** [debian/rules:16: build] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 120s] [ 109.614534] sysrq: Power Off [ 120s] [ 109.624559] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] sheep82 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 24 12:20:57 UTC 2021. [ 120s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 12:22:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 12:22:49 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Drop repeated DRY_RUN early exit References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23089 ) Change subject: osmo-release.sh: Drop repeated DRY_RUN early exit ...................................................................... osmo-release.sh: Drop repeated DRY_RUN early exit Change-Id: Ib45fa3f5f89e1f7321d6ceace1b9336e5416c38c --- M osmo-release.sh 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/23089/1 diff --git a/osmo-release.sh b/osmo-release.sh index 52ccfeb..ceb63b6 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -196,9 +196,6 @@ exit 1 fi fi - if [ "z$DRY_RUN" != "z0" ]; then - exit 0 - fi fi if [ "z$DRY_RUN" != "z0" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib45fa3f5f89e1f7321d6ceace1b9336e5416c38c Gerrit-Change-Number: 23089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 12:22:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 12:22:50 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Check LIBVERSION matches rpm *.spec.in References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23090 ) Change subject: osmo-release.sh: Check LIBVERSION matches rpm *.spec.in ...................................................................... osmo-release.sh: Check LIBVERSION matches rpm *.spec.in Change-Id: I7b8d56cc255167407370c888647255d8992f4202 --- M osmo-release.sh 1 file changed, 81 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/90/23090/1 diff --git a/osmo-release.sh b/osmo-release.sh index ceb63b6..173652d 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -9,10 +9,11 @@ ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" +ALLOW_NO_LIBVERSION_RPM_MATCH="${ALLOW_NO_LIBVERSION_RPM_MATCH:-0}" # Test stuff but don't modify stuff: DRY_RUN="${DRY_RUN:-0}" -libversion_to_deb_major() { +libversion_to_lib_major() { libversion="$1" current="$(echo "$libversion" | cut -d ":" -f 1)" #revision="$(echo "$libversion" | cut -d ":" -f 2)" @@ -124,6 +125,81 @@ done } +libversion_deb_match() { + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") + major="$(libversion_to_lib_major "$libversion")" + file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" + if [ "z$file_matches" = "z0" ]; then + echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" + exit 1 + elif [ "z$file_matches" = "z1" ]; then + echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" + fi + + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" + fi + + dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" + dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" + if [ "z$dhstrip_lib_total" != "z0" ]; then + if [ "z$dhstrip_lib_matches" = "z0" ] ; then + echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" + exit 1 + elif [ "z$dhstrip_lib_total" = "z1" ]; then + echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" + else + echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" + fi + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi +} + +libversion_rpmspecin_match() { + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") + major="$(libversion_to_lib_major "$libversion")" + + control_matches="$(grep -e "%files" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" + fi + + control_matches="$(grep -e "_libdir" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "/lib" | grep "so.$major" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi +} + + BUMPVER=`command -v bumpversion` GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -155,46 +231,10 @@ exit 1 fi if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then - echo "$LIBVERS" | while read -r line; do - libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") - major="$(libversion_to_deb_major "$libversion")" - file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" - if [ "z$file_matches" = "z0" ]; then - echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" - exit 1 - elif [ "z$file_matches" = "z1" ]; then - echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" - else - echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" - fi - - control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" - if [ "z$control_matches" = "z0" ]; then - echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" - exit 1 - elif [ "z$control_matches" = "z1" ]; then - echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" - else - echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" - fi - - dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" - dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" - if [ "z$dhstrip_lib_total" != "z0" ]; then - if [ "z$dhstrip_lib_matches" = "z0" ] ; then - echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" - exit 1 - elif [ "z$dhstrip_lib_total" = "z1" ]; then - echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" - else - echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" - fi - fi - done - # catch and forward exit from pipe subshell "while read": - if [ $? -ne 0 ]; then - exit 1 - fi + libversion_deb_match + fi + if [ "z$ALLOW_NO_LIBVERSION_RPM_MATCH" = "z0" ]; then + libversion_rpmspecin_match fi fi -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b8d56cc255167407370c888647255d8992f4202 Gerrit-Change-Number: 23090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 12:44:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Feb 2021 12:44:12 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt update before install wget References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23091 ) Change subject: repo-install-test: apt update before install wget ...................................................................... repo-install-test: apt update before install wget Fix errors caused by outdated package index: + apt install -y wget ... Err:2 http://security.debian.org/debian-security stretch/updates/main amd64 libssl1.1 amd64 1.1.0l-1~deb9u2 404 Not Found [IP: 151.101.130.132 80] Change-Id: I9d28967dc556e95eec2e3e3d7ff88533154acf3c --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/23091/1 diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index f05f01c..2ed78f6 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -110,6 +110,7 @@ # Add repository key if ! [ -e "$release_key" ]; then + apt-get update apt install -y wget wget -O "$release_key" "https://$obs_repo/Release.key" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d28967dc556e95eec2e3e3d7ff88533154acf3c Gerrit-Change-Number: 23091 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 12:44:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 24 Feb 2021 12:44:39 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt update before install wget In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23091 ) Change subject: repo-install-test: apt update before install wget ...................................................................... Patch Set 1: Verified+1 Fix failures from here: https://jenkins.osmocom.org/jenkins/job/Osmocom-repo-install-debian9/feed=latest,label=repo-install-test/32/console -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d28967dc556e95eec2e3e3d7ff88533154acf3c Gerrit-Change-Number: 23091 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 24 Feb 2021 12:44:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:07:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:07:33 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E33-4292-dirty_=E2=86=92_0=2E2=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/23092 ) Change subject: Bump version: 0.1.1.33-4292-dirty ? 0.2.0 ...................................................................... Bump version: 0.1.1.33-4292-dirty ? 0.2.0 Change-Id: I5353aee666d88e3d439e465dd06e34a9ea4d8b29 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-e1d1.install M src/Makefile.am 6 files changed, 49 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/92/23092/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 27e2d93..e69de29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +0,0 @@ -* bump protocol version as 'flags' member was added to osmo_d1dp_ts_config diff --git a/configure.ac b/configure.ac index a7e4952..6ecfe09 100644 --- a/configure.ac +++ b/configure.ac @@ -34,9 +34,9 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.1.120) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) -PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.5.0) PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 6ed3441..e9687ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +osmo-e1d (0.2.0) unstable; urgency=medium + + [ Harald Welte ] + * migrate to proper allocated USB Product ID + * add missing call to logging_vty_add_cmds() during startup + * usb.c: Fix error introducing Tx underflows + * Detect truncated reads on SOCK_SEQPACKET sockets + * print E1DP Mode as string, not in numeric format + * Use SOCK_STREAM sockets for E1_TS_MODE_RAW + * Fix HDLC-FCS transmit side + * _e1_rx_hdlcfs: const-ify input buffer argument + * introduce concept of superchannel to data structures + * actually implement the superchannel mode + * Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel + * cosmetic: create HDLC specific sub-structure within e1_ts + * implement buffering to chunks in E1->application direction + * add comment about first byte of E1DP_MAGIC + * make RAW read buffer size configurable (instead of hard-coded 160) + * usb: Don't pass negative length values to e1_line_demux_in() + * src/ctl.c: Log NOTICE messages whenever client send unexpected requests + * e1-prbs-test: Add support for osmo-e1d + * make sure a given timeslot can only be opened once (by default) + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * vpair: fix writing config file with vpairs configured + * usb: Increase number of transfers from 2 to 4 + * Add support for icE1usb interrupt endpoint error reporting + * Add per-line rate counter group to count various errors + * support for control endpoint requests to icE1usb to switch Rx/Tx mode + * e1_line.c: Split multiplex + demultiplex into separate mux_demux.c + * usb.c: Mark _e1_usb_open_device() as static + * move usb.c function declarations to newly-created usb.h + * Move e1d_find_intf + e1_intf_find_line to intf_line.c + * vty: export vty_e1d + move e1d_vty_node to header file + * Evaluate received E and A bits in TS0 + * Add new "osmo-e1gen" program. + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Wed, 24 Feb 2021 14:07:27 +0100 + osmo-e1d (0.1.1) unstable; urgency=medium * Makefile.am: Don't put LIBS into CFLAGS diff --git a/debian/control b/debian/control index 562e1df..1f35d65 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ libtool, pkg-config, python3-minimal, - libosmocore-dev, + libosmocore-dev (>= 1.5.0), libusb-1.0-0-dev, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-e1d.git Vcs-Browser: https://git.osmocom.org/osmo-e1d/ @@ -24,7 +24,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: osmo-e1d: Osmocom's E1 interface daemon -Package: libosmo-e1d0 +Package: libosmo-e1d1 Section: libs Architecture: any Multi-Arch: same @@ -37,6 +37,6 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends}, - libosmo-e1d0 (= ${binary:Version}), + libosmo-e1d1 (= ${binary:Version}), libosmocore-dev, Description: Development headers for the osmo-e1d library. diff --git a/debian/libosmo-e1d0.install b/debian/libosmo-e1d1.install similarity index 100% rename from debian/libosmo-e1d0.install rename to debian/libosmo-e1d1.install diff --git a/src/Makefile.am b/src/Makefile.am index d245bc6..74ade7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=1:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/23092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5353aee666d88e3d439e465dd06e34a9ea4d8b29 Gerrit-Change-Number: 23092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:15:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:15:53 +0000 Subject: Change in osmo-smlc[master]: gitignore: Ignore autofoo files *~ References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23093 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... gitignore: Ignore autofoo files *~ Change-Id: I97997a44e26e8fe9b98606e63aa6d5986d0d85f6 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/93/23093/1 diff --git a/.gitignore b/.gitignore index ba72477..f4c1cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ libtool ltmain.sh m4/*.m4 +*~ # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I97997a44e26e8fe9b98606e63aa6d5986d0d85f6 Gerrit-Change-Number: 23093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:29:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:29:23 +0000 Subject: Change in osmo-smlc[master]: main: Support setting cmdline --vty-ref-mode References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23094 ) Change subject: main: Support setting cmdline --vty-ref-mode ...................................................................... main: Support setting cmdline --vty-ref-mode Change-Id: Iadb004319514cb134b0863ea16b3289e6f1a097a --- M src/osmo-smlc/smlc_main.c 1 file changed, 29 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/94/23094/1 diff --git a/src/osmo-smlc/smlc_main.c b/src/osmo-smlc/smlc_main.c index 105ced3..3f24a42 100644 --- a/src/osmo-smlc/smlc_main.c +++ b/src/osmo-smlc/smlc_main.c @@ -78,6 +78,31 @@ printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + static void handle_options(int argc, char **argv) { while (1) { @@ -90,7 +115,8 @@ {"config-file", 1, 0, 'c'}, {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, - {"vty-ref-xml", 0, &long_option, 1}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; @@ -105,14 +131,8 @@ print_help(); exit(0); case 0: - switch (long_option) { - case 1: - vty_dump_xml_ref(stdout); - exit(0); - default: - fprintf(stderr, "error parsing cmdline options\n"); - exit(2); - } + handle_long_options(argv[0], long_option); + break; case 'd': log_parse_category_mask(osmo_stderr_target, optarg); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Iadb004319514cb134b0863ea16b3289e6f1a097a Gerrit-Change-Number: 23094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:29:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:29:24 +0000 Subject: Change in osmo-smlc[master]: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23095 ) Change subject: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API ...................................................................... smlc_subscr_test: Replace use of deprecated log_set_print_filename() API hex_category is also set explicitly to keep same results (old API used to set it internally). Change-Id: I49365dfcd24bed55101917d2ea034c4327ab51d6 --- M tests/smlc_subscr/smlc_subscr_test.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/95/23095/1 diff --git a/tests/smlc_subscr/smlc_subscr_test.c b/tests/smlc_subscr/smlc_subscr_test.c index 92b7293..2db19d2 100644 --- a/tests/smlc_subscr/smlc_subscr_test.c +++ b/tests/smlc_subscr/smlc_subscr_test.c @@ -140,10 +140,11 @@ void *ctx = talloc_named_const(NULL, 0, "smlc_subscr_test"); osmo_init_logging2(ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); g_smlc = smlc_state_alloc(ctx); @@ -154,4 +155,3 @@ printf("Done\n"); return 0; } - -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I49365dfcd24bed55101917d2ea034c4327ab51d6 Gerrit-Change-Number: 23095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:31:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:31:08 +0000 Subject: =?UTF-8?Q?Change_in_osmo-smlc=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E8-14c9-dirty_=E2=86=92_0=2E2=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23096 ) Change subject: Bump version: 0.1.0.8-14c9-dirty ? 0.2.0 ...................................................................... Bump version: 0.1.0.8-14c9-dirty ? 0.2.0 Change-Id: I67c0bde168c91f3d38cb228b4318321a70b68c3e --- M configure.ac M contrib/osmo-smlc.spec.in M debian/changelog M debian/control 4 files changed, 39 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/96/23096/1 diff --git a/configure.ac b/configure.ac index 186721b..e4b902b 100644 --- a/configure.ac +++ b/configure.ac @@ -39,12 +39,12 @@ AC_MSG_ERROR([Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.]) ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-smlc.spec.in b/contrib/osmo-smlc.spec.in index 657afc8..ffaef03 100644 --- a/contrib/osmo-smlc.spec.in +++ b/contrib/osmo-smlc.spec.in @@ -32,13 +32,13 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(talloc) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index e573404..73f17c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +osmo-smlc (0.2.0) unstable; urgency=medium + + [ Harald Welte ] + * contrib/jenkins.sh: Build libosmo-abis, a dependency of libosmo-netif + * fix build of usermanual + * update vty reference XML + * debian/spec: Add build depedency to autoconf-archive + * debian: the osmo-smlc example is not in the osmo-msc directory + * osmo-smlc.spec.in: Add dependency to autoconf-archive + * fix osmo-smlc.service: drop unknown '-s' command line argument + + [ Neels Hofmeyr ] + * initial working osmo-smlc implementation + * manual: describe TA-based positioning and cell locations + + [ Pau Espin Pedrol ] + * gitignore: Ignore autofoo files *~ + * main: Support setting cmdline --vty-ref-mode + * smlc_subscr_test: Replace use of deprecated log_set_print_filename() API + + -- Pau Espin Pedrol Wed, 24 Feb 2021 14:30:56 +0100 + osmo-smlc (0.0.1) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index 49a270d..c64b941 100644 --- a/debian/control +++ b/debian/control @@ -12,10 +12,10 @@ pkg-config, libsctp-dev, libtalloc-dev, - libosmocore-dev (>= 1.3.0), - libosmo-sccp-dev (>= 1.1.0), - libosmo-sigtran-dev (>= 1.1.0), - osmo-gsm-manuals-dev (>= 0.2.0) + libosmocore-dev (>= 1.5.0), + libosmo-sccp-dev (>= 1.4.0), + libosmo-sigtran-dev (>= 1.4.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-smlc.git Vcs-Browser: https://git.osmocom.org/osmo-smlc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I67c0bde168c91f3d38cb228b4318321a70b68c3e Gerrit-Change-Number: 23096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:44:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:44:37 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: -Code-Review I started doing the change, but I realized I actually prefer getting them removed completely. This allows quickly checking which tests have specific quirks for latest, and getting them removed when a new release is done, eg: grep -r \"latest\" So I'm removing them, if anyone needs to add new quirks, then it's easy to add the if or look it up in git history. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 13:44:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:47:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:47:58 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Patch Set 4: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 13:47:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 13:48:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 13:48:02 +0000 Subject: Change in osmo-pcu[master]: Support uplink multi-slot allocations In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23031 ) Change subject: Support uplink multi-slot allocations ...................................................................... Support uplink multi-slot allocations Before this patch, allocate_usf() was implemented to only allocate 1 USF per TBF, regardless of the available ul_slot mask. As a result, only 1 slot at max was allocated to any TBF. That's a pity because usual multislot classes like 12 support up to 2 UL slots per TBF (in common TS with DL). This patch reworks allocate_usf() to allocate as many UL multislots as possible (given mslot class, current USF availability, TFI availability, related DL TBF slots for the same MS, etc.). As a result, it can be seen that AllocTest results change substantially and maximum concurrent TBF allocation drops under some conditions. That happens due to more USFs being reserved (because each TBF has now more UL slots reserved). Hence now USF exhaustion becomes the usual limitation factor as per the number of concurrent TBFs than can be handled per TRX (as opposed to TFIs previously). Some of the biggest limitations in test appear though because really high end multislot classes are used, which can consume high volumes of UL slots (USFs), and which are probably not the most extended devices in the field. Moreover, in general the curren timeslot allocator for a given multislot class will in general try to optimize the DL side gathering most of the possible timeslots there. That means, for instance on ms class 12 (4 Tx, 4Rx, 5 Sum), 4 DL slots and 1 UL slot will still be selected. But in the case where only 3 PDCHs are available, then with this new multi-slot UL support a TBF will reserve 3 DL slots and 2 UL slots, while before this patch it would only taken 1 UL slot instead of 2. This USF exhaustion situation can be improved in the future by parametrizing (VTY command?) the maximum amount of UL slots that a TBF can reserve, making for instance a default value of 2, meaning usual classes can gather up 2 UL timelosts at a time while forbidding high-end hungry classes to gather up to 8 UL timeslots. Another approach would be to dynamically limit the amount of allowed reservable UL timeslots based on current USF reservation load. Related: OS#2282 Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 --- M src/gprs_rlcmac_ts_alloc.cpp M tests/alloc/AllocTest.cpp M tests/alloc/AllocTest.err M tests/alloc/AllocTest.ok 4 files changed, 7,595 insertions(+), 8,759 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97cc6e3b769511b591b1694549e0dac55227c43 Gerrit-Change-Number: 23031 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 13:56:48 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 13:56:48 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60365b3edac69_d852b0a6e29c5f4646549@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 110s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 111s] [COMPILING libboard/qmod/source/card_pres.c] [ 111s] [COMPILING libboard/qmod/source/wwan_led.c] [ 111s] [COMPILING libboard/qmod/source/i2c.c] [ 111s] [COMPILING libboard/qmod/source/board_qmod.c] [ 111s] [COMPILING apps/dfu/main.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 111s] Memory region Used Size Region Size %age Used [ 111s] rom: 16588 B 16 KB 101.25% [ 111s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 111s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 111s] collect2: error: ld returned 1 exit status [ 111s] % [ 111s] make[2]: *** [Makefile:234: flash] Error 1 [ 111s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 111s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 111s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 111s] dh_auto_build: error: make -j1 returned exit code 2 [ 111s] make: *** [debian/rules:16: build] Error 25 [ 111s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 111s] ### VM INTERACTION START ### [ 115s] [ 105.168535] sysrq: Power Off [ 115s] [ 105.173044] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] sheep86 failed "build simtrace2_0.7.0.70.657c.dsc" at Wed Feb 24 13:56:42 UTC 2021. [ 115s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Feb 24 14:19:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 24 Feb 2021 14:19:45 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: > Patch Set 1: -Code-Review > > I started doing the change, but I realized I actually prefer getting them removed completely. > > This allows quickly checking which tests have specific quirks for latest, and getting them removed when a new release is done, eg: grep -r \"latest\" You can still check whether a specific test suite has backwards compatibility quirks, depending on what the conditional block contains. I see no problem with that, so I am not convinced. Why would people need to resurrect something from the history if we can just keep it? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 14:19:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 14:48:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 14:48:08 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: -Code-Review > > > > I started doing the change, but I realized I actually prefer getting them removed completely. > > > > This allows quickly checking which tests have specific quirks for latest, and getting them removed when a new release is done, eg: grep -r \"latest\" > > You can still check whether a specific test suite has backwards compatibility quirks, depending on what the conditional block contains. I see no problem with that, so I am not convinced. Why would people need to resurrect something from the history if we can just keep it? You need to open each file to look at the contents of each if block then, or use a quite more advance grep command to check more stuff -> not handy. Morevoer, following your same reasoning: Why should we keep something if we can resurrect it from history when needed? That's what version controls are for. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 14:48:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 15:40:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 15:40:13 +0000 Subject: Change in osmo-gbproxy[master]: gitignore: Ignore autofoo files *~ References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/23097 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... gitignore: Ignore autofoo files *~ Change-Id: Ie70295259a0e807019755d5199450a6c9b64fffe --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/97/23097/1 diff --git a/.gitignore b/.gitignore index 0a1783c..64cebba 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ stamp-h1 libtool ltmain.sh +*~ # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/23097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie70295259a0e807019755d5199450a6c9b64fffe Gerrit-Change-Number: 23097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 15:44:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 15:44:53 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Properly rearrange var init and sanity checks References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23098 ) Change subject: osmo-release.sh: Properly rearrange var init and sanity checks ...................................................................... osmo-release.sh: Properly rearrange var init and sanity checks Change-Id: If62024fafcd30bc3399115248116e15e141b1cbb --- M osmo-release.sh 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/23098/1 diff --git a/osmo-release.sh b/osmo-release.sh index 173652d..eea17cf 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -201,21 +201,19 @@ BUMPVER=`command -v bumpversion` -GIT_TOPDIR="$(git rev-parse --show-toplevel)" -NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` -LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` -MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` -ISODATE=`date -I` - if [ "z$BUMPVER" = "z" ]; then echo Unable to find 'bumpversion' command. exit 1 fi - +NEW_VER=`$BUMPVER --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` if [ "z$NEW_VER" = "z" ]; then echo "Please fix versioning to match http://semver.org/ spec (current is $VERSION) before proceeding." exit 1 fi +GIT_TOPDIR="$(git rev-parse --show-toplevel)" +LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` +MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` +ISODATE=`date -I` echo "Releasing $VERSION -> $NEW_VER..." -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If62024fafcd30bc3399115248116e15e141b1cbb Gerrit-Change-Number: 23098 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 15:55:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 15:55:13 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gbproxy=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E21-b968-dirty_=E2=86=92_0=2E1=2E0?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/23099 ) Change subject: Bump version: 0.0.1.21-b968-dirty ? 0.1.0 ...................................................................... Bump version: 0.0.1.21-b968-dirty ? 0.1.0 Change-Id: Iaf4e2cc6cfc017f7e2e6b29068c00194fe9cd276 --- M TODO-RELEASE M configure.ac M contrib/osmo-gbproxy.spec.in M debian/changelog M debian/control 5 files changed, 45 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/99/23099/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 5514897..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +1 @@ #component what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -configure.ac libosmocore depend on next released libosmocore after 1.4.x with hashtable support -sgsn vty/config change the configuration of the vty config. old configuration are invalid. diff --git a/configure.ac b/configure.ac index 0a0897a..a4758b5 100644 --- a/configure.ac +++ b/configure.ac @@ -50,11 +50,11 @@ AC_SUBST(LIBRARY_DLSYM) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.5.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-gbproxy.spec.in b/contrib/osmo-gbproxy.spec.in index f7e7377..f1b5452 100644 --- a/contrib/osmo-gbproxy.spec.in +++ b/contrib/osmo-gbproxy.spec.in @@ -33,11 +33,11 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index 06a570e..c6702cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +osmo-gbproxy (1:0.1.0) unstable; urgency=medium + + [ Philipp Maier ] + * gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac + * gb_proxy: simplify raid data storage + * gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new + * gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc + * gb_proxy: extend TLV parser + * gb_proxy: add support for relaying BSSGP RIM messages + * gb_proxy: fix wrong usage of bssgp_rim_ri_name() + + [ Daniel Willmann ] + * gb_proxy_peer: Add Function to get gbproxy cell by cell id + * gbproxy_vty: Fix NRI VTY help MSC->SGSN + * gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc + * Various comment/whitespace changes + * Remove trailing whitespace + * gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse + * Remove unused log categories + * Move vty node into gbproxy_vty.c + * Add SDU length for an NSE (== BSSGP PDU size) + * gbproxy: Use bssgp2_enc_status when sending STATUS + + [ Pau Espin Pedrol ] + * Drop c-ares references + * debian/copyright: Drop osmo-sgsn.git leftover files from list + * gitignore: Ignore autofoo files *~ + + [ Oliver Smith ] + * d/changelog: set epoch=1 + + -- Pau Espin Pedrol Wed, 24 Feb 2021 16:54:13 +0100 + osmo-gbproxy (1:0.0.1) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index 520b4e9..cf70307 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ libtool, pkg-config, libtalloc-dev, - libosmocore-dev (>= 1.4.0), - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-gbproxy.git Vcs-Browser: https://git.osmocom.org/osmo-gbproxy -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/23099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Iaf4e2cc6cfc017f7e2e6b29068c00194fe9cd276 Gerrit-Change-Number: 23099 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:17:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:17:23 +0000 Subject: Change in osmo-gbproxy[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/23097 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/23097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie70295259a0e807019755d5199450a6c9b64fffe Gerrit-Change-Number: 23097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:17:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:17:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:17:29 +0000 Subject: Change in osmo-gbproxy[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/23097 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... gitignore: Ignore autofoo files *~ Change-Id: Ie70295259a0e807019755d5199450a6c9b64fffe --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 0a1783c..64cebba 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ stamp-h1 libtool ltmain.sh +*~ # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/23097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie70295259a0e807019755d5199450a6c9b64fffe Gerrit-Change-Number: 23097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:20:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:20:01 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gbproxy=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E21-b968-dirty_=E2=86=92_0=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/23099 ) Change subject: Bump version: 0.0.1.21-b968-dirty ? 0.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/23099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Iaf4e2cc6cfc017f7e2e6b29068c00194fe9cd276 Gerrit-Change-Number: 23099 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:20:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:20:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:20:04 +0000 Subject: =?UTF-8?Q?Change_in_osmo-gbproxy=5Bmaster=5D=3A_Bump_version=3A_0=2E0=2E1=2E21-b968-dirty_=E2=86=92_0=2E1=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/23099 ) Change subject: Bump version: 0.0.1.21-b968-dirty ? 0.1.0 ...................................................................... Bump version: 0.0.1.21-b968-dirty ? 0.1.0 Change-Id: Iaf4e2cc6cfc017f7e2e6b29068c00194fe9cd276 --- M TODO-RELEASE M configure.ac M contrib/osmo-gbproxy.spec.in M debian/changelog M debian/control 5 files changed, 45 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 5514897..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,4 +1 @@ #component what description / commit summary line -manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 -configure.ac libosmocore depend on next released libosmocore after 1.4.x with hashtable support -sgsn vty/config change the configuration of the vty config. old configuration are invalid. diff --git a/configure.ac b/configure.ac index 0a0897a..a4758b5 100644 --- a/configure.ac +++ b/configure.ac @@ -50,11 +50,11 @@ AC_SUBST(LIBRARY_DLSYM) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.5.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-gbproxy.spec.in b/contrib/osmo-gbproxy.spec.in index f7e7377..f1b5452 100644 --- a/contrib/osmo-gbproxy.spec.in +++ b/contrib/osmo-gbproxy.spec.in @@ -33,11 +33,11 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogb) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 %{?systemd_requires} %description diff --git a/debian/changelog b/debian/changelog index 06a570e..c6702cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +osmo-gbproxy (1:0.1.0) unstable; urgency=medium + + [ Philipp Maier ] + * gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac + * gb_proxy: simplify raid data storage + * gb_proxy_peer: Remove unused function gbproxy_cell_by_bvci_or_new + * gb_proxy_peer: Require ra_id and cid in gbproxy_cell_alloc + * gb_proxy: extend TLV parser + * gb_proxy: add support for relaying BSSGP RIM messages + * gb_proxy: fix wrong usage of bssgp_rim_ri_name() + + [ Daniel Willmann ] + * gb_proxy_peer: Add Function to get gbproxy cell by cell id + * gbproxy_vty: Fix NRI VTY help MSC->SGSN + * gbproxy_vty: Fix NRI overlap behaviour to match osmo-bsc + * Various comment/whitespace changes + * Remove trailing whitespace + * gbproxy: Use bssgp2_nsi_tx_ptp in gbprox_relay2nse + * Remove unused log categories + * Move vty node into gbproxy_vty.c + * Add SDU length for an NSE (== BSSGP PDU size) + * gbproxy: Use bssgp2_enc_status when sending STATUS + + [ Pau Espin Pedrol ] + * Drop c-ares references + * debian/copyright: Drop osmo-sgsn.git leftover files from list + * gitignore: Ignore autofoo files *~ + + [ Oliver Smith ] + * d/changelog: set epoch=1 + + -- Pau Espin Pedrol Wed, 24 Feb 2021 16:54:13 +0100 + osmo-gbproxy (1:0.0.1) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index 520b4e9..cf70307 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ libtool, pkg-config, libtalloc-dev, - libosmocore-dev (>= 1.4.0), - osmo-gsm-manuals-dev + libosmocore-dev (>= 1.5.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-gbproxy.git Vcs-Browser: https://git.osmocom.org/osmo-gbproxy -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/23099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Iaf4e2cc6cfc017f7e2e6b29068c00194fe9cd276 Gerrit-Change-Number: 23099 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:21:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:21:59 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E33-4292-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/23092 ) Change subject: Bump version: 0.1.1.33-4292-dirty ? 0.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/23092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5353aee666d88e3d439e465dd06e34a9ea4d8b29 Gerrit-Change-Number: 23092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:21:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:22:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:22:01 +0000 Subject: =?UTF-8?Q?Change_in_osmo-e1d=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E33-4292-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/23092 ) Change subject: Bump version: 0.1.1.33-4292-dirty ? 0.2.0 ...................................................................... Bump version: 0.1.1.33-4292-dirty ? 0.2.0 Change-Id: I5353aee666d88e3d439e465dd06e34a9ea4d8b29 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-e1d1.install M src/Makefile.am 6 files changed, 49 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 27e2d93..e69de29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +0,0 @@ -* bump protocol version as 'flags' member was added to osmo_d1dp_ts_config diff --git a/configure.ac b/configure.ac index a7e4952..6ecfe09 100644 --- a/configure.ac +++ b/configure.ac @@ -34,9 +34,9 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.1.120) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) -PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.5.0) PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 6ed3441..e9687ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +osmo-e1d (0.2.0) unstable; urgency=medium + + [ Harald Welte ] + * migrate to proper allocated USB Product ID + * add missing call to logging_vty_add_cmds() during startup + * usb.c: Fix error introducing Tx underflows + * Detect truncated reads on SOCK_SEQPACKET sockets + * print E1DP Mode as string, not in numeric format + * Use SOCK_STREAM sockets for E1_TS_MODE_RAW + * Fix HDLC-FCS transmit side + * _e1_rx_hdlcfs: const-ify input buffer argument + * introduce concept of superchannel to data structures + * actually implement the superchannel mode + * Add new E1DP_CMD_LINE_CONFIG for switching channelized/superchannel + * cosmetic: create HDLC specific sub-structure within e1_ts + * implement buffering to chunks in E1->application direction + * add comment about first byte of E1DP_MAGIC + * make RAW read buffer size configurable (instead of hard-coded 160) + * usb: Don't pass negative length values to e1_line_demux_in() + * src/ctl.c: Log NOTICE messages whenever client send unexpected requests + * e1-prbs-test: Add support for osmo-e1d + * make sure a given timeslot can only be opened once (by default) + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * vpair: fix writing config file with vpairs configured + * usb: Increase number of transfers from 2 to 4 + * Add support for icE1usb interrupt endpoint error reporting + * Add per-line rate counter group to count various errors + * support for control endpoint requests to icE1usb to switch Rx/Tx mode + * e1_line.c: Split multiplex + demultiplex into separate mux_demux.c + * usb.c: Mark _e1_usb_open_device() as static + * move usb.c function declarations to newly-created usb.h + * Move e1d_find_intf + e1_intf_find_line to intf_line.c + * vty: export vty_e1d + move e1d_vty_node to header file + * Evaluate received E and A bits in TS0 + * Add new "osmo-e1gen" program. + + [ Oliver Smith ] + * configure.ac: set -std=gnu11 + + -- Pau Espin Pedrol Wed, 24 Feb 2021 14:07:27 +0100 + osmo-e1d (0.1.1) unstable; urgency=medium * Makefile.am: Don't put LIBS into CFLAGS diff --git a/debian/control b/debian/control index 562e1df..1f35d65 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ libtool, pkg-config, python3-minimal, - libosmocore-dev, + libosmocore-dev (>= 1.5.0), libusb-1.0-0-dev, - osmo-gsm-manuals-dev + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-e1d.git Vcs-Browser: https://git.osmocom.org/osmo-e1d/ @@ -24,7 +24,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: osmo-e1d: Osmocom's E1 interface daemon -Package: libosmo-e1d0 +Package: libosmo-e1d1 Section: libs Architecture: any Multi-Arch: same @@ -37,6 +37,6 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends}, - libosmo-e1d0 (= ${binary:Version}), + libosmo-e1d1 (= ${binary:Version}), libosmocore-dev, Description: Development headers for the osmo-e1d library. diff --git a/debian/libosmo-e1d0.install b/debian/libosmo-e1d1.install similarity index 100% rename from debian/libosmo-e1d0.install rename to debian/libosmo-e1d1.install diff --git a/src/Makefile.am b/src/Makefile.am index d245bc6..74ade7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=1:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/23092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I5353aee666d88e3d439e465dd06e34a9ea4d8b29 Gerrit-Change-Number: 23092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:43:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:43:48 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202102) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/23100 ) Change subject: Update Osmocom recipes to latest tags (release 202102) ...................................................................... Update Osmocom recipes to latest tags (release 202102) Change-Id: I1134998ca9d20c5f204b4770fa6bf18497a54402 --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb 16 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/00/23100/1 diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 9da4f54..c5394b3 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "d2704da4cb3efdf241d2cde037688badaef53f9a" -SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.14.0+gitr${SRCPV}" +SRCREV = "1.14.1" +SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.14.1+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 879a22f..9d3fd37 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "19205a38c34175f4fb4d1d06e77f1d3e4a39c651" -SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.32+gitr${SRCPV}" +SRCREV = "0.9.33" +SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "0.9.33+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 446a590..16124d8 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.0.1" +SRCREV = "1.1.1" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.0.1+gitr${SRCPV}" +PV = "1.1.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 0f2856e..09d6c72 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f3ccbecb6f802ccd98d154dc7ba7d552e298b2ea" -SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "1.0.0+gitr${SRCPV}" +SRCREV = "1.1.0" +SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.1.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index c78477c..62bd9e8 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "37880b696ee90dead7e3b1292b109cc041a44e52" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +SRCREV = "1.4.0" +SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 205da74..9717511 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "34b328b6d040d31017269f7558cf9354bdeea8dd" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.4.2+gitr${SRCPV}" +SRCREV = "1.5.1" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.5.1+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 98318a4..af3e726 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.3.2+gitr${SRCPV}" +PV = "1.4.0+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898" +SRCREV = "a1c1a313e574748bf802eccd93a18fba42a8aa3a" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index dce2ef1..73a5de3 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.6.1" +SRCREV = "1.7.0" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.6.1+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index a854384..be12988 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "2154607fb06c9e4d1a286f40c756cdb4f792efdf" -SRC_URI = "git://git.osmocom.org/osmo-ggsn \ +SRCREV = "1.7.1" +SRC_URI = "git://git.osmocom.org/osmo-ggsn;protocol=git;tag=${SRCREV};nobranch=1 \ file://libgtp-queue_depth_32.patch \ " -PV = "1.6.0+gitr${SRCPV}" +PV = "1.7.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index 0676f09..3a0b446 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.2.1" +SRCREV = "1.3.0" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.2.1+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index 5cd2d3f..a9104ce 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.0.0" +SRCREV = "0.7.0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git;tag=${SRCREV};nobranch=1" PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 14dd5c1..528295b 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "ec45068972b85c6ace5483c5f533dae8e7975d41" -SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.7.0+gitr${SRCPV}" +SRCREV = "1.8.1" +SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.8.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 79aa0c3..a279ad2 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.6.3" +SRCREV = "1.7.0" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.6.3+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index dd25b50..02c5e35 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d8368cebf8ca159c38027e4cb9109f9f0bcd0a46" -SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.2+gitr${SRCPV}" +SRCREV = "0.1.3" +SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "0.1.3+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index d65c5f3..cb8a7ae 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.6.2" +SRCREV = "1.7.0" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.6.2+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index e847489..016781b 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "79d76480ac0187993c05b2c682e120f6e0e8bbb8" -SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.4.1+gitr${SRCPV}" +SRCREV = "1.5.0" +SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1134998ca9d20c5f204b4770fa6bf18497a54402 Gerrit-Change-Number: 23100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:43:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:43:49 +0000 Subject: Change in meta-telephony[201705]: Import libmnl recipe from poky References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/23101 ) Change subject: Import libmnl recipe from poky ...................................................................... Import libmnl recipe from poky meta-telephony is based on old poky version "pyro", which doesn't include yet libmnl. Hence, libmnl from current poky master (7d7197b28226a9ab39babf5be5c4aa92473a2e60) is imported here. Change-Id: I74a793de3a323fff08c2648259e6b19651541f16 --- A recipes-extended/libmnl/libmnl_1.0.4.bb 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/01/23101/1 diff --git a/recipes-extended/libmnl/libmnl_1.0.4.bb b/recipes-extended/libmnl/libmnl_1.0.4.bb new file mode 100644 index 0000000..b55bb31 --- /dev/null +++ b/recipes-extended/libmnl/libmnl_1.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Minimalistic user-space Netlink utility library" +DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \ + functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs." +HOMEPAGE = "https://www.netfilter.org/projects/libmnl/index.html" +SECTION = "libs" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" +SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d" +SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74a793de3a323fff08c2648259e6b19651541f16 Gerrit-Change-Number: 23101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:43:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:43:49 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add dependency for libmnl References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/23102 ) Change subject: libosmocore: Add dependency for libmnl ...................................................................... libosmocore: Add dependency for libmnl Since libosmocore.git 53a2fde368d0161a38bc096d121ef61a9afbbe94, libosmocore depends by default on libmnl. Let's make sure to depend on it in the recipe to avoid recipe build breakage. Change-Id: I62221706b010766af5eed77a08693e877a197c7f --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/02/23102/1 diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 40a42bc..ed1caa0 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -12,9 +12,11 @@ gnutls \ libusb \ libsctp \ + libmnl \ " PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," +PACKAGECONFIG[libmnl] = "--enable-libmnl,--disable-libmnl,libmnl," inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I62221706b010766af5eed77a08693e877a197c7f Gerrit-Change-Number: 23102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:43:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:43:50 +0000 Subject: Change in meta-telephony[201705]: Adjust to osmo-gbproxy split from osmo-sgsn References: Message-ID: Hello osmith, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/meta-telephony/+/23103 to review the following change. Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Adjust to osmo-gbproxy split from osmo-sgsn Related: OS#4992 Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 --- A recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc A recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 3 files changed, 28 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/03/23103/1 diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc new file mode 100644 index 0000000..1add0b9 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Osmocom's Gb interface aggregation/conversion proxy" +HOMEPAGE = "https://osmocom.org/projects/osmo-gbproxy" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" + +CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb new file mode 100644 index 0000000..19e6b99 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "0.1.0" +SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "0.1.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 57ab845..1f6fd7a 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -16,25 +16,17 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" +PACKAGES =+ "osmo-gtphub-doc osmo-gtphub" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" -SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -FILES_osmo-gbproxy = " \ - ${bindir}/osmo-gbproxy \ - ${sysconfdir}/osmocom/osmo-gbproxy.cfg \ - " -CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" - FILES_osmo-gtphub = " \ ${bindir}/osmo-gtphub \ ${sysconfdir}/osmocom/osmo-gtphub.cfg \ " CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg" -FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy " FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub " -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 23103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:01 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202102) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23100 ) Change subject: Update Osmocom recipes to latest tags (release 202102) ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1134998ca9d20c5f204b4770fa6bf18497a54402 Gerrit-Change-Number: 23100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:46:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:05 +0000 Subject: Change in meta-telephony[201705]: Import libmnl recipe from poky In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23101 ) Change subject: Import libmnl recipe from poky ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74a793de3a323fff08c2648259e6b19651541f16 Gerrit-Change-Number: 23101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:46:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:09 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add dependency for libmnl In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23102 ) Change subject: libosmocore: Add dependency for libmnl ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I62221706b010766af5eed77a08693e877a197c7f Gerrit-Change-Number: 23102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:46:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:15 +0000 Subject: Change in meta-telephony[201705]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23103 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 23103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Feb 2021 17:46:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:17 +0000 Subject: Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202102) In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23100 ) Change subject: Update Osmocom recipes to latest tags (release 202102) ...................................................................... Update Osmocom recipes to latest tags (release 202102) Change-Id: I1134998ca9d20c5f204b4770fa6bf18497a54402 --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb 16 files changed, 41 insertions(+), 41 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 9da4f54..c5394b3 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "d2704da4cb3efdf241d2cde037688badaef53f9a" -SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.14.0+gitr${SRCPV}" +SRCREV = "1.14.1" +SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.14.1+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index 879a22f..9d3fd37 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "19205a38c34175f4fb4d1d06e77f1d3e4a39c651" -SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.32+gitr${SRCPV}" +SRCREV = "0.9.33" +SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "0.9.33+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 446a590..16124d8 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.0.1" +SRCREV = "1.1.1" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.0.1+gitr${SRCPV}" +PV = "1.1.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 0f2856e..09d6c72 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "f3ccbecb6f802ccd98d154dc7ba7d552e298b2ea" -SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "1.0.0+gitr${SRCPV}" +SRCREV = "1.1.0" +SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.1.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index c78477c..62bd9e8 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "37880b696ee90dead7e3b1292b109cc041a44e52" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "1.3.0+gitr${SRCPV}" +SRCREV = "1.4.0" +SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.4.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 205da74..9717511 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "34b328b6d040d31017269f7558cf9354bdeea8dd" -SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "1.4.2+gitr${SRCPV}" +SRCREV = "1.5.1" +SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.5.1+gitr${SRCPV}" PR = "${INC_PR}.0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen osmo-config-merge" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 98318a4..af3e726 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.3.2+gitr${SRCPV}" +PV = "1.4.0+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898" +SRCREV = "a1c1a313e574748bf802eccd93a18fba42a8aa3a" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index dce2ef1..73a5de3 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.6.1" +SRCREV = "1.7.0" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.6.1+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index a854384..be12988 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "2154607fb06c9e4d1a286f40c756cdb4f792efdf" -SRC_URI = "git://git.osmocom.org/osmo-ggsn \ +SRCREV = "1.7.1" +SRC_URI = "git://git.osmocom.org/osmo-ggsn;protocol=git;tag=${SRCREV};nobranch=1 \ file://libgtp-queue_depth_32.patch \ " -PV = "1.6.0+gitr${SRCPV}" +PV = "1.7.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index 0676f09..3a0b446 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.2.1" +SRCREV = "1.3.0" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.2.1+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index 5cd2d3f..a9104ce 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.0.0" +SRCREV = "0.7.0" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git;tag=${SRCREV};nobranch=1" PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 14dd5c1..528295b 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "ec45068972b85c6ace5483c5f533dae8e7975d41" -SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.7.0+gitr${SRCPV}" +SRCREV = "1.8.1" +SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.8.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 79aa0c3..a279ad2 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.6.3" +SRCREV = "1.7.0" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.6.3+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb index dd25b50..02c5e35 100644 --- a/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb +++ b/recipes-osmocom/osmo-pcap/osmo-pcap_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "d8368cebf8ca159c38027e4cb9109f9f0bcd0a46" -SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git" -PV = "0.1.2+gitr${SRCPV}" +SRCREV = "0.1.3" +SRC_URI = "git://git.osmocom.org/osmo-pcap.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "0.1.3+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index d65c5f3..cb8a7ae 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.6.2" +SRCREV = "1.7.0" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git;tag=${SRCREV};nobranch=1" -PV = "1.6.2+gitr${SRCPV}" +PV = "1.7.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index e847489..016781b 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "79d76480ac0187993c05b2c682e120f6e0e8bbb8" -SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.4.1+gitr${SRCPV}" +SRCREV = "1.5.0" +SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "1.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I1134998ca9d20c5f204b4770fa6bf18497a54402 Gerrit-Change-Number: 23100 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:17 +0000 Subject: Change in meta-telephony[201705]: Import libmnl recipe from poky In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23101 ) Change subject: Import libmnl recipe from poky ...................................................................... Import libmnl recipe from poky meta-telephony is based on old poky version "pyro", which doesn't include yet libmnl. Hence, libmnl from current poky master (7d7197b28226a9ab39babf5be5c4aa92473a2e60) is imported here. Change-Id: I74a793de3a323fff08c2648259e6b19651541f16 --- A recipes-extended/libmnl/libmnl_1.0.4.bb 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-extended/libmnl/libmnl_1.0.4.bb b/recipes-extended/libmnl/libmnl_1.0.4.bb new file mode 100644 index 0000000..b55bb31 --- /dev/null +++ b/recipes-extended/libmnl/libmnl_1.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Minimalistic user-space Netlink utility library" +DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \ + functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs." +HOMEPAGE = "https://www.netfilter.org/projects/libmnl/index.html" +SECTION = "libs" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "https://netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" +SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d" +SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74a793de3a323fff08c2648259e6b19651541f16 Gerrit-Change-Number: 23101 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:18 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Add dependency for libmnl In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23102 ) Change subject: libosmocore: Add dependency for libmnl ...................................................................... libosmocore: Add dependency for libmnl Since libosmocore.git 53a2fde368d0161a38bc096d121ef61a9afbbe94, libosmocore depends by default on libmnl. Let's make sure to depend on it in the recipe to avoid recipe build breakage. Change-Id: I62221706b010766af5eed77a08693e877a197c7f --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 40a42bc..ed1caa0 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -12,9 +12,11 @@ gnutls \ libusb \ libsctp \ + libmnl \ " PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," +PACKAGECONFIG[libmnl] = "--enable-libmnl,--disable-libmnl,libmnl," inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I62221706b010766af5eed77a08693e877a197c7f Gerrit-Change-Number: 23102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 17:46:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 17:46:18 +0000 Subject: Change in meta-telephony[201705]: Adjust to osmo-gbproxy split from osmo-sgsn In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/23103 ) Change subject: Adjust to osmo-gbproxy split from osmo-sgsn ...................................................................... Adjust to osmo-gbproxy split from osmo-sgsn Related: OS#4992 Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 --- A recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc A recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc 3 files changed, 28 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc new file mode 100644 index 0000000..1add0b9 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Osmocom's Gb interface aggregation/conversion proxy" +HOMEPAGE = "https://osmocom.org/projects/osmo-gbproxy" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +DEPENDS = "libosmocore" + +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + " +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" + +SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" + +CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" diff --git a/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb new file mode 100644 index 0000000..19e6b99 --- /dev/null +++ b/recipes-osmocom/osmo-gbproxy/osmo-gbproxy_git.bb @@ -0,0 +1,7 @@ +require ${PN}.inc + +S = "${WORKDIR}/git" +SRCREV = "0.1.0" +SRC_URI = "git://git.osmocom.org/osmo-gbproxy.git;protocol=git;tag=${SRCREV};nobranch=1" +PV = "0.1.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 57ab845..1f6fd7a 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -16,25 +16,17 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir" PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c libosmo-sccp osmo-iuh," -PACKAGES =+ "osmo-gbproxy-doc osmo-gtphub-doc osmo-gbproxy osmo-gtphub" -SYSTEMD_PACKAGES = "osmo-sgsn osmo-gbproxy osmo-gtphub" +PACKAGES =+ "osmo-gtphub-doc osmo-gtphub" +SYSTEMD_PACKAGES = "osmo-sgsn osmo-gtphub" SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service" -SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service" SYSTEMD_SERVICE_osmo-gtphub = "osmo-gtphub.service" CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg" -FILES_osmo-gbproxy = " \ - ${bindir}/osmo-gbproxy \ - ${sysconfdir}/osmocom/osmo-gbproxy.cfg \ - " -CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg" - FILES_osmo-gtphub = " \ ${bindir}/osmo-gtphub \ ${sysconfdir}/osmocom/osmo-gtphub.cfg \ " CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg" -FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy " FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub " -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/23103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I146d2a3600232a8b9eed05d0c3674d2416befd29 Gerrit-Change-Number: 23103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Feb 24 18:20:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 24 Feb 2021 18:20:42 +0000 Subject: Change in libosmocore[master]: tests/gb: Fix printf format errors on ARM 32 bits References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23104 ) Change subject: tests/gb: Fix printf format errors on ARM 32 bits ...................................................................... tests/gb: Fix printf format errors on ARM 32 bits Seen building on RPI4 32 bits raspbian: error: format ?%lu? expects argument of type ?long unsigned int?, but argument 2 has type ?size_t? {aka ?unsigned int?} [-Werror=format=] Change-Id: I62199bfc7f3a78403334f5580f31fa5743223c9b --- M tests/gb/gprs_bssgp_rim_test.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/23104/1 diff --git a/tests/gb/gprs_bssgp_rim_test.c b/tests/gb/gprs_bssgp_rim_test.c index d08421b..e2d4f66 100644 --- a/tests/gb/gprs_bssgp_rim_test.c +++ b/tests/gb/gprs_bssgp_rim_test.c @@ -190,7 +190,7 @@ if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } @@ -272,7 +272,7 @@ printf(" macc_cause = %02x\n", app_cont->nacc_cause); if (app_cont->err_app_cont) { printf(" err_app_cont: %s\n", osmo_hexdump_nospc(app_cont->err_app_cont, app_cont->err_app_cont_len)); - printf(" err_app_cont_len: %lu\n", app_cont->err_app_cont_len); + printf(" err_app_cont_len: %zu\n", app_cont->err_app_cont_len); } } @@ -317,7 +317,7 @@ if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } @@ -454,7 +454,7 @@ if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } @@ -504,12 +504,12 @@ printf(" prot_ver = %u\n", rim_cont->prot_ver); if (rim_cont->err_pdu) { printf(" err_pdu: %s\n", osmo_hexdump_nospc(rim_cont->err_pdu, rim_cont->err_pdu_len)); - printf(" err_pdu_len: %lu\n", rim_cont->err_pdu_len); + printf(" err_pdu_len: %zu\n", rim_cont->err_pdu_len); } if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62199bfc7f3a78403334f5580f31fa5743223c9b Gerrit-Change-Number: 23104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed Feb 24 19:38:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 19:38:31 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6036ab5e17969_d852b0a6e29c5f4743637@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_8.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 173s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 173s] | [ 173s] | configure: exit 0 [ 173s] [ 173s] # -*- compilation -*- [ 173s] 4. testsuite.at:23: testing db ... [ 173s] ./testsuite.at:28: $abs_top_builddir/tests/db/db_test [ 173s] --- experr 2021-02-24 19:38:22.284000000 +0000 [ 173s] +++ /usr/src/packages/BUILD/openbsc/tests/testsuite.dir/at-groups/4/stderr 2021-02-24 19:38:22.316000000 +0000 [ 173s] @@ -1,3 +1,2 @@ [ 173s] Going to migrate from revision 3 [ 173s] -Going to migrate from revision 4 [ 173s] - [ 173s] \ No newline at end of file [ 173s] +Going to migrate from revision 4 [ 173s] 4. testsuite.at:23: 4. db (testsuite.at:23): FAILED (testsuite.at:28) [ 173s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 173s] make[1]: *** [override_dh_auto_test] Error 1 [ 174s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 174s] debian/rules:13: recipe for target 'build' failed [ 174s] make: *** [build] Error 2 [ 174s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 174s] ### VM INTERACTION START ### [ 175s] Powering off. [ 175s] [ 159.325045] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb01 failed "build openbsc_1.3.2.dsc" at Wed Feb 24 19:38:27 UTC 2021. [ 175s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed Feb 24 19:58:31 2021 From: admin at opensuse.org (OBS Notification) Date: Wed, 24 Feb 2021 19:58:31 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6036aff7733e7_d852b0a6e29c5f475026b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 131s] | #define HAVE_STRING_H 1 [ 131s] | #define HAVE_MEMORY_H 1 [ 131s] | #define HAVE_STRINGS_H 1 [ 131s] | #define HAVE_INTTYPES_H 1 [ 131s] | #define HAVE_STDINT_H 1 [ 131s] | #define HAVE_UNISTD_H 1 [ 131s] | #define HAVE_DLFCN_H 1 [ 131s] | #define LT_OBJDIR ".libs/" [ 131s] | #define BUILD_SMPP 1 [ 131s] | #define STDC_HEADERS 1 [ 131s] | #define HAVE_DBI_DBD_H 1 [ 131s] | #define HAVE_PCAP_PCAP_H 1 [ 131s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 131s] | [ 131s] | configure: exit 0 [ 131s] [ 131s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 131s] make[1]: *** [override_dh_auto_test] Error 1 [ 131s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 131s] debian/rules:13: recipe for target 'build' failed [ 131s] make: *** [build] Error 2 [ 131s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 131s] ### VM INTERACTION START ### [ 133s] [ 123.925304] sysrq: Power Off [ 133s] [ 123.932626] reboot: Power down [ 133s] ### VM INTERACTION END ### [ 133s] [ 133s] lamb28 failed "build openbsc_1.3.2.dsc" at Wed Feb 24 19:58:22 UTC 2021. [ 133s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 25 02:39:52 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 25 Feb 2021 02:39:52 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <60370e1179d1f_d852b0a6e29c5f48305a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 160s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 160s] [COMPILING libboard/qmod/source/card_pres.c] [ 160s] [COMPILING libboard/qmod/source/wwan_led.c] [ 161s] [COMPILING libboard/qmod/source/i2c.c] [ 161s] [COMPILING libboard/qmod/source/board_qmod.c] [ 161s] [COMPILING apps/dfu/main.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 162s] Memory region Used Size Region Size %age Used [ 162s] rom: 16588 B 16 KB 101.25% [ 162s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 162s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 162s] collect2: error: ld returned 1 exit status [ 162s] % [ 162s] make[2]: *** [Makefile:234: flash] Error 1 [ 162s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 162s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] dh_auto_build: error: make -j1 returned exit code 2 [ 162s] make: *** [debian/rules:16: build] Error 25 [ 162s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 162s] ### VM INTERACTION START ### [ 165s] [ 153.983952] sysrq: Power Off [ 165s] [ 153.992391] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] lamb56 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 25 02:39:39 UTC 2021. [ 165s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Feb 25 02:43:01 2021 From: admin at opensuse.org (OBS Notification) Date: Thu, 25 Feb 2021 02:43:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60370ec63efd9_d852b0a6e29c5f4831328@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 404s] [COMPILING apps/dfu/main.c] [ 405s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 405s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 405s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 406s] Memory region Used Size Region Size %age Used [ 406s] rom: 16580 B 16 KB 101.20% [ 406s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 406s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 406s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 406s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 406s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 406s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 406s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 406s] collect2: error: ld returned 1 exit status [ 406s] % [ 406s] make[2]: *** [Makefile:234: flash] Error 1 [ 406s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 406s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 406s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 406s] dh_auto_build: error: make -j1 returned exit code 2 [ 406s] make: *** [debian/rules:16: build] Error 25 [ 406s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 406s] ### VM INTERACTION START ### [ 409s] [ 380.942828] sysrq: Power Off [ 409s] [ 381.099085] reboot: Power down [ 410s] ### VM INTERACTION END ### [ 410s] [ 410s] lamb01 failed "build simtrace2_0.7.0.70.657c.dsc" at Thu Feb 25 02:42:54 UTC 2021. [ 410s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Feb 25 09:40:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 09:40:04 +0000 Subject: Change in libosmocore[master]: tests/gb: Fix printf format errors on ARM 32 bits In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23104 ) Change subject: tests/gb: Fix printf format errors on ARM 32 bits ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62199bfc7f3a78403334f5580f31fa5743223c9b Gerrit-Change-Number: 23104 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 09:40:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:12 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Check configure.ac dependency versions match those i... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23088 ) Change subject: osmo-release.sh: Check configure.ac dependency versions match those in rpm *.spec.in ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I694f4055b39f91aaa0cf5997af67feefad99fdf5 Gerrit-Change-Number: 23088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 10:40:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:14 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Drop repeated DRY_RUN early exit In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23089 ) Change subject: osmo-release.sh: Drop repeated DRY_RUN early exit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib45fa3f5f89e1f7321d6ceace1b9336e5416c38c Gerrit-Change-Number: 23089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 10:40:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:16 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Check LIBVERSION matches rpm *.spec.in In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23090 ) Change subject: osmo-release.sh: Check LIBVERSION matches rpm *.spec.in ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b8d56cc255167407370c888647255d8992f4202 Gerrit-Change-Number: 23090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 10:40:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:18 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Properly rearrange var init and sanity checks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23098 ) Change subject: osmo-release.sh: Properly rearrange var init and sanity checks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If62024fafcd30bc3399115248116e15e141b1cbb Gerrit-Change-Number: 23098 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 10:40:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:20 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Check configure.ac dependency versions match those i... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23088 ) Change subject: osmo-release.sh: Check configure.ac dependency versions match those in rpm *.spec.in ...................................................................... osmo-release.sh: Check configure.ac dependency versions match those in rpm *.spec.in Change-Id: I694f4055b39f91aaa0cf5997af67feefad99fdf5 --- M osmo-release.sh 1 file changed, 48 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index b63f981..52ccfeb 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -21,16 +21,19 @@ echo "$major" } -# Make sure that depedency requirement versions match in configure.ac vs debian/control. -#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," -check_configureac_debctrl_deps_match() { +get_configureac_pkg_check_modules_list() { if [ -f "${GIT_TOPDIR}/openbsc/configure.ac" ]; then configureac_file="openbsc/configure.ac" else configureac_file="configure.ac" fi - configureac_list=$(grep -e "PKG_CHECK_MODULES(" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d "[" | tr -d "]" | tr -d " " | sed "s/>=/ /g") - echo "$configureac_list" | \ + grep -e "PKG_CHECK_MODULES(" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d "[" | tr -d "]" | tr -d " " | sed "s/>=/ /g" +} + +# Make sure that depedency requirement versions match in configure.ac vs debian/control. +#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0)," +check_configureac_debctrl_deps_match() { + get_configureac_pkg_check_modules_list | \ { return_error=0 while read -r dep ver; do @@ -66,6 +69,45 @@ echo "OK: dependency specific versions in configure.ac and debian/control match" } +# Make sure that depedency requirement versions match in configure.ac vs contrib/*.spec.in. +#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "pkgconfig(libosmocore-dev) >= 1.0.0," +check_configureac_rpmspecin_deps_match() { + get_configureac_pkg_check_modules_list | \ + { return_error=0 + while read -r dep ver; do + + rpmspecin_match="$(grep -e "pkgconfig(${dep})" ${GIT_TOPDIR}/contrib/*.spec.in | grep BuildRequires | grep pkgconfig | grep ">=")" + rpmspecin_match_count="$(echo "$rpmspecin_match" | grep -c ">=")" + if [ "z$rpmspecin_match_count" != "z0" ]; then + #echo "Dependency <$dep, $ver> from configure.ac matched in contrib/*.spec.in! ($rpmspecin_match_count)" + if [ "z$rpmspecin_match_count" != "z1" ]; then + echo "WARN: configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!" + else # 1 match: + parsed_match=$(echo "$rpmspecin_match" | tr -d "(" | tr -d ")" | tr -d ":" | tr -d " " | tr -d "\t" | sed "s/BuildRequires//g" | sed "s/pkgconfig//g" |sed "s/>=/ /g") + rpmspecin_dep=$(echo "$parsed_match" | cut -d " " -f 1) + rpmspecin_ver=$(echo "$parsed_match" | cut -d " " -f 2) + if [ "z$dep" != "z$rpmspecin_dep" ] || [ "z$ver" != "z$rpmspecin_ver" ]; then + echo "ERROR: configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!" + return_error=1 + #else + # echo "OK: configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>" + fi + fi + fi + done + if [ $return_error -ne 0 ]; then + exit 1 + fi + } + + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + echo "ERROR: exiting due to previous errors" + exit 1 + fi + echo "OK: dependency specific versions in configure.ac and contrib/*.spec.in match" +} + # Make sure that patches under debian/patches/ apply: check_debian_patch_apply() { if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then @@ -102,6 +144,7 @@ echo "Releasing $VERSION -> $NEW_VER..." check_configureac_debctrl_deps_match +check_configureac_rpmspecin_deps_match check_debian_patch_apply if [ "z$LIBVERS" != "z" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I694f4055b39f91aaa0cf5997af67feefad99fdf5 Gerrit-Change-Number: 23088 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:21 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Drop repeated DRY_RUN early exit In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23089 ) Change subject: osmo-release.sh: Drop repeated DRY_RUN early exit ...................................................................... osmo-release.sh: Drop repeated DRY_RUN early exit Change-Id: Ib45fa3f5f89e1f7321d6ceace1b9336e5416c38c --- M osmo-release.sh 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 52ccfeb..ceb63b6 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -196,9 +196,6 @@ exit 1 fi fi - if [ "z$DRY_RUN" != "z0" ]; then - exit 0 - fi fi if [ "z$DRY_RUN" != "z0" ]; then -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib45fa3f5f89e1f7321d6ceace1b9336e5416c38c Gerrit-Change-Number: 23089 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:21 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Check LIBVERSION matches rpm *.spec.in In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23090 ) Change subject: osmo-release.sh: Check LIBVERSION matches rpm *.spec.in ...................................................................... osmo-release.sh: Check LIBVERSION matches rpm *.spec.in Change-Id: I7b8d56cc255167407370c888647255d8992f4202 --- M osmo-release.sh 1 file changed, 81 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index ceb63b6..173652d 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -9,10 +9,11 @@ ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" +ALLOW_NO_LIBVERSION_RPM_MATCH="${ALLOW_NO_LIBVERSION_RPM_MATCH:-0}" # Test stuff but don't modify stuff: DRY_RUN="${DRY_RUN:-0}" -libversion_to_deb_major() { +libversion_to_lib_major() { libversion="$1" current="$(echo "$libversion" | cut -d ":" -f 1)" #revision="$(echo "$libversion" | cut -d ":" -f 2)" @@ -124,6 +125,81 @@ done } +libversion_deb_match() { + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") + major="$(libversion_to_lib_major "$libversion")" + file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" + if [ "z$file_matches" = "z0" ]; then + echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" + exit 1 + elif [ "z$file_matches" = "z1" ]; then + echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" + fi + + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" + fi + + dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" + dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" + if [ "z$dhstrip_lib_total" != "z0" ]; then + if [ "z$dhstrip_lib_matches" = "z0" ] ; then + echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" + exit 1 + elif [ "z$dhstrip_lib_total" = "z1" ]; then + echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" + else + echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" + fi + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi +} + +libversion_rpmspecin_match() { + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") + major="$(libversion_to_lib_major "$libversion")" + + control_matches="$(grep -e "%files" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" + fi + + control_matches="$(grep -e "_libdir" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "/lib" | grep "so.$major" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!" + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi +} + + BUMPVER=`command -v bumpversion` GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -155,46 +231,10 @@ exit 1 fi if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then - echo "$LIBVERS" | while read -r line; do - libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]") - major="$(libversion_to_deb_major "$libversion")" - file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" - if [ "z$file_matches" = "z0" ]; then - echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" - exit 1 - elif [ "z$file_matches" = "z1" ]; then - echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" - else - echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" - fi - - control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" - if [ "z$control_matches" = "z0" ]; then - echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" - exit 1 - elif [ "z$control_matches" = "z1" ]; then - echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" - else - echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" - fi - - dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)" - dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)" - if [ "z$dhstrip_lib_total" != "z0" ]; then - if [ "z$dhstrip_lib_matches" = "z0" ] ; then - echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion" - exit 1 - elif [ "z$dhstrip_lib_total" = "z1" ]; then - echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion" - else - echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!" - fi - fi - done - # catch and forward exit from pipe subshell "while read": - if [ $? -ne 0 ]; then - exit 1 - fi + libversion_deb_match + fi + if [ "z$ALLOW_NO_LIBVERSION_RPM_MATCH" = "z0" ]; then + libversion_rpmspecin_match fi fi -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b8d56cc255167407370c888647255d8992f4202 Gerrit-Change-Number: 23090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:21 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Properly rearrange var init and sanity checks In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23098 ) Change subject: osmo-release.sh: Properly rearrange var init and sanity checks ...................................................................... osmo-release.sh: Properly rearrange var init and sanity checks Change-Id: If62024fafcd30bc3399115248116e15e141b1cbb --- M osmo-release.sh 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 173652d..eea17cf 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -201,21 +201,19 @@ BUMPVER=`command -v bumpversion` -GIT_TOPDIR="$(git rev-parse --show-toplevel)" -NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` -LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` -MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` -ISODATE=`date -I` - if [ "z$BUMPVER" = "z" ]; then echo Unable to find 'bumpversion' command. exit 1 fi - +NEW_VER=`$BUMPVER --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` if [ "z$NEW_VER" = "z" ]; then echo "Please fix versioning to match http://semver.org/ spec (current is $VERSION) before proceeding." exit 1 fi +GIT_TOPDIR="$(git rev-parse --show-toplevel)" +LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` +MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` +ISODATE=`date -I` echo "Releasing $VERSION -> $NEW_VER..." -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If62024fafcd30bc3399115248116e15e141b1cbb Gerrit-Change-Number: 23098 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:40:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:40:31 +0000 Subject: Change in libosmocore[master]: tests/gb: Fix printf format errors on ARM 32 bits In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23104 ) Change subject: tests/gb: Fix printf format errors on ARM 32 bits ...................................................................... tests/gb: Fix printf format errors on ARM 32 bits Seen building on RPI4 32 bits raspbian: error: format ?%lu? expects argument of type ?long unsigned int?, but argument 2 has type ?size_t? {aka ?unsigned int?} [-Werror=format=] Change-Id: I62199bfc7f3a78403334f5580f31fa5743223c9b --- M tests/gb/gprs_bssgp_rim_test.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/gb/gprs_bssgp_rim_test.c b/tests/gb/gprs_bssgp_rim_test.c index d08421b..e2d4f66 100644 --- a/tests/gb/gprs_bssgp_rim_test.c +++ b/tests/gb/gprs_bssgp_rim_test.c @@ -190,7 +190,7 @@ if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } @@ -272,7 +272,7 @@ printf(" macc_cause = %02x\n", app_cont->nacc_cause); if (app_cont->err_app_cont) { printf(" err_app_cont: %s\n", osmo_hexdump_nospc(app_cont->err_app_cont, app_cont->err_app_cont_len)); - printf(" err_app_cont_len: %lu\n", app_cont->err_app_cont_len); + printf(" err_app_cont_len: %zu\n", app_cont->err_app_cont_len); } } @@ -317,7 +317,7 @@ if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } @@ -454,7 +454,7 @@ if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } @@ -504,12 +504,12 @@ printf(" prot_ver = %u\n", rim_cont->prot_ver); if (rim_cont->err_pdu) { printf(" err_pdu: %s\n", osmo_hexdump_nospc(rim_cont->err_pdu, rim_cont->err_pdu_len)); - printf(" err_pdu_len: %lu\n", rim_cont->err_pdu_len); + printf(" err_pdu_len: %zu\n", rim_cont->err_pdu_len); } if (rim_cont->son_trans_app_id) { printf(" son_trans_app_id: %s\n", osmo_hexdump_nospc(rim_cont->son_trans_app_id, rim_cont->son_trans_app_id_len)); - printf(" son_trans_app_id_len: %lu\n", rim_cont->son_trans_app_id_len); + printf(" son_trans_app_id_len: %zu\n", rim_cont->son_trans_app_id_len); } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62199bfc7f3a78403334f5580f31fa5743223c9b Gerrit-Change-Number: 23104 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 10:43:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 10:43:01 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 10:43:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 11:23:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 11:23:25 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-bsc-test/jenkins.sh File ttcn3-bsc-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-bsc-test/jenkins.sh at a24 PS1, Line 24: pre-mscpool-osmo-bsc.cfg This file can be removed now. https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-fr-test/jenkins.sh File ttcn3-fr-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-fr-test/jenkins.sh at a20 PS1, Line 20: # Disable features not in latest yet > I would keep this block empty everywhere instead of removing it completely. [?] I don't have a strong opinion about this. But if we remove it, we keep the boilderplate in each jenkins.sh lower (and such things tend to get inconsistent). Instead we could add an example to README for future reference. https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-sgsn-test/jenkins.sh File ttcn3-sgsn-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23053/1/ttcn3-sgsn-test/jenkins.sh at a27 PS1, Line 27: cp osmo-sgsn.latest.cfg "$VOL_BASE_DIR/sgsn/osmo-sgsn.cfg" This file can be removed now. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 11:23:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 11:24:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 11:24:57 +0000 Subject: Change in osmo-smlc[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23093 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... Patch Set 1: Code-Review+1 Are they generated by autotools or your editor? But shouldn't hurt to have this. -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I97997a44e26e8fe9b98606e63aa6d5986d0d85f6 Gerrit-Change-Number: 23093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Feb 2021 11:24:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 11:26:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 11:26:37 +0000 Subject: Change in osmo-smlc[master]: main: Support setting cmdline --vty-ref-mode In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23094 ) Change subject: main: Support setting cmdline --vty-ref-mode ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Iadb004319514cb134b0863ea16b3289e6f1a097a Gerrit-Change-Number: 23094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Feb 2021 11:26:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 11:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 11:27:18 +0000 Subject: Change in osmo-smlc[master]: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23095 ) Change subject: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I49365dfcd24bed55101917d2ea034c4327ab51d6 Gerrit-Change-Number: 23095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Feb 2021 11:27:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 11:28:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 11:28:26 +0000 Subject: =?UTF-8?Q?Change_in_osmo-smlc=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E8-14c9-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23096 ) Change subject: Bump version: 0.1.0.8-14c9-dirty ? 0.2.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I67c0bde168c91f3d38cb228b4318321a70b68c3e Gerrit-Change-Number: 23096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 25 Feb 2021 11:28:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 11:31:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 11:31:15 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > > Patch Set 1: -Code-Review > > > > > > I started doing the change, but I realized I actually prefer getting them removed completely. > > > > > > This allows quickly checking which tests have specific quirks for latest, and getting them removed when a new release is done, eg: grep -r \"latest\" > > > > You can still check whether a specific test suite has backwards compatibility quirks, depending on what the conditional block contains. I see no problem with that, so I am not convinced. Why would people need to resurrect something from the history if we can just keep it? > > You need to open each file to look at the contents of each if block then, or use a quite more advance grep command to check more stuff -> not handy. > > Morevoer, following your same reasoning: Why should we keep something if we can resurrect it from history when needed? That's what version controls are for. Missed this conversation. I agree with Pau, being able to grep for latest is useful, I suggest to remove it. If we want some kind of reference for this, we can put it in README. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 11:31:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:42:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:42:55 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt update before install wget In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23091 ) Change subject: repo-install-test: apt update before install wget ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d28967dc556e95eec2e3e3d7ff88533154acf3c Gerrit-Change-Number: 23091 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 14:42:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:33 +0000 Subject: Change in osmo-smlc[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23093 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I97997a44e26e8fe9b98606e63aa6d5986d0d85f6 Gerrit-Change-Number: 23093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 14:43:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:35 +0000 Subject: Change in osmo-smlc[master]: main: Support setting cmdline --vty-ref-mode In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23094 ) Change subject: main: Support setting cmdline --vty-ref-mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Iadb004319514cb134b0863ea16b3289e6f1a097a Gerrit-Change-Number: 23094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 14:43:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:36 +0000 Subject: Change in osmo-smlc[master]: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23095 ) Change subject: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I49365dfcd24bed55101917d2ea034c4327ab51d6 Gerrit-Change-Number: 23095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 14:43:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:38 +0000 Subject: =?UTF-8?Q?Change_in_osmo-smlc=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E8-14c9-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23096 ) Change subject: Bump version: 0.1.0.8-14c9-dirty ? 0.2.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I67c0bde168c91f3d38cb228b4318321a70b68c3e Gerrit-Change-Number: 23096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 14:43:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:41 +0000 Subject: Change in osmo-smlc[master]: gitignore: Ignore autofoo files *~ In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23093 ) Change subject: gitignore: Ignore autofoo files *~ ...................................................................... gitignore: Ignore autofoo files *~ Change-Id: I97997a44e26e8fe9b98606e63aa6d5986d0d85f6 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/.gitignore b/.gitignore index ba72477..f4c1cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ libtool ltmain.sh m4/*.m4 +*~ # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I97997a44e26e8fe9b98606e63aa6d5986d0d85f6 Gerrit-Change-Number: 23093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:42 +0000 Subject: Change in osmo-smlc[master]: main: Support setting cmdline --vty-ref-mode In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23094 ) Change subject: main: Support setting cmdline --vty-ref-mode ...................................................................... main: Support setting cmdline --vty-ref-mode Change-Id: Iadb004319514cb134b0863ea16b3289e6f1a097a --- M src/osmo-smlc/smlc_main.c 1 file changed, 29 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-smlc/smlc_main.c b/src/osmo-smlc/smlc_main.c index 105ced3..3f24a42 100644 --- a/src/osmo-smlc/smlc_main.c +++ b/src/osmo-smlc/smlc_main.c @@ -78,6 +78,31 @@ printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); } +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + static void handle_options(int argc, char **argv) { while (1) { @@ -90,7 +115,8 @@ {"config-file", 1, 0, 'c'}, {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, - {"vty-ref-xml", 0, &long_option, 1}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; @@ -105,14 +131,8 @@ print_help(); exit(0); case 0: - switch (long_option) { - case 1: - vty_dump_xml_ref(stdout); - exit(0); - default: - fprintf(stderr, "error parsing cmdline options\n"); - exit(2); - } + handle_long_options(argv[0], long_option); + break; case 'd': log_parse_category_mask(osmo_stderr_target, optarg); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Iadb004319514cb134b0863ea16b3289e6f1a097a Gerrit-Change-Number: 23094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:43 +0000 Subject: Change in osmo-smlc[master]: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23095 ) Change subject: smlc_subscr_test: Replace use of deprecated log_set_print_filename() API ...................................................................... smlc_subscr_test: Replace use of deprecated log_set_print_filename() API hex_category is also set explicitly to keep same results (old API used to set it internally). Change-Id: I49365dfcd24bed55101917d2ea034c4327ab51d6 --- M tests/smlc_subscr/smlc_subscr_test.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/smlc_subscr/smlc_subscr_test.c b/tests/smlc_subscr/smlc_subscr_test.c index 92b7293..2db19d2 100644 --- a/tests/smlc_subscr/smlc_subscr_test.c +++ b/tests/smlc_subscr/smlc_subscr_test.c @@ -140,10 +140,11 @@ void *ctx = talloc_named_const(NULL, 0, "smlc_subscr_test"); osmo_init_logging2(ctx, &log_info); - log_set_print_filename(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); g_smlc = smlc_state_alloc(ctx); @@ -154,4 +155,3 @@ printf("Done\n"); return 0; } - -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I49365dfcd24bed55101917d2ea034c4327ab51d6 Gerrit-Change-Number: 23095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 14:43:43 +0000 Subject: =?UTF-8?Q?Change_in_osmo-smlc=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E8-14c9-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/23096 ) Change subject: Bump version: 0.1.0.8-14c9-dirty ? 0.2.0 ...................................................................... Bump version: 0.1.0.8-14c9-dirty ? 0.2.0 Change-Id: I67c0bde168c91f3d38cb228b4318321a70b68c3e --- M configure.ac M contrib/osmo-smlc.spec.in M debian/changelog M debian/control 4 files changed, 39 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 186721b..e4b902b 100644 --- a/configure.ac +++ b/configure.ac @@ -39,12 +39,12 @@ AC_MSG_ERROR([Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.]) ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-smlc.spec.in b/contrib/osmo-smlc.spec.in index 657afc8..ffaef03 100644 --- a/contrib/osmo-smlc.spec.in +++ b/contrib/osmo-smlc.spec.in @@ -32,13 +32,13 @@ %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmo-netif) >= 0.6.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 0.10.0 -BuildRequires: pkgconfig(libosmo-sigtran) >= 0.10.0 -BuildRequires: pkgconfig(libosmocore) >= 1.2.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.2.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.2.0 -BuildRequires: pkgconfig(libosmovty) >= 1.2.0 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 BuildRequires: pkgconfig(talloc) %{?systemd_requires} diff --git a/debian/changelog b/debian/changelog index e573404..73f17c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +osmo-smlc (0.2.0) unstable; urgency=medium + + [ Harald Welte ] + * contrib/jenkins.sh: Build libosmo-abis, a dependency of libosmo-netif + * fix build of usermanual + * update vty reference XML + * debian/spec: Add build depedency to autoconf-archive + * debian: the osmo-smlc example is not in the osmo-msc directory + * osmo-smlc.spec.in: Add dependency to autoconf-archive + * fix osmo-smlc.service: drop unknown '-s' command line argument + + [ Neels Hofmeyr ] + * initial working osmo-smlc implementation + * manual: describe TA-based positioning and cell locations + + [ Pau Espin Pedrol ] + * gitignore: Ignore autofoo files *~ + * main: Support setting cmdline --vty-ref-mode + * smlc_subscr_test: Replace use of deprecated log_set_print_filename() API + + -- Pau Espin Pedrol Wed, 24 Feb 2021 14:30:56 +0100 + osmo-smlc (0.0.1) unstable; urgency=medium [ Harald Welte ] diff --git a/debian/control b/debian/control index 49a270d..c64b941 100644 --- a/debian/control +++ b/debian/control @@ -12,10 +12,10 @@ pkg-config, libsctp-dev, libtalloc-dev, - libosmocore-dev (>= 1.3.0), - libosmo-sccp-dev (>= 1.1.0), - libosmo-sigtran-dev (>= 1.1.0), - osmo-gsm-manuals-dev (>= 0.2.0) + libosmocore-dev (>= 1.5.0), + libosmo-sccp-dev (>= 1.4.0), + libosmo-sigtran-dev (>= 1.4.0), + osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-smlc.git Vcs-Browser: https://git.osmocom.org/osmo-smlc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/23096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I67c0bde168c91f3d38cb228b4318321a70b68c3e Gerrit-Change-Number: 23096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 14:43:59 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 25 Feb 2021 14:43:59 +0000 Subject: Change in osmo-ci[master]: repo-install-test: apt update before install wget In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23091 ) Change subject: repo-install-test: apt update before install wget ...................................................................... repo-install-test: apt update before install wget Fix errors caused by outdated package index: + apt install -y wget ... Err:2 http://security.debian.org/debian-security stretch/updates/main amd64 libssl1.1 amd64 1.1.0l-1~deb9u2 404 Not Found [IP: 151.101.130.132 80] Change-Id: I9d28967dc556e95eec2e3e3d7ff88533154acf3c --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Verified diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index f05f01c..2ed78f6 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -110,6 +110,7 @@ # Add repository key if ! [ -e "$release_key" ]; then + apt-get update apt install -y wget wget -O "$release_key" "https://$obs_repo/Release.key" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23091 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d28967dc556e95eec2e3e3d7ff88533154acf3c Gerrit-Change-Number: 23091 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:28:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 25 Feb 2021 15:28:20 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/23028 to look at the new patch set (#3). Change subject: utils: catch exceptions during reader initalitation ...................................................................... utils: catch exceptions during reader initalitation Failed reader initializations happen frome time to time, mostly because of messed up commandline arguments. This results in ugly crashes very often. Lets control this a bit by catching the exception string and print it. Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 --- M pySim-prog.py M pySim-read.py M pySim/utils.py 3 files changed, 25 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/28/23028/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:28:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 25 Feb 2021 15:28:20 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/23029 to look at the new patch set (#3). Change subject: serial: don't crash if the device does not exist ...................................................................... serial: don't crash if the device does not exist The most common reason for pySim to crash is when it is executed without commandline parameters. Then pySim will expect a serial reader on /dev/ttyUSB0 since this is the default. Lets check if /dev/ttyUSB0 even exists before trying to open it. Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 --- M pySim/transport/serial.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/29/23029/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:32:53 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 25 Feb 2021 15:32:53 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23029 ) Change subject: serial: don't crash if the device does not exist ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/pysim/+/23029/2/pySim/transport/serial.py File pySim/transport/serial.py: https://gerrit.osmocom.org/c/pysim/+/23029/2/pySim/transport/serial.py at 38 PS2, Line 38: if (os.path.exists(device) == False): > Coding style: [?] Done https://gerrit.osmocom.org/c/pysim/+/23029/2/pySim/transport/serial.py at 39 PS2, Line 39: > Coding style: this space is not needed here. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 25 Feb 2021 15:32:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:33:08 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 25 Feb 2021 15:33:08 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23028 ) Change subject: utils: catch exceptions during reader initalitation ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-prog.py File pySim-prog.py: https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-prog.py at 723 PS2, Line 723: if (sl == None): > Coding style: [?] Done https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-read.py File pySim-read.py: https://gerrit.osmocom.org/c/pysim/+/23028/2/pySim-read.py at 85 PS2, Line 85: if (sl == None): > Coding style: [?] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 25 Feb 2021 15:33:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:35:08 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 25 Feb 2021 15:35:08 +0000 Subject: Change in osmo-bts[master]: l1sap: Store status of SRR in an lchan struct memeber In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22928 ) Change subject: l1sap: Store status of SRR in an lchan struct memeber ...................................................................... Patch Set 5: (1 comment) (gerrit!) https://gerrit.osmocom.org/c/osmo-bts/+/22928/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/22928/1/src/common/l1sap.c at 1147 PS1, Line 1147: } else > {} Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieddd45d7890343d64db14b9c726f6fa2f25714f6 Gerrit-Change-Number: 22928 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 15:35:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:42:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 15:42:06 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: Hello osmith, laforge, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23053 to look at the new patch set (#2). Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Remove test backward compatibility with older osmo-* versions These changes are no longer needed since master versions of whole CNI have been recently released. Related: OS#5042 Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh D ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh D ttcn3-sgsn-test/osmo-sgsn.latest.cfg M ttcn3-sip-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 16 files changed, 0 insertions(+), 641 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/23053/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 15:43:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 15:43:59 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 15:43:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 16:07:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 16:07:23 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23028 ) Change subject: utils: catch exceptions during reader initalitation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 25 Feb 2021 16:07:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 16:08:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 16:08:38 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23029 ) Change subject: serial: don't crash if the device does not exist ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 25 Feb 2021 16:08:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 16:21:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 16:21:53 +0000 Subject: Change in pysim[master]: serial: do not try to close non existing serial connection In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23030 ) Change subject: serial: do not try to close non existing serial connection ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic3f3f5e50d780f424da7d0be5733d7167bb7159c Gerrit-Change-Number: 23030 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 25 Feb 2021 16:21:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 16:24:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 16:24:48 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Patch Set 2: Code-Review+2 Not gonna block, let's fix the '-latest' ASAP. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 25 Feb 2021 16:24:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 16:47:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 16:47:03 +0000 Subject: Change in docker-playground[master]: Remove test backward compatibility with older osmo-* versions In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 ) Change subject: Remove test backward compatibility with older osmo-* versions ...................................................................... Remove test backward compatibility with older osmo-* versions These changes are no longer needed since master versions of whole CNI have been recently released. Related: OS#5042 Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh D ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg M ttcn3-bts-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh D ttcn3-sgsn-test/osmo-sgsn.latest.cfg M ttcn3-sip-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 16 files changed, 0 insertions(+), 641 deletions(-) Approvals: pespin: Verified fixeria: Looks good to me, approved diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ab8c06d..c040a0a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -19,13 +19,6 @@ SUBNET=12 network_create $SUBNET -# Disable stats testing until libosmocore release > 1.4.0 -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg -fi - echo Starting container with BSC docker run --rm \ $(docker_network_params $SUBNET 20) \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index cba378e..a807c49 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -19,30 +19,6 @@ mkdir $VOL_BASE_DIR/bts-omldummy -# Disable MSC pooling features until osmo-bsc.git release > 1.6.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg -fi - -# Disable stats testing until libosmocore release > 1.4.0 -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg -fi - -# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg - sed "/fd02:db8/d" -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg - sed -i "s/^BSC_Tests.mp_media_mgw_offer_ipv6.*/BSC_Tests.mp_media_mgw_offer_ipv6 := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi - -# Disable LCS tests until osmo-bsc > 1.6.0 -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i 's/^BSC_Tests.mp_enable_lcs_tests.*/BSC_Tests.mp_enable_lcs_tests := false;/' $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi - SUBNET=2 network_create $SUBNET diff --git a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg b/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg deleted file mode 100644 index a68e9d7..0000000 --- a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg +++ /dev/null @@ -1,395 +0,0 @@ -! -! OsmoBSC (1.0.1.122-630df) configuration saved from vty -!! -password foo -! -log gsmtap 172.18.2.203 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging print category-hex 0 - logging print file basename last - logging print level 1 - logging level set-all debug - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp notice - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice -! -stats interval 0 -stats reporter statsd - prefix TTCN3 - level subscriber - remote-ip 172.18.2.203 - remote-port 8125 - flush-period 1 - mtu 1024 - enable -! -! -line vty - no login - bind 0.0.0.0 -! -e1_input - e1_line 0 driver ipa - e1_line 0 port 0 - no e1_line 0 keepalive -cs7 instance 0 - asp asp-clnt-msc-0 2905 2905 m3ua - remote-ip 172.18.2.200 -network - network country code 1 - mobile network code 1 - encryption a5 0 1 3 - neci 1 - paging any use tch 0 - handover 1 - handover window rxlev averaging 10 - handover window rxqual averaging 1 - handover window rxlev neighbor averaging 10 - handover power budget interval 6 - handover power budget hysteresis 3 - handover maximum distance 9999 - timer t3113 10 - timer t3212 30 - bts 0 - type sysmobts - band DCS1800 - cell_identity 0 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 10 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - ip.access unit_id 1234 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr hr efr amr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1234 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1234 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1234 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 192.168.100.239 - gprs nsvc 1 nsvci 0 - gprs nsvc 1 local udp port 0 - gprs nsvc 1 remote udp port 0 - gprs nsvc 1 remote ip 0.0.0.0 - no force-combined-si - si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3 - trx 0 - rf_locked 0 - arfcn 871 - nominal power 23 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - bts 1 - type sysmobts - band DCS1800 - cell_identity 1 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 11 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - ip.access unit_id 1235 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr hr efr amr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1235 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1235 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1235 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 192.168.100.239 - gprs nsvc 1 nsvci 0 - gprs nsvc 1 local udp port 0 - gprs nsvc 1 remote udp port 0 - gprs nsvc 1 remote ip 0.0.0.0 - no force-combined-si - si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3 - trx 0 - rf_locked 0 - arfcn 871 - nominal power 23 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - bts 2 - type sysmobts - band DCS1800 - cell_identity 1 - location_area_code 2 - dtx uplink force - dtx downlink - base_station_id_code 12 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - ip.access unit_id 1236 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr hr efr amr - gprs mode gprs - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1236 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1236 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1236 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 192.168.100.239 - gprs nsvc 1 nsvci 0 - gprs nsvc 1 local udp port 0 - gprs nsvc 1 remote udp port 0 - gprs nsvc 1 remote ip 0.0.0.0 - no force-combined-si - si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3 - trx 0 - rf_locked 0 - arfcn 871 - nominal power 23 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - hopping enabled 0 - timeslot 1 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 2 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 3 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 4 - phys_chan_config TCH/F - hopping enabled 0 - timeslot 5 - phys_chan_config TCH/H - hopping enabled 0 - timeslot 6 - phys_chan_config PDCH - hopping enabled 0 - timeslot 7 - phys_chan_config PDCH - hopping enabled 0 - bts 3 - type sysmobts - band DCS1800 - cell_identity 3 - location_area_code 3 - # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config) - base_station_id_code 12 - trx 0 - rf_locked 0 - arfcn 871 - nominal power 23 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 - phys_chan_config CCCH+SDCCH4 - timeslot 1 - phys_chan_config TCH/F - timeslot 2 - phys_chan_config TCH/F - timeslot 3 - phys_chan_config TCH/F - timeslot 4 - phys_chan_config TCH/F - timeslot 5 - phys_chan_config TCH/H - timeslot 6 - phys_chan_config PDCH - timeslot 7 - phys_chan_config PDCH -msc 0 - no bsc-welcome-text - no bsc-msc-lost-text - no bsc-grace-text - type normal - allow-emergency allow - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden - codec-list fr1 fr2 fr3 hr1 hr3 - mgw remote-ip 172.18.2.203 - lcls-mode mgw-loop - -bsc - mid-call-timeout 0 - no missing-msc-text -ctrl - bind 0.0.0.0 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 87e2896..8381a8b 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -114,16 +114,6 @@ mkdir $VOL_BASE_DIR/bts-tester-hopping cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/ -# TODO: revisit this section every time we tag a new release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # Work around for a bug in osmo-bts causing all transceivers to use IPAC_PROTO_RSL_TRX0 - sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" \ - -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" - # PCUIFv10 is not yet supported in the latest release - sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ - -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg" -fi - cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index faf8170..9402006 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -17,11 +17,6 @@ mkdir $VOL_BASE_DIR/frnet cp FRNET_Tests.cfg $VOL_BASE_DIR/frnet/ -# Disable features not in latest yet -if [ "$IMAGE_SUFFIX" = "latest" ]; then - true; -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with FRNET diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 4ef2ace..352731f 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -30,11 +30,6 @@ mkdir $VOL_BASE_DIR/gbproxy cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ -# Disable features not in latest yet -if [ "$IMAGE_SUFFIX" = "latest" ]; then - true; -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with gbproxy diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index b063c7f..cc29a3c 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -18,11 +18,6 @@ mkdir $VOL_BASE_DIR/gbproxy cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ -# Disable features not in latest yet -if [ "$IMAGE_SUFFIX" = "latest" ]; then - true; -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with gbproxy diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 93ba6c3..51a33e8 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -12,12 +12,6 @@ mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ -# Disable D-GSM tests until osmo-hlr.git release > 1.2.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/HLR_Tests.mp_hlr_supports_dgsm := true/HLR_Tests.mp_hlr_supports_dgsm := false/g" -i \ - "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index c49096b..c704005 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -15,15 +15,6 @@ SUBNET=4 network_create $SUBNET -# Disable e1 config options until osmo-mgw >= 1.8.0 release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed -i "s/e1_line.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg - sed -i "s/e1_input.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg - sed -i "s/line 0.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg - # Disable IPv6 until osmo-mgw .git release > 1.7.0 is available - sed "/fd02:db8/d" -i $VOL_BASE_DIR/mgw/osmo-mgw.cfg -fi - # start container with mgw in background docker run --rm \ $(docker_network_params $SUBNET 180) \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index c67fb5e..90770cb 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -14,18 +14,6 @@ mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -# Disable verification of VLR and conn Cell ID until osmo-msc.git release > 1.6.1 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MSC_Tests.mp_enable_cell_id_test := true/MSC_Tests.mp_enable_cell_id_test := false/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - sed "s/BSC_ConnectionHandler.mp_expect_common_id := true/BSC_ConnectionHandler.mp_expect_common_id := false/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - sed "s/MSC_Tests.mp_enable_crashing_tests := true/MSC_Tests.mp_enable_crashing_tests := false/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" - sed "s/MNCC_Emulation.mp_mncc_version := 7/MNCC_Emulation.mp_mncc_version := 6/" -i \ - "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ @@ -33,12 +21,6 @@ mkdir $VOL_BASE_DIR/msc/unix cp osmo-msc.cfg $VOL_BASE_DIR/msc/ -# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg - sed "/fd02:db8/d" -i $VOL_BASE_DIR/msc/osmo-msc.cfg -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with STP diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index ee0b08a..9428776 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -19,22 +19,6 @@ mkdir $VOL_BASE_DIR/unix -# TODO: revisit this section every time we tag a new release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # PCUIFv10 is not yet supported in the latest release - sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - # Tolerate CellId IE in BVC-RESET for BVCO=0 - sed -e "/\[MODULE_PARAMETERS\]/ a BSSGP_Emulation.mp_tolerate_bvc_reset_cellid := true;" \ - -e "/\[MODULE_PARAMETERS\]/ a PCU_Tests_NS.mp_tolerate_bvc_reset_cellid := true;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - - # Disable stats testing until libosmocore release > 1.4.0 - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg -fi - echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index c2ef0d5..5dedec7 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -19,25 +19,6 @@ mkdir $VOL_BASE_DIR/unix -# TODO: revisit this section every time we tag a new release -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # PCUIFv10 is not yet supported in the latest release - sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - # Tolerate CellId IE in BVC-RESET for BVCO=0 - sed -e "/\[MODULE_PARAMETERS\]/ a BSSGP_Emulation.mp_tolerate_bvc_reset_cellid := true;" \ - -e "/\[MODULE_PARAMETERS\]/ a PCU_Tests_NS.mp_tolerate_bvc_reset_cellid := true;" \ - -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" - - # Disable stats testing until libosmocore release > 1.4.0 - sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg - sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg - sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg - - # neighbor resolution only available in osmo-pcu > 0.8.0 - sed "/neighbor resolution/d" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg -fi - echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 35eaf2e..9e16c3e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -19,14 +19,6 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -if [ "$IMAGE_SUFFIX" = "latest" ]; then - # Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available - sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg - - # latest doesn't use yet the NS2 code - cp osmo-sgsn.latest.cfg "$VOL_BASE_DIR/sgsn/osmo-sgsn.cfg" -fi - mkdir $VOL_BASE_DIR/unix echo Starting container with STP diff --git a/ttcn3-sgsn-test/osmo-sgsn.latest.cfg b/ttcn3-sgsn-test/osmo-sgsn.latest.cfg deleted file mode 100644 index 5cee7d4..0000000 --- a/ttcn3-sgsn-test/osmo-sgsn.latest.cfg +++ /dev/null @@ -1,101 +0,0 @@ -! -! OsmoSGSN (1.2.0.46-e77e-dirty) configuration saved from vty -!! -! -log gsmtap 172.18.8.103 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging print file 1 - logging level all everything - logging level mm debug - logging level pag notice - logging level meas notice - logging level ref notice - logging level gprs debug - logging level ns info - logging level bssgp info - logging level llc debug - logging level sndcp debug - logging level slhc notice - logging level ranap info - logging level sua info - logging level v42bis info - logging level lglobal info - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp debug - logging level lstats notice - logging level lgsup debug - logging level loap notice - logging level lss7 notice - logging level lsccp info - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -ctrl - bind 0.0.0.0 -! -cs7 instance 0 - point-code 0.23.4 - asp asp-clnt-OsmoSGSN-A 2905 0 m3ua - local-ip 172.18.8.10 - remote-ip 172.18.8.200 - as as-clnt-OsmoSGSN-A m3ua - asp asp-clnt-OsmoSGSN-A - routing-key 3 0.23.4 -ns - timer tns-block 3 - timer tns-block-retries 3 - timer tns-reset 3 - timer tns-reset-retries 3 - timer tns-test 30 - timer tns-alive 3 - timer tns-alive-retries 10 - encapsulation udp local-ip 172.18.8.10 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 -bssgp -sgsn - gtp local-ip 172.18.8.10 - ggsn 0 remote-ip 172.18.8.103 - ggsn 0 gtp-version 1 - gsup remote-ip 172.18.8.103 - gsup remote-port 4222 - auth-policy remote - gsup oap-id 0 - ! apn * ggsn 0 - no cdr filename - no cdr trap - cdr interval 600 - timer t3312 600 - timer t3322 6 - timer t3350 6 - timer t3360 6 - timer t3370 6 - timer t3313 30 - timer t3314 44 - timer t3316 44 - timer t3385 8 - timer t3386 8 - timer t3395 8 - timer t3397 8 - no compression rfc1144 - no compression v42bis diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index af5e40b..36252b0 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -13,12 +13,6 @@ mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ -# Can be removed once osmo-sip-connector > 1.4.1 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MNCC_Emulation.mp_mncc_version := 7/MNCC_Emulation.mp_mncc_version := 6/" -i \ - "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" -fi - mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 9ea97cb..1b20c3f 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -12,13 +12,6 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "/fd02:db8/d" -i "$VOL_BASE_DIR/stp/osmo-stp.cfg" - sed 's/, "fd02:db8:19::203"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" - sed 's/, "fd02:db8:19::200"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" -fi - SUBNET=19 network_create $SUBNET -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739 Gerrit-Change-Number: 23053 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 17:38:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 17:38:41 +0000 Subject: Change in osmo-pcu[master]: tbf: Log timeslot allocation failure References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23105 ) Change subject: tbf: Log timeslot allocation failure ...................................................................... tbf: Log timeslot allocation failure Change-Id: I48fc1eac37eeb74649bfc0888e06afc0079a58f8 --- M src/tbf.cpp M tests/alloc/AllocTest.err M tests/tbf/TbfTest.err 3 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/23105/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 1885927..b1121bb 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -751,6 +751,9 @@ rc = the_pcu->alloc_algorithm(bts, m_ms, this, single_slot, use_trx); /* if no resource */ if (rc < 0) { + LOGPTBF(this, LOGL_NOTICE, + "Timeslot Allocation failed: trx = %d, single_slot = %d\n", + use_trx, single_slot); return -1; } /* assign control ts */ diff --git a/tests/alloc/AllocTest.err b/tests/alloc/AllocTest.err index 0866c9c..8c175f5 100644 --- a/tests/alloc/AllocTest.err +++ b/tests/alloc/AllocTest.err @@ -194,6 +194,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=0/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=1 TLLI=0xffffffff DIR=DL STATE=RELEASING) free @@ -306,6 +307,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 Allocating UL TBF: MS_CLASS=0/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=1 TLLI=0xffffffff DIR=UL STATE=NULL) free @@ -714,6 +716,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=0/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free @@ -932,6 +935,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 00 Allocating UL TBF: MS_CLASS=0/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free @@ -189960,6 +189964,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -190052,6 +190057,7 @@ TBF(TFI=14 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 18 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=12/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -190144,6 +190150,7 @@ TBF(TFI=14 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 18 Allocating UL TBF: MS_CLASS=12/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -190284,6 +190291,7 @@ TBF(TFI=22 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78 Allocating UL TBF: MS_CLASS=12/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -190388,6 +190396,7 @@ TBF(TFI=16 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = f8 Allocating UL TBF: MS_CLASS=18/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -190493,6 +190502,7 @@ Allocating UL TBF: MS_CLASS=18/0 No USF available [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 @@ -190708,6 +190718,7 @@ TBF(TFI=7 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=7 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -190804,6 +190815,7 @@ TBF(TFI=15 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40, dl_slots = f0 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=15 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -190901,6 +190913,7 @@ Allocating UL TBF: MS_CLASS=10/0 No USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=15 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -192029,6 +192042,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -192260,6 +192274,7 @@ Allocating DL TBF: MS_CLASS=10/0 No TFI available (suggested TRX: 0). [DL] algo B (suggested TRX: 0): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 @@ -193042,6 +193057,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=10/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 @@ -193292,6 +193308,7 @@ TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -193403,6 +193420,7 @@ TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40, dl_slots = f0 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -193515,6 +193533,7 @@ Allocating UL TBF: MS_CLASS=10/0 No USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -193623,6 +193642,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -193670,6 +193690,7 @@ TBF(TFI=14 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 18, dl_slots = 00 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -193742,6 +193763,7 @@ Allocating UL TBF: MS_CLASS=10/0 No USF available [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 @@ -194229,6 +194251,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=1/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78 @@ -194329,6 +194352,7 @@ Allocating DL TBF: MS_CLASS=10/0 No TFI available (suggested TRX: -1). [DL] algo B (suggested TRX: -1): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78 @@ -194706,6 +194730,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=10/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -195833,6 +195858,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=23/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously -1) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) Setting Control TS 3 @@ -195941,6 +195967,7 @@ TBF(TFI=6 TLLI=0xc0000022 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 Allocating UL TBF: MS_CLASS=36/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xc0000023 DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 Allocated 35 TBFs (previously 160) TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=1/0 @@ -197419,6 +197446,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=23/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 160) TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=1/0 @@ -198222,6 +198250,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=23/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 160) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -198454,6 +198483,7 @@ Allocating DL TBF: MS_CLASS=33/0 No TFI available (suggested TRX: 0). [DL] algo B (suggested TRX: 0): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free Allocated 32 TBFs (previously -1) Allocating UL TBF: MS_CLASS=1/0 @@ -198509,6 +198539,7 @@ TBF(TFI=16 TLLI=0xc0000010 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 88, dl_slots = 00 Allocating UL TBF: MS_CLASS=18/0 No USF available +TBF(TFI=0 TLLI=0xc0000011 DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 Allocated 17 TBFs (previously 32) TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=1/0 @@ -198821,6 +198852,7 @@ Allocating DL TBF: MS_CLASS=33/0 No TFI available (suggested TRX: 0). [DL] algo B (suggested TRX: 0): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free Allocated 32 TBFs (previously 32) TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free @@ -198986,6 +199018,7 @@ Allocating DL TBF: MS_CLASS=33/0 No TFI available (suggested TRX: -1). [DL] algo B (suggested TRX: -1): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 32 TBFs (previously 32) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -199672,6 +199705,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=44/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 89 TBFs (previously -1) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) Setting Control TS 3 @@ -199726,6 +199760,7 @@ TBF(TFI=6 TLLI=0xc0000010 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 Allocating UL TBF: MS_CLASS=18/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xc0000011 DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 Allocated 17 TBFs (previously 89) TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=1/0 @@ -200974,6 +201009,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=23/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 89) TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=1/0 @@ -201777,6 +201813,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=23/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 160) Allocating DL TBF: MS_CLASS=11/11 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL EGPRS) Setting Control TS 6 diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index eb197d4..26e4b69 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1342,6 +1342,7 @@ Allocating DL TBF: MS_CLASS=45/0 [DL] algo A (suggested TRX: -1): Alloc start [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xc0000020 DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 1 No PDCH resource === end test_tbf_exhaustion === Destroying MS object, TLLI = 0xc0000020 @@ -6193,6 +6194,7 @@ - Skipping TS 6, because not enabled - Skipping TS 7, because no USF available [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 1 No PDCH resource for Uplink TBF Tx Immediate Assignment Reject on AGCH Destroying MS object, TLLI = 0xffffffff @@ -7630,6 +7632,7 @@ - Skipping TS 6, because not enabled - Skipping TS 7, because no USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NULL EGPRS) Timeslot Allocation failed: trx = 0, single_slot = 0 No PDCH resource TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NULL) changes state from NULL to ASSIGN Attaching TBF to MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48fc1eac37eeb74649bfc0888e06afc0079a58f8 Gerrit-Change-Number: 23105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 17:38:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 17:38:42 +0000 Subject: Change in osmo-pcu[master]: bts: Count TBF TS allocation failure References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23106 ) Change subject: bts: Count TBF TS allocation failure ...................................................................... bts: Count TBF TS allocation failure Related: OS#2282 Change-Id: I0696bf77364bd31b96c00614a58ce66809683d1c --- M src/bts.cpp M src/bts.h M src/tbf.cpp 3 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/23106/1 diff --git a/src/bts.cpp b/src/bts.cpp index 11aef3f..8d1fb3f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -100,6 +100,7 @@ { "tbf:reused", "TBF Reused "}, { "tbf:alloc:algo-a", "TBF Alloc Algo A "}, { "tbf:alloc:algo-b", "TBF Alloc Algo B "}, + { "tbf:alloc:failed", "TBF Alloc Failure "}, { "rlc:sent", "RLC Sent "}, { "rlc:resent", "RLC Resent "}, { "rlc:restarted", "RLC Restarted "}, diff --git a/src/bts.h b/src/bts.h index 90367ac..d321b8d 100644 --- a/src/bts.h +++ b/src/bts.h @@ -87,6 +87,7 @@ CTR_TBF_REUSED, CTR_TBF_ALLOC_ALGO_A, CTR_TBF_ALLOC_ALGO_B, + CTR_TBF_ALLOC_FAIL, CTR_RLC_SENT, CTR_RLC_RESENT, CTR_RLC_RESTARTED, diff --git a/src/tbf.cpp b/src/tbf.cpp index b1121bb..2f58375 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -335,6 +335,7 @@ /* if no resource */ if (rc < 0) { LOGPTBF(this, LOGL_ERROR, "No resource after update???\n"); + bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); return -rc; } @@ -754,6 +755,7 @@ LOGPTBF(this, LOGL_NOTICE, "Timeslot Allocation failed: trx = %d, single_slot = %d\n", use_trx, single_slot); + bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); return -1; } /* assign control ts */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0696bf77364bd31b96c00614a58ce66809683d1c Gerrit-Change-Number: 23106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 17:38:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 17:38:44 +0000 Subject: Change in osmo-pcu[master]: pdch: Standarize and improve logging References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23107 ) Change subject: pdch: Standarize and improve logging ...................................................................... pdch: Standarize and improve logging Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 --- M src/pdch.cpp M src/pdch.h M tests/app_info/AppInfoTest.err M tests/tbf/TbfTest.err 4 files changed, 526 insertions(+), 519 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/07/23107/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 Gerrit-Change-Number: 23107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 17:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 17:38:47 +0000 Subject: Change in osmo-pcu[master]: tbf: Improve logging when TBF being allocated or no TBF avail References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23108 ) Change subject: tbf: Improve logging when TBF being allocated or no TBF avail ...................................................................... tbf: Improve logging when TBF being allocated or no TBF avail Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f --- M src/tbf_dl.cpp M src/tbf_ul.cpp M tests/alloc/AllocTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.err 5 files changed, 50,859 insertions(+), 50,859 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/23108/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f Gerrit-Change-Number: 23108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 17:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 17:38:47 +0000 Subject: Change in osmo-pcu[master]: Remove uneeded ms param from alloc_algorithm_func_t func References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23109 ) Change subject: Remove uneeded ms param from alloc_algorithm_func_t func ...................................................................... Remove uneeded ms param from alloc_algorithm_func_t func Since a while ago, the data architecture was changed so that TBF is guaranteed to always have a MS object associated. Hence, it makes no sense to pass the MS object as a separate param as we can take it from tbf object and makes code less confusing. Change-Id: Idc0c76cf6f007afa4236480cdad0d8e99dabec5f --- M src/gprs_pcu.h M src/gprs_rlcmac.h M src/gprs_rlcmac_ts_alloc.cpp M src/tbf.cpp M tests/alloc/AllocTest.cpp 5 files changed, 17 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/09/23109/1 diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h index 76e3937..a17144c 100644 --- a/src/gprs_pcu.h +++ b/src/gprs_pcu.h @@ -67,7 +67,6 @@ struct gprs_rlcmac_tbf; typedef int (*alloc_algorithm_func_t)(struct gprs_rlcmac_bts *bts, - struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_tbf); diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 69fd6a4..cf95c37 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -104,13 +104,13 @@ extern "C" { #endif -int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, +int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx); -int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, +int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx); -int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, +int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx); int gprs_rlcmac_paging_request(struct gprs_rlcmac_bts *bts, const struct osmo_mobile_identity *mi, uint16_t pgroup); diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 7202423..1dc31f6 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -338,13 +338,12 @@ * Assign single slot for uplink and downlink * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] ms_ Pointer to MS object * \param[in,out] tbf_ Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, int8_t use_trx) { struct gprs_rlcmac_pdch *pdch; @@ -355,7 +354,7 @@ int usf = -1; uint8_t mask = 0xff; const char *mask_reason = NULL; - const GprsMs *ms = ms_; + struct GprsMs *ms = tbf_->ms(); const gprs_rlcmac_tbf *tbf = tbf_; gprs_rlcmac_trx *trx = ms_current_trx(ms); @@ -420,7 +419,7 @@ tbf_->trx = trx; /* the only one TS is the common TS */ tbf_->first_ts = tbf_->first_common_ts = ts; - ms_set_reserved_slots(ms_, trx, 1 << ts, 1 << ts); + ms_set_reserved_slots(ms, trx, 1 << ts, 1 << ts); tbf_->upgrade_to_multislot = 0; bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_A); @@ -853,13 +852,12 @@ * Assign one uplink slot. (With free USF) * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] ms_ Pointer to MS object * \param[in,out] tbf_ Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, int8_t use_trx) { uint8_t dl_slots; @@ -873,7 +871,7 @@ int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; int rc; int tfi; - const GprsMs *ms = ms_; + struct GprsMs *ms = tbf_->ms(); const gprs_rlcmac_tbf *tbf = tbf_; gprs_rlcmac_trx *trx; @@ -881,10 +879,7 @@ /* Step 1: Get current state from the MS object */ - if (!ms) { - LOGP(DRLCMAC, LOGL_ERROR, "MS not set\n"); - return -EINVAL; - } + OSMO_ASSERT(ms); dl_slots = ms_reserved_dl_slots(ms); ul_slots = ms_reserved_ul_slots(ms); @@ -958,7 +953,7 @@ /* Step 4: Update MS and TBF and really allocate the resources */ - update_ms_reserved_slots(trx, ms_, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots); + update_ms_reserved_slots(trx, ms, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots); tbf_->trx = trx; tbf_->first_common_ts = first_common_ts; @@ -983,13 +978,12 @@ * goal is to provide the highest possible bandwidth per MS. * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] ms_ Pointer to MS object * \param[in,out] tbf_ Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, int8_t use_trx) { int rc; @@ -1002,7 +996,7 @@ } if (!bts->multislot_disabled) { - rc = alloc_algorithm_b(bts, ms_, tbf_, single, use_trx); + rc = alloc_algorithm_b(bts, tbf_, single, use_trx); if (rc >= 0) return rc; @@ -1011,7 +1005,7 @@ bts->multislot_disabled = 1; } - return alloc_algorithm_a(bts, ms_, tbf_, single, use_trx); + return alloc_algorithm_a(bts, tbf_, single, use_trx); } int gprs_alloc_max_dl_slots_per_ms(const struct gprs_rlcmac_bts *bts, uint8_t ms_class) diff --git a/src/tbf.cpp b/src/tbf.cpp index 2f58375..5ca34f4 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -331,7 +331,7 @@ LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF update **********\n"); tbf_unlink_pdch(this); - rc = the_pcu->alloc_algorithm(bts, ms(), this, false, -1); + rc = the_pcu->alloc_algorithm(bts, this, false, -1); /* if no resource */ if (rc < 0) { LOGPTBF(this, LOGL_ERROR, "No resource after update???\n"); @@ -749,7 +749,7 @@ m_created_ts = time(NULL); /* select algorithm */ - rc = the_pcu->alloc_algorithm(bts, m_ms, this, single_slot, use_trx); + rc = the_pcu->alloc_algorithm(bts, this, single_slot, use_trx); /* if no resource */ if (rc < 0) { LOGPTBF(this, LOGL_NOTICE, diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index d626692..fe803e3 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -423,9 +423,6 @@ test_all_alloc_b(); } -typedef int (*algo_t)(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, - int8_t use_trx); - static char get_dir_char(uint8_t mask, uint8_t tx, uint8_t rx, uint8_t busy) { int offs = busy ? 32 : 0; @@ -640,7 +637,7 @@ return counter; } -static void test_successive_allocation(algo_t algo, unsigned min_class, +static void test_successive_allocation(alloc_algorithm_func_t algo, unsigned min_class, unsigned max_class, enum test_mode mode, unsigned expect_num, const char *text) { @@ -674,7 +671,7 @@ talloc_free(bts); } -static void test_many_connections(algo_t algo, unsigned expect_num, +static void test_many_connections(alloc_algorithm_func_t algo, unsigned expect_num, const char *text) { struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idc0c76cf6f007afa4236480cdad0d8e99dabec5f Gerrit-Change-Number: 23109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 17:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 25 Feb 2021 17:38:47 +0000 Subject: Change in osmo-pcu[master]: bts: Add new stats to detect TBF allocation failure reasons References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23110 ) Change subject: bts: Add new stats to detect TBF allocation failure reasons ...................................................................... bts: Add new stats to detect TBF allocation failure reasons This is specially useful to detect for instance if a cell is handling too many users, ending up in TFI or USF exhaustions. This information can be later in the future used to tune TBF allocation algorithm behavior (either manually/statially through config file, or automatically/dynamically in code based on some thresholds). Related: OS#5042 Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_ts_alloc.cpp 3 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/10/23110/1 diff --git a/src/bts.cpp b/src/bts.cpp index 8d1fb3f..52c3856 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -100,7 +100,11 @@ { "tbf:reused", "TBF Reused "}, { "tbf:alloc:algo-a", "TBF Alloc Algo A "}, { "tbf:alloc:algo-b", "TBF Alloc Algo B "}, - { "tbf:alloc:failed", "TBF Alloc Failure "}, + { "tbf:alloc:failed", "TBF Alloc Failure (ALL)"}, + { "tbf:alloc:failed:no_tfi", "TBF Alloc Failure (TFIs exhausted)"}, + { "tbf:alloc:failed:no_usf", "TBF Alloc Failure (USFs exhausted)"}, + { "tbf:alloc:failed:no_slot_combi", "TBF Alloc Failure (No valid UL/DL slot combination found)"}, + { "tbf:alloc:failed:no_slot_avail", "TBF Alloc Failure (No slot available)"}, { "rlc:sent", "RLC Sent "}, { "rlc:resent", "RLC Resent "}, { "rlc:restarted", "RLC Restarted "}, @@ -580,7 +584,7 @@ * that is currently not used in any PDCH of a the TRX with least TFIs currently * assigned. Negative values indicate errors. */ -int bts_tfi_find_free(const struct gprs_rlcmac_bts *bts, enum gprs_rlcmac_tbf_direction dir, +int bts_tfi_find_free(struct gprs_rlcmac_bts *bts, enum gprs_rlcmac_tbf_direction dir, uint8_t *_trx, int8_t use_trx) { uint8_t trx_from, trx_to, trx; @@ -609,6 +613,7 @@ if (best_trx_nr == 0xff || best_cnt == 0) { LOGP(DRLCMAC, LOGL_NOTICE, "No TFI available (suggested TRX: %d).\n", use_trx); + bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL_NO_TFI); return -EBUSY; } diff --git a/src/bts.h b/src/bts.h index d321b8d..f780f43 100644 --- a/src/bts.h +++ b/src/bts.h @@ -88,6 +88,10 @@ CTR_TBF_ALLOC_ALGO_A, CTR_TBF_ALLOC_ALGO_B, CTR_TBF_ALLOC_FAIL, + CTR_TBF_ALLOC_FAIL_NO_TFI, + CTR_TBF_ALLOC_FAIL_NO_USF, + CTR_TBF_ALLOC_FAIL_NO_SLOT_COMBI, + CTR_TBF_ALLOC_FAIL_NO_SLOT_AVAIL, CTR_RLC_SENT, CTR_RLC_RESENT, CTR_RLC_RESTARTED, @@ -284,7 +288,7 @@ return bts->cur_fn; } -int bts_tfi_find_free(const struct gprs_rlcmac_bts *bts, enum gprs_rlcmac_tbf_direction dir, +int bts_tfi_find_free(struct gprs_rlcmac_bts *bts, enum gprs_rlcmac_tbf_direction dir, uint8_t *_trx, int8_t use_trx); int bts_rcv_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip); diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 1dc31f6..cb49848 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -305,7 +305,7 @@ * \param[out] trx_no_ TRX number on which TFI was found * \returns negative error code or 0 on success */ -static int tfi_find_free(const struct gprs_rlcmac_bts *bts, const gprs_rlcmac_trx *trx, const GprsMs *ms, +static int tfi_find_free(struct gprs_rlcmac_bts *bts, const gprs_rlcmac_trx *trx, const GprsMs *ms, enum gprs_rlcmac_tbf_direction dir, int8_t use_trx, uint8_t *trx_no_) { int tfi; @@ -647,6 +647,7 @@ if (!max_ul_slots || !max_dl_slots) { LOGP(DRLCMAC, LOGL_NOTICE, "No valid UL/DL slot combination found\n"); + bts_do_rate_ctr_inc(trx->bts, CTR_TBF_ALLOC_FAIL_NO_SLOT_COMBI); return -EINVAL; } @@ -719,6 +720,7 @@ if (!sl) { LOGP(DRLCMAC, LOGL_NOTICE, "No %s slots available\n", tbf->direction != GPRS_RLCMAC_DL_TBF ? "uplink" : "downlink"); + bts_do_rate_ctr_inc(trx->bts, CTR_TBF_ALLOC_FAIL_NO_SLOT_AVAIL); return -EINVAL; } @@ -771,6 +773,7 @@ if (!ul_slots) { LOGP(DRLCMAC, LOGL_NOTICE, "No USF available\n"); + bts_do_rate_ctr_inc(trx->bts, CTR_TBF_ALLOC_FAIL_NO_USF); return -EBUSY; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 Gerrit-Change-Number: 23110 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:05:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:05:56 +0000 Subject: Change in pysim[master]: utils: catch exceptions during reader initalitation In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/23028 ) Change subject: utils: catch exceptions during reader initalitation ...................................................................... utils: catch exceptions during reader initalitation Failed reader initializations happen frome time to time, mostly because of messed up commandline arguments. This results in ugly crashes very often. Lets control this a bit by catching the exception string and print it. Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 --- M pySim-prog.py M pySim-read.py M pySim/utils.py 3 files changed, 25 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index cf503d0..fbf2b73 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -720,6 +720,8 @@ # Init card reader driver sl = init_reader(opts) + if sl is None: + exit(1) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim-read.py b/pySim-read.py index f901260..7906685 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -82,6 +82,8 @@ # Init card reader driver sl = init_reader(opts) + if sl is None: + exit(1) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim/utils.py b/pySim/utils.py index c150184..67bfa74 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -607,24 +607,28 @@ """ Init card reader driver """ - if opts.pcsc_dev is not None: - print("Using PC/SC reader interface") - from pySim.transport.pcsc import PcscSimLink - sl = PcscSimLink(opts.pcsc_dev) - elif opts.osmocon_sock is not None: - print("Using Calypso-based (OsmocomBB) reader interface") - from pySim.transport.calypso import CalypsoSimLink - sl = CalypsoSimLink(sock_path=opts.osmocon_sock) - elif opts.modem_dev is not None: - print("Using modem for Generic SIM Access (3GPP TS 27.007)") - from pySim.transport.modem_atcmd import ModemATCommandLink - sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud) - else: # Serial reader is default - print("Using serial reader interface") - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) + try: + if opts.pcsc_dev is not None: + print("Using PC/SC reader interface") + from pySim.transport.pcsc import PcscSimLink + sl = PcscSimLink(opts.pcsc_dev) + elif opts.osmocon_sock is not None: + print("Using Calypso-based (OsmocomBB) reader interface") + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) + elif opts.modem_dev is not None: + print("Using modem for Generic SIM Access (3GPP TS 27.007)") + from pySim.transport.modem_atcmd import ModemATCommandLink + sl = ModemATCommandLink(device=opts.modem_dev, baudrate=opts.modem_baud) + else: # Serial reader is default + print("Using serial reader interface") + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) + return sl + except Exception as e: + print("Card reader initialization failed with exception:\n" + str(e)) + return None - return sl def enc_ePDGSelection(hexstr, mcc, mnc, epdg_priority='0001', epdg_fqdn_format='00'): """ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I313017355da01bbef7c3d3f1899555aadb509319 Gerrit-Change-Number: 23028 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:05:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:05:57 +0000 Subject: Change in pysim[master]: serial: don't crash if the device does not exist In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/23029 ) Change subject: serial: don't crash if the device does not exist ...................................................................... serial: don't crash if the device does not exist The most common reason for pySim to crash is when it is executed without commandline parameters. Then pySim will expect a serial reader on /dev/ttyUSB0 since this is the default. Lets check if /dev/ttyUSB0 even exists before trying to open it. Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 --- M pySim/transport/serial.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index 61195e0..b841b3e 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -25,6 +25,7 @@ import serial import time +import os.path from pySim.exceptions import NoCardError, ProtocolError from pySim.transport import LinkBase @@ -34,6 +35,8 @@ class SerialSimLink(LinkBase): def __init__(self, device='/dev/ttyUSB0', baudrate=9600, rst='-rts', debug=False): + if not os.path.exists(device): + raise ValueError("device file %s does not exist -- abort" % device) self._sl = serial.Serial( port = device, parity = serial.PARITY_EVEN, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7545c728b531e9a796eee8f80f0b08d4097f8399 Gerrit-Change-Number: 23029 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:05:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:05:58 +0000 Subject: Change in pysim[master]: serial: do not try to close non existing serial connection In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/23030 ) Change subject: serial: do not try to close non existing serial connection ...................................................................... serial: do not try to close non existing serial connection The SerialSimLink only has an _sl member if serial initalization was successfull. If we close a serial connection, check if we even have the _sl member. Otherwise move on silently. Change-Id: Ic3f3f5e50d780f424da7d0be5733d7167bb7159c --- M pySim/transport/serial.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index b841b3e..7785b4a 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -52,7 +52,8 @@ self._atr = None def __del__(self): - self._sl.close() + if (hasattr(self, "_sl")): + self._sl.close() def wait_for_card(self, timeout=None, newcardonly=False): # Direct try -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic3f3f5e50d780f424da7d0be5733d7167bb7159c Gerrit-Change-Number: 23030 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:08:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:08:31 +0000 Subject: Change in osmo-pcu[master]: tbf: Log timeslot allocation failure In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23105 ) Change subject: tbf: Log timeslot allocation failure ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/23105/1/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23105/1/src/tbf.cpp at 763 PS1, Line 763: return -1; Should we log an error here too? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48fc1eac37eeb74649bfc0888e06afc0079a58f8 Gerrit-Change-Number: 23105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 22:08:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:09:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:09:44 +0000 Subject: Change in osmo-pcu[master]: bts: Count TBF TS allocation failure In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23106 ) Change subject: bts: Count TBF TS allocation failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0696bf77364bd31b96c00614a58ce66809683d1c Gerrit-Change-Number: 23106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 22:09:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:18:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:18:07 +0000 Subject: Change in osmo-pcu[master]: pdch: Standarize and improve logging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23107 ) Change subject: pdch: Standarize and improve logging ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/23107/1/src/pdch.h File src/pdch.h: https://gerrit.osmocom.org/c/osmo-pcu/+/23107/1/src/pdch.h at 199 PS1, Line 199: LOGP(category, level, "PDCH(BTS=%" PRIu8 ",TRX=%" PRIu8 ",TS=%" PRIu8 ") " fmt, \ I would use lower case for 'bts'/'trx'/'ts' here for consistency with osmo-bts. https://gerrit.osmocom.org/c/osmo-pcu/+/23107/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23107/1/src/pdch.cpp at 691 PS1, Line 691: "but TLLI 0x%08x is unknown\n", report->TLLI); alignment (not critical) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 Gerrit-Change-Number: 23107 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 22:18:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:21:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:21:19 +0000 Subject: Change in osmo-pcu[master]: tbf: Improve logging when TBF being allocated or no TBF avail In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23108 ) Change subject: tbf: Improve logging when TBF being allocated or no TBF avail ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/23108/1/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23108/1/src/tbf_dl.cpp at 133 PS1, Line 133: MS_CLASS=%d/%d This part becomes redundant, since it's also printed by LOGPMS() itself. https://gerrit.osmocom.org/c/osmo-pcu/+/23108/1/src/tbf_ul.cpp File src/tbf_ul.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23108/1/src/tbf_ul.cpp at 107 PS1, Line 107: MS_CLASS=%d/%d This part becomes redundant, since it's also printed by LOGPMS() itself. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f Gerrit-Change-Number: 23108 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 22:21:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:23:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:23:05 +0000 Subject: Change in osmo-pcu[master]: Remove uneeded ms param from alloc_algorithm_func_t func In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23109 ) Change subject: Remove uneeded ms param from alloc_algorithm_func_t func ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idc0c76cf6f007afa4236480cdad0d8e99dabec5f Gerrit-Change-Number: 23109 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 22:23:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Feb 25 22:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 25 Feb 2021 22:31:17 +0000 Subject: Change in osmo-pcu[master]: bts: Add new stats to detect TBF allocation failure reasons In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23110 ) Change subject: bts: Add new stats to detect TBF allocation failure reasons ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/23110/1/src/bts.cpp File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23110/1/src/bts.cpp at a583 PS1, Line 583: const Do you really need to drop 'const'? bts_do_rate_ctr_inc() does not change 'struct gprs_rlcmac_bts', but one of its fields. I think we can keep it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 Gerrit-Change-Number: 23110 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 25 Feb 2021 22:31:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 00:05:51 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 26 Feb 2021 00:05:51 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23111 ) Change subject: Correct configuration written from vty ...................................................................... Correct configuration written from vty osmo-hlr would not read back written configuration due to bad indentation in the mslookup->server->service section. Also ipa-name was missing. Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb --- M src/dgsm_vty.c M src/hlr_vty.c 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/23111/1 diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c index 6f29d3b..00a60ea 100644 --- a/src/dgsm_vty.c +++ b/src/dgsm_vty.c @@ -442,7 +442,7 @@ msc = mslookup_server_msc_get(&mslookup_server_msc_wildcard, false); if (msc) - config_write_msc_services(vty, " ", msc); + config_write_msc_services(vty, " ", msc); llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) { if (!osmo_ipa_name_cmp(&mslookup_server_msc_wildcard, &msc->name)) diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 4b91aa9..df2270b 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -102,6 +102,8 @@ vty_out(vty, " gsup%s", VTY_NEWLINE); if (g_hlr->gsup_bind_addr) vty_out(vty, " bind ip %s%s", g_hlr->gsup_bind_addr, VTY_NEWLINE); + if (g_hlr->gsup_unit_name.serno) + vty_out(vty, " ipa-name %s%s", g_hlr->gsup_unit_name.serno, VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 00:11:39 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 26 Feb 2021 00:11:39 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 to look at the new patch set (#2). Change subject: Correct configuration written from vty ...................................................................... Correct configuration written from vty osmo-hlr would not read back written configuration due to bad indentation in the mslookup->server->service section. Also ipa-name was missing. Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb --- M src/dgsm_vty.c M src/hlr_vty.c M tests/test_nodes.vty 3 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/23111/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 00:12:29 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 26 Feb 2021 00:12:29 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 to look at the new patch set (#3). Change subject: Correct configuration written from vty ...................................................................... Correct configuration written from vty osmo-hlr would not read back written configuration due to bad indentation in the mslookup->server->service section. Also ipa-name was missing. Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb --- M src/dgsm_vty.c M src/hlr_vty.c M tests/test_nodes.vty 3 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/23111/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 00:20:51 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 26 Feb 2021 00:20:51 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23111 ) Change subject: Correct configuration written from vty ...................................................................... Patch Set 3: Ah, now I'm actually confused as the the intended format of the vty config. This is what the test file has: mslookup server mdns bind 239.192.23.42 4266 service foo.bar at 123.45.67.89 1011 service baz.bar at 121.31.41.5 1617 service baz.bar at a:b:c::d 1819 msc MSC-1 msc msc-901-70-23 service foo.bar at 76.54.32.10 1234 service baz.bar at 12.11.10.98 7654 service baz.bar at dd:cc:bb::a 3210 msc msc-901-70-42 service foo.bar at 1.1.1.1 1111 service baz.bar at 2.2.2.2 2222 service baz.bar at 2222:2222:2222::2 2222 client gateway-proxy 1.2.3.4 4222 mdns bind 239.192.23.42 4266 but the program will not read that as it expects the first 3 service lines to have one space more of indentation. They should also be indented for the "service" section, correct? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 26 Feb 2021 00:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 00:21:46 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 26 Feb 2021 00:21:46 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 to look at the new patch set (#4). Change subject: Correct configuration written from vty ...................................................................... Correct configuration written from vty osmo-hlr would not read back written configuration due to bad indentation in the mslookup->server->service section. Also ipa-name was missing. Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb --- M src/dgsm_vty.c M src/hlr_vty.c M tests/test_nodes.vty 3 files changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/23111/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 26 01:57:14 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 01:57:14 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6038558673ca0_6772ac5bdd365f035025a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 218s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 218s] [COMPILING libboard/qmod/source/card_pres.c] [ 218s] [COMPILING libboard/qmod/source/wwan_led.c] [ 218s] [COMPILING libboard/qmod/source/i2c.c] [ 218s] [COMPILING libboard/qmod/source/board_qmod.c] [ 219s] [COMPILING apps/dfu/main.c] [ 219s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 219s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 219s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 220s] Memory region Used Size Region Size %age Used [ 220s] rom: 16588 B 16 KB 101.25% [ 220s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 220s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 220s] collect2: error: ld returned 1 exit status [ 220s] % [ 220s] make[2]: *** [Makefile:234: flash] Error 1 [ 220s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 220s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 220s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 220s] dh_auto_build: error: make -j1 returned exit code 2 [ 220s] make: *** [debian/rules:16: build] Error 25 [ 220s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 220s] ### VM INTERACTION START ### [ 223s] [ 206.333627] sysrq: Power Off [ 223s] [ 206.341200] reboot: Power down [ 223s] ### VM INTERACTION END ### [ 223s] [ 223s] old-atreju2 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 26 01:56:50 UTC 2021. [ 223s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Feb 26 02:01:32 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 02:01:32 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <60385686654b4_6772ac5bdd365f035204f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 201s] [COMPILING apps/dfu/main.c] [ 201s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 201s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 201s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 202s] Memory region Used Size Region Size %age Used [ 202s] rom: 16580 B 16 KB 101.20% [ 202s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 202s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 202s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 202s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 202s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 202s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 202s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 202s] collect2: error: ld returned 1 exit status [ 202s] % [ 202s] make[2]: *** [Makefile:234: flash] Error 1 [ 202s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 202s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 202s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 202s] dh_auto_build: error: make -j1 returned exit code 2 [ 202s] make: *** [debian/rules:16: build] Error 25 [ 202s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 202s] ### VM INTERACTION START ### [ 205s] [ 191.401646] sysrq: Power Off [ 205s] [ 191.407729] reboot: Power down [ 205s] ### VM INTERACTION END ### [ 205s] [ 205s] lamb09 failed "build simtrace2_0.7.0.70.657c.dsc" at Fri Feb 26 02:01:17 UTC 2021. [ 205s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:02:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:02:53 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: support epoch References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23112 ) Change subject: osmo-release.sh: support epoch ...................................................................... osmo-release.sh: support epoch Related: OS#5046 Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 --- M osmo-release.sh 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/23112/1 diff --git a/osmo-release.sh b/osmo-release.sh index 31cd1a0..4d002cb 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -99,6 +99,15 @@ exit 1 fi +# Add missing epoch (OS#5046) +NEW_VER_WITH_EPOCH="$NEW_VER" +case "$VERSION" in +*:*) + epoch="$(echo "$VERSION" | cut -d: -f1)" + NEW_VER_WITH_EPOCH="$epoch:$NEW_VER" + ;; +esac + echo "Releasing $VERSION -> $NEW_VER..." check_configureac_debctrl_deps_match @@ -169,7 +178,14 @@ git add TODO-RELEASE fi -gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" +gbp dch \ + --debian-tag='%(version)s' \ + --auto \ + --meta \ + --git-author \ + --multimaint-merge \ + --ignore-branch \ + --new-version="$NEW_VER_WITH_EPOCH" dch -r -m --distribution "unstable" "" git add ${GIT_TOPDIR}/debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 Gerrit-Change-Number: 23112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:33:16 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:33:16 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23001 to look at the new patch set (#4). Change subject: jenkins-common.sh: add common clean up trap ...................................................................... jenkins-common.sh: add common clean up trap Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning of the jenkins.sh files. Move the common clean up code from the end of every jenkins.sh file into clean_up_common(), which gets called by the trap. Add a custom clean_up() function to those jenkins.sh files that need additional clean up. Replace explicit container stop commands (for containers attached to the docker network) with one call to network_clean() in clean_up_common(). It kills all containers attached to the docker network. The motivation for this change is the upcoming optional build of initrd and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a short smoke test will be performed to make sure we can boot the kernel and initrd, before continuing to run the entire testsuite against it. If building or the smoke test fails, we must do a proper clean up of the network and fix permissions. Related: OS#3208 Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 25 files changed, 100 insertions(+), 177 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/23001/4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:33:16 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:33:16 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23002 to look at the new patch set (#4). Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... */jenkins.sh: set -e after setting clean up trap Abort the script and trigger the clean up script, whenever any of the commands below to prepare the testsuite are failing. This saves time with figuring out why suddenly all or most tests are failing, and avoids running the entire testsuite on jenkins if it's obviously not going to work. Related: OS#3208 Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 --- M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 24 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/02/23002/4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:33:42 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:33:42 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... Patch Set 4: Verified+1 Code-Review+2 adjusted ttcn3-cbc-test too, re-applying +2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 08:33:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:33:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:33:54 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 ) Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... Patch Set 4: Verified+1 Code-Review+2 adjusted ttcn3-cbc-test too, re-applying +2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 08:33:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:01 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:01 +0000 Subject: Change in docker-playground[master]: jenkins-common: put fix_perms() in clean_up_common In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23003 ) Change subject: jenkins-common: put fix_perms() in clean_up_common ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 Gerrit-Change-Number: 23003 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 08:34:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:08 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:08 +0000 Subject: Change in docker-playground[master]: osmo-ggsn-master: add configure --enable-gtp-linux In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23004 ) Change subject: osmo-ggsn-master: add configure --enable-gtp-linux ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 Gerrit-Change-Number: 23004 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 08:34:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:14 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:14 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 08:34:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:37 +0000 Subject: Change in docker-playground[master]: jenkins-common.sh: add common clean up trap In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23001 ) Change subject: jenkins-common.sh: add common clean up trap ...................................................................... jenkins-common.sh: add common clean up trap Add set_clean_up_trap() in jenkins-common.sh and run it at the beginning of the jenkins.sh files. Move the common clean up code from the end of every jenkins.sh file into clean_up_common(), which gets called by the trap. Add a custom clean_up() function to those jenkins.sh files that need additional clean up. Replace explicit container stop commands (for containers attached to the docker network) with one call to network_clean() in clean_up_common(). It kills all containers attached to the docker network. The motivation for this change is the upcoming optional build of initrd and kernel during ttcn3-ggsn-test/jenkins.sh. After building these, a short smoke test will be performed to make sure we can boot the kernel and initrd, before continuing to run the entire testsuite against it. If building or the smoke test fails, we must do a proper clean up of the network and fix permissions. Related: OS#3208 Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 25 files changed, 100 insertions(+), 177 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index 1cfbbfc..978f003 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -160,6 +160,36 @@ cat "$VOL_BASE_DIR"/*/junit-*.log || true } +clean_up_common() { + set +e + + set +x + echo + echo "### Clean up ###" + echo + set -x + + # Clear trap + trap - EXIT INT TERM 0 + + # Run clean_up() from ttcn3-*/jenkins.sh, if defined + if type clean_up >/dev/null; then + clean_up + fi + + network_clean + network_remove + rm -rf "$VOL_BASE_DIR"/unix + collect_logs +} + +# Run clean up code when the script stops (either by failing command, by ^C, or +# after running through successfully). The caller can define a custom clean_up +# function. +set_clean_up_trap() { + trap clean_up_common EXIT INT TERM 0 +} + set -x # non-jenkins execution: assume local user name diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index fff96b7..cd59c99 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -9,6 +9,8 @@ "debian-stretch-titan" \ "nplab-m3ua-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ @@ -34,8 +36,3 @@ -v $VOL_BASE_DIR/m3ua-tester:/data \ --name ${BUILD_TAG}-m3ua-test \ $REPO_USER/nplab-m3ua-test > $VOL_BASE_DIR/junit-xml-m3ua.log - -docker container stop -t 1 ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index d62ac29..baf1c9b 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -9,6 +9,8 @@ "sigtran-tests" \ "nplab-sua-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ @@ -34,8 +36,3 @@ -v $VOL_BASE_DIR/sua-tester:/data \ --name ${BUILD_TAG}-sua-test \ $REPO_USER/nplab-sua-test > $VOL_BASE_DIR/junit-xml-sua.log - -docker container stop -t 1 ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 5d30f42..4018dc0 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -58,6 +58,8 @@ "debian-stretch-jenkins" \ "osmo-gsm-tester" +set_clean_up_trap + SUBNET=50 network_create $SUBNET @@ -101,12 +103,6 @@ $REPO_USER/osmo-gsm-tester rc=$? -echo Stopping containers -docker container kill ${BUILD_TAG}-ogt-slave - -network_remove -collect_logs - RED='\033[0;31m' GREEN='\033[0;32m' NC='\033[0m' # No Color diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index c040a0a..9bb49fb 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -7,6 +7,8 @@ "osmo-bts-$IMAGE_SUFFIX" \ "ttcn3-bsc-test" +set_clean_up_trap + #Make sure NET_NAME doesn't clash with the AoIP BSC test NET_NAME=ttcn3-bsc_sccplite-test @@ -48,12 +50,3 @@ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-bsc-test - -echo Stopping containers -for i in `seq 0 2`; do - docker container kill ${BUILD_TAG}-bts$i -done -docker container kill ${BUILD_TAG}-bsc - -network_remove -collect_logs diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index a807c49..460ab38 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -8,6 +8,8 @@ "osmo-bts-$IMAGE_SUFFIX" \ "ttcn3-bsc-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ @@ -62,13 +64,3 @@ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-bsc-test - -echo Stopping containers -for i in `seq 0 2`; do - docker container kill ${BUILD_TAG}-bts$i -done -docker container kill ${BUILD_TAG}-bsc -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index 9b04955..e0cd654 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -6,6 +6,7 @@ "osmo-nitb-$IMAGE_SUFFIX" \ "ttcn3-bscnat-test" +set_clean_up_trap mkdir $VOL_BASE_DIR/bscnat-tester cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ @@ -36,9 +37,3 @@ --name ${BUILD_TAG}-ttcn3-bscnat-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-bscnat-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-bscnat - -network_remove -collect_logs diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 8381a8b..610b3c7 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -9,6 +9,17 @@ "osmocom-bb-host-master" \ "ttcn3-bts-test" +set_clean_up_trap + +clean_up() { + # append ':hopping' to the classnames, + # e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'" + # e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'" + # so the hopping test cases would not interfere with non-hopping ones in Jenkins + sed -i "s/classname='\([^']\+\)'/classname='\1:hopping'/g" \ + $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log +} + start_bsc() { echo Starting container with BSC docker run --rm \ @@ -170,20 +181,3 @@ start_bsc start_bts trx 1 start_testsuite hopping -# append ':hopping' to the classnames, -# e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'" -# e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'" -# so the hopping test cases would not interfere with non-hopping ones in Jenkins -sed -i "s/classname='\([^']\+\)'/classname='\1:hopping'/g" \ - $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log - -echo Stopping containers -docker container kill ${BUILD_TAG}-trxcon -docker container kill ${BUILD_TAG}-fake_trx -docker container kill ${BUILD_TAG}-bsc -docker container kill ${BUILD_TAG}-bts -docker container kill ${BUILD_TAG}-bsc - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 40311fd..d8735cf 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-cbc-$IMAGE_SUFFIX" \ "ttcn3-cbc-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/cbc-tester cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ @@ -36,9 +38,3 @@ --name ${BUILD_TAG}-ttcn3-cbc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-cbc-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-cbc - -network_remove -collect_logs diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 9402006..0baafd7 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -5,6 +5,8 @@ docker_images_require \ "ttcn3-fr-test" +set_clean_up_trap + SUBNET=26 network_create $SUBNET @@ -59,10 +61,3 @@ # emulate running container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-fr-test - - -echo Stopping containers -docker container kill ${BUILD_TAG}-frnet - -network_remove -collect_logs diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 352731f..2d1a46f 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -19,6 +19,8 @@ "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" +set_clean_up_trap + SUBNET=25 network_create $SUBNET @@ -72,9 +74,3 @@ # emulate runnign container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-gbproxy-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-gbproxy - -network_remove -collect_logs diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index cc29a3c..b62b757 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-gbproxy-$IMAGE_SUFFIX" \ "ttcn3-gbproxy-test" +set_clean_up_trap + SUBNET=24 network_create $SUBNET @@ -39,9 +41,3 @@ --name ${BUILD_TAG}-ttcn3-gbproxy-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-gbproxy-test $@ - -echo Stopping containers -docker container kill ${BUILD_TAG}-gbproxy - -network_remove -collect_logs diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 0aabe8a..674eb8d 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-ggsn-$IMAGE_SUFFIX" \ "ttcn3-ggsn-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ @@ -38,9 +40,3 @@ --name ${BUILD_TAG}-ggsn-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-ggsn-test - -# stop GGSN after test has completed -docker container stop ${BUILD_TAG}-ggsn - -network_remove -collect_logs diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 51a33e8..4dfb9aa 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-hlr-$IMAGE_SUFFIX" \ "ttcn3-hlr-test" +set_clean_up_trap + SUBNET=10 network_create $SUBNET @@ -34,9 +36,3 @@ --name ${BUILD_TAG}-ttcn3-hlr-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-hlr-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-hlr - -network_remove -collect_logs diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index c704005..87c1798 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-mgw-$IMAGE_SUFFIX" \ "ttcn3-mgw-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ @@ -33,9 +35,3 @@ --name ${BUILD_TAG}-ttcn3-mgw-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-mgw-test - -# stop mgw after test has completed -docker container stop ${BUILD_TAG}-mgw - -network_remove -collect_logs diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 90770cb..373fa7e 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-msc-$IMAGE_SUFFIX" \ "ttcn3-msc-test" +set_clean_up_trap + SUBNET=20 network_create $SUBNET @@ -52,11 +54,3 @@ --name ${BUILD_TAG}-ttcn3-msc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-msc-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-msc -docker container kill ${BUILD_TAG}-stp - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index c31ad6d..d0ef972 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -2,6 +2,22 @@ . ../jenkins-common.sh +set_clean_up_trap + +clean_up() { + # start some stupid helper container so we can access the volume + docker run --rm \ + -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \ + -v nitb-vol:/nitb \ + -v bts-vol:/bts \ + --name ${BUILD_TAG}-sysinfo-helper -d \ + busybox /bin/sh -c 'sleep 1000 & wait' + docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR + docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR + docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR + docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper +} + SUBNET=5 network_create $SUBNET @@ -35,22 +51,3 @@ -v ttcn3-nitb-sysinfo-vol:/data \ --name ${BUILD_TAG}-ttcn3-nitb-sysinfo \ $REPO_USER/ttcn3-nitb-sysinfo - -# stop bts + nitb after test has completed -docker container stop ${BUILD_TAG}-bts -docker container stop ${BUILD_TAG}-nitb - -# start some stupid helper container so we can access the volume -docker run --rm \ - -v ttcn3-nitb-sysinfo-vol:/ttcn3-nitb-sysinfo \ - -v nitb-vol:/nitb \ - -v bts-vol:/bts \ - --name ${BUILD_TAG}-sysinfo-helper -d \ - busybox /bin/sh -c 'sleep 1000 & wait' -docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR -docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR -docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR -docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper - -network_remove -collect_logs diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 9428776..f9e96ed 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -6,6 +6,8 @@ "osmo-pcu-$IMAGE_SUFFIX" \ "ttcn3-pcu-test" +set_clean_up_trap + SUBNET=14 network_create $SUBNET @@ -40,10 +42,3 @@ --name ${BUILD_TAG}-ttcn3-pcu-test-sns \ $DOCKER_ARGS \ $REPO_USER/ttcn3-pcu-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-pcu-sns - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 5dedec7..539b956 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-pcu-$IMAGE_SUFFIX" \ "ttcn3-pcu-test" +set_clean_up_trap + SUBNET=13 network_create $SUBNET @@ -40,10 +42,3 @@ --name ${BUILD_TAG}-ttcn3-pcu-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-pcu-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-pcu - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 58279b9..9a62581 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-remsim-$IMAGE_SUFFIX" \ "ttcn3-remsim-test" +set_clean_up_trap + start_server() { echo Starting container with osmo-remsim-server docker run --rm \ @@ -87,7 +89,3 @@ start_client cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ start_testsuite -docker container kill ${BUILD_TAG}-client - -network_remove -collect_logs diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index b47589c..c73e7c7 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-stp-master" \ "ttcn3-sccp-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/sccp-tester cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ @@ -36,8 +38,3 @@ --name ${BUILD_TAG}-ttcn3-sccp-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-sccp-test - -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 9e16c3e..1cbc855 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-sgsn-$IMAGE_SUFFIX" \ "ttcn3-sgsn-test" +set_clean_up_trap + SUBNET=8 network_create $SUBNET @@ -49,10 +51,3 @@ --name ${BUILD_TAG}-ttcn3-sgsn-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-sgsn-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-sgsn -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 36252b0..de9b87c 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-sip-$IMAGE_SUFFIX" \ "ttcn3-sip-test" +set_clean_up_trap + SUBNET=11 network_create $SUBNET @@ -40,10 +42,3 @@ --name ${BUILD_TAG}-ttcn3-sip-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-sip-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-sip-connector - -network_remove -rm -rf $VOL_BASE_DIR/unix -collect_logs diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index ba824c1..9e7f66c 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -7,6 +7,8 @@ "osmo-smlc-$IMAGE_SUFFIX" \ "ttcn3-smlc-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/smlc-tester cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/ @@ -47,10 +49,3 @@ --name ${BUILD_TAG}-ttcn3-smlc-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-smlc-test - -echo Stopping containers -docker container kill ${BUILD_TAG}-smlc -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 1b20c3f..b15ae4b 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -6,6 +6,8 @@ "osmo-stp-$IMAGE_SUFFIX" \ "ttcn3-stp-test" +set_clean_up_trap + mkdir $VOL_BASE_DIR/stp-tester cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ @@ -33,8 +35,3 @@ --name ${BUILD_TAG}-ttcn3-stp-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-stp-test - -docker container kill ${BUILD_TAG}-stp - -network_remove -collect_logs -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I807c6221d22fec31db23e2516e477a3eb43347fb Gerrit-Change-Number: 23001 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:39 +0000 Subject: Change in docker-playground[master]: */jenkins.sh: set -e after setting clean up trap In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23002 ) Change subject: */jenkins.sh: set -e after setting clean up trap ...................................................................... */jenkins.sh: set -e after setting clean up trap Abort the script and trigger the clean up script, whenever any of the commands below to prepare the testsuite are failing. This saves time with figuring out why suddenly all or most tests are failing, and avoids running the entire testsuite on jenkins if it's obviously not going to work. Related: OS#3208 Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 --- M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh 24 files changed, 24 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index cd59c99..1e9a248 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -10,6 +10,7 @@ "nplab-m3ua-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/m3ua-tester cp m3ua-param-testtool.scm all-sgp-tests.txt $VOL_BASE_DIR/m3ua-tester/ diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index baf1c9b..eeb0f06 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -10,6 +10,7 @@ "nplab-sua-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/sua-tester cp sua-param-testtool-sgp.scm some-sua-sgp-tests.txt $VOL_BASE_DIR/sua-tester/ diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 4018dc0..ae645e7 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -59,6 +59,7 @@ "osmo-gsm-tester" set_clean_up_trap +set -e SUBNET=50 network_create $SUBNET diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 9bb49fb..bc6eaa0 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -8,6 +8,7 @@ "ttcn3-bsc-test" set_clean_up_trap +set -e #Make sure NET_NAME doesn't clash with the AoIP BSC test NET_NAME=ttcn3-bsc_sccplite-test diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 460ab38..18236a2 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -9,6 +9,7 @@ "ttcn3-bsc-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index e0cd654..1182df0 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-bscnat-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/bscnat-tester cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 610b3c7..5fab160 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -10,6 +10,7 @@ "ttcn3-bts-test" set_clean_up_trap +set -e clean_up() { # append ':hopping' to the classnames, diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index d8735cf..5c2bf5d 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-cbc-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/cbc-tester cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 0baafd7..ee76984 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -6,6 +6,7 @@ "ttcn3-fr-test" set_clean_up_trap +set -e SUBNET=26 network_create $SUBNET diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 2d1a46f..d1ecb0a 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -20,6 +20,7 @@ "ttcn3-gbproxy-test" set_clean_up_trap +set -e SUBNET=25 network_create $SUBNET diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index b62b757..3595c16 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-gbproxy-test" set_clean_up_trap +set -e SUBNET=24 network_create $SUBNET diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 674eb8d..95cbc2f 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-ggsn-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 4dfb9aa..e003e03 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-hlr-test" set_clean_up_trap +set -e SUBNET=10 network_create $SUBNET diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 87c1798..f9d0133 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-mgw-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 373fa7e..dd91e24 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-msc-test" set_clean_up_trap +set -e SUBNET=20 network_create $SUBNET diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index d0ef972..e2cc494 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -3,6 +3,7 @@ . ../jenkins-common.sh set_clean_up_trap +set -e clean_up() { # start some stupid helper container so we can access the volume diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index f9e96ed..aaed27a 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -7,6 +7,7 @@ "ttcn3-pcu-test" set_clean_up_trap +set -e SUBNET=14 network_create $SUBNET diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 539b956..11c77ad 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-pcu-test" set_clean_up_trap +set -e SUBNET=13 network_create $SUBNET diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 9a62581..ae013d6 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-remsim-test" set_clean_up_trap +set -e start_server() { echo Starting container with osmo-remsim-server diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index c73e7c7..40ff1f1 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-sccp-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/sccp-tester cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 1cbc855..df500af 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-sgsn-test" set_clean_up_trap +set -e SUBNET=8 network_create $SUBNET diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index de9b87c..ffec3d2 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-sip-test" set_clean_up_trap +set -e SUBNET=11 network_create $SUBNET diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index 9e7f66c..f16536f 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -8,6 +8,7 @@ "ttcn3-smlc-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/smlc-tester cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index b15ae4b..db2ffdd 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -7,6 +7,7 @@ "ttcn3-stp-test" set_clean_up_trap +set -e mkdir $VOL_BASE_DIR/stp-tester cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie68da2affda8c96b3a515a857a921a05f1bf8ef7 Gerrit-Change-Number: 23002 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:39 +0000 Subject: Change in docker-playground[master]: jenkins-common: put fix_perms() in clean_up_common In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23003 ) Change subject: jenkins-common: put fix_perms() in clean_up_common ...................................................................... jenkins-common: put fix_perms() in clean_up_common Don't call fix_perms from collect_logs anymore, it looks like it was only added there to avoid adding it at the end of each jenkins.sh. Now that we have clean_up_common, put it there. Related: OS#3208 Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/jenkins-common.sh b/jenkins-common.sh index 978f003..2d596d6 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -156,7 +156,6 @@ } collect_logs() { - fix_perms cat "$VOL_BASE_DIR"/*/junit-*.log || true } @@ -180,6 +179,7 @@ network_clean network_remove rm -rf "$VOL_BASE_DIR"/unix + fix_perms collect_logs } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6e7e5b35198f420e130b1282eb948b96ccd6c8e0 Gerrit-Change-Number: 23003 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:40 +0000 Subject: Change in docker-playground[master]: osmo-ggsn-master: add configure --enable-gtp-linux In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23004 ) Change subject: osmo-ggsn-master: add configure --enable-gtp-linux ...................................................................... osmo-ggsn-master: add configure --enable-gtp-linux Related: OS#3208 Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 --- M osmo-ggsn-master/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: osmith: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index 3610f74..c52939d 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -29,6 +29,7 @@ apt-get update && \ apt-get install -y --no-install-recommends \ telnet \ + libgtpnl-dev \ libosmocore-dev && \ apt-get clean \ ;; \ @@ -54,7 +55,7 @@ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GGSN_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure && \ + ./configure --enable-gtp-linux && \ make "-j$(nproc)" install && \ ldconfig -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8cf3de4775aa82bfdad1bf2c40aab3b50e910db3 Gerrit-Change-Number: 23004 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 08:34:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 08:34:40 +0000 Subject: Change in docker-playground[master]: ttcn3-ggsn-test: add kernel test In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23005 ) Change subject: ttcn3-ggsn-test: add kernel test ...................................................................... ttcn3-ggsn-test: add kernel test Make it possible to run ttcn3-ggsn-test against osmo-ggsn with the GTP kernel module. This feature is enabled by environment variables explained in ttcn3-ggsn-test/jenkins.sh, and can either use the pre-built kernel from Debian, or build a kernel from source. The kernel runs inside QEMU inside the usual osmo-ggsn-master docker image. Thanks to Pau for providing the kernel config and kernel-test scripts that this patch is based on! I ended up modifying them quite a bit to fit the docker use case, and to build the initrd (so we can use the stock debian kernel). Related: OS#3208 Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d --- M .gitignore M README.md M jenkins-common.sh M osmo-ggsn-latest/Dockerfile M osmo-ggsn-master/Dockerfile A scripts/kernel-test/initrd-build.sh A scripts/kernel-test/initrd-init.sh A scripts/kernel-test/kernel-build.sh A scripts/kernel-test/prepare.sh A scripts/kernel-test/qemu-ifdown.sh A scripts/kernel-test/qemu-ifup.sh A scripts/kernel-test/run-qemu.sh A ttcn3-ggsn-test/fragment.config A ttcn3-ggsn-test/initrd-ggsn.sh M ttcn3-ggsn-test/jenkins.sh A ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg 16 files changed, 773 insertions(+), 9 deletions(-) Approvals: osmith: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/.gitignore b/.gitignore index a16a1a0..0aba0f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .release + +/_cache diff --git a/README.md b/README.md index 925907e..27a589e 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,45 @@ * `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the containers (see "caching" below) +## Kernel test +OsmoGGSN can be configured to either run completely in userspace, or to +use the GTP-U kernel module. To test the kernel module, OsmoGGSN and +the kernel module will run with a Linux kernel (either the pre-built +one from Debian, or a custom built one) in QEMU inside docker. As of +writing, `ttcn3-ggsn-test` is the only testsuite where it makes +sense to test kernel modules. But the same environment variables could +be used for other testsuites in the future. + +Environment variables: +* `KERNEL_TEST`: set to 1 to run the SUT in QEMU +* `KERNEL_BUILD`: set to 1 to build the kernel instead of using the + pre-built one +* `KERNEL_REMOTE_NAME`: git remote name (to add multiple git + repositories in the same local linux clone, default: net-next) +* `KERNEL_URL`: git remote url (default: net-next.git on kernel.org) +* `KERNEL_BRANCH` branch to checkout (default: master) + +### Creating kernel config fragments +For the kernel tests, we are storing kernel config fragments in the git +repository instead of full kernel configs. Generate them as follows: + +``` +$ cd _cache/linux +$ cp custom.config .config +$ make olddefconfig +$ cp .config custom-updated.config +$ make defconfig # config to which to diff +$ scripts/diffconfig -m .config custom-updated.config > fragment.config +``` + +Verify that it was done right: +``` +$ make defconfig +$ scripts/kconfig/merge_config.sh -m .config fragment.config +$ make olddefconfig +$ diff .config custom-updated.config # should be the same +``` + ## Building containers manually Most folders in this repository contain a `Dockerfile`. Build a docker container with the same name as the folder like this: diff --git a/jenkins-common.sh b/jenkins-common.sh index 2d596d6..6c54109 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -1,3 +1,6 @@ +CACHE_DIR="$(realpath ../_cache)" +KERNEL_TEST_DIR="$(realpath ../scripts/kernel-test)" + docker_image_exists() { test -n "$(docker images -q "$REPO_USER/$1")" } @@ -150,9 +153,10 @@ echo Fixing permissions docker run --rm \ -v $VOL_BASE_DIR:/data \ + -v $CACHE_DIR:/cache \ --name ${BUILD_TAG}-cleaner \ $REPO_USER/debian-stretch-build \ - chmod -R a+rX /data/ + chmod -R a+rX /data/ /cache/ } collect_logs() { @@ -190,6 +194,47 @@ trap clean_up_common EXIT INT TERM 0 } +# Generate the initrd, and optionally build a kernel, for tests that involve +# kernel modules. Boot the kernel once in QEMU inside docker to verify that it +# works. See README.md for description of the KERNEL_* environment variables. +# $1: kernel config base (e.g. defconfig, tinyconfig, allnoconfig) +# $2: path to kernel config fragment +# $3: path to project specific initrd build script, which adds the osmo +# program, kernel modules etc. to the initrd (gets sourced by +# scripts/kernel-test/initrd-build.sh) +# $4: docker image name +# $5-n: (optional) additional arguments to "docker run", like a volume +# containing a config file +kernel_test_prepare() { + local kernel_config_base="$1" + local kernel_config_fragment="$2" + local initrd_project_script="$3" + local docker_image="$4" + shift 4 + + mkdir -p "$CACHE_DIR/kernel-test" + + cp "$kernel_config_fragment" \ + "$CACHE_DIR/kernel-test/fragment.config" + cp "$initrd_project_script" \ + "$CACHE_DIR/kernel-test/initrd-project-script.sh" + + docker run \ + --cap-add=NET_ADMIN \ + --device /dev/kvm:/dev/kvm \ + --device /dev/net/tun:/dev/net/tun \ + -v "$CACHE_DIR:/cache" \ + -v "$KERNEL_TEST_DIR:/kernel-test:ro" \ + -e "KERNEL_BRANCH=$KERNEL_BRANCH" \ + -e "KERNEL_BUILD=$KERNEL_BUILD" \ + -e "KERNEL_CONFIG_BASE=$kernel_config_base" \ + -e "KERNEL_REMOTE_NAME=$KERNEL_REMOTE_NAME" \ + -e "KERNEL_URL=$KERNEL_URL" \ + "$@" \ + "$docker_image" \ + "/kernel-test/prepare.sh" +} + set -x # non-jenkins execution: assume local user name diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile index d84dd4e..90b12b9 100644 --- a/osmo-ggsn-latest/Dockerfile +++ b/osmo-ggsn-latest/Dockerfile @@ -19,10 +19,20 @@ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list ADD $OSMOCOM_REPO/Release /tmp/Release -RUN apt-get update && \ +# Disable update-initramfs to save time during apt-get install +RUN ln -s /bin/true /usr/local/bin/update-initramfs && \ + apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ - osmo-ggsn && \ + bc \ + bridge-utils \ + busybox-static \ + ca-certificates \ + libelf-dev \ + linux-image-amd64 \ + osmo-ggsn \ + pax-utils \ + qemu-system-x86 \ + telnet && \ apt-get clean WORKDIR /tmp diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index c52939d..72dcafe 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -24,13 +24,23 @@ # unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM ADD $OSMOCOM_REPO/Release /tmp/Release ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml +# Disable update-initramfs to save time during apt-get install RUN case "$DISTRO" in \ debian*) \ + ln -s /bin/true /usr/local/bin/update-initramfs && \ apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ + bc \ + bridge-utils \ + busybox-static \ + ca-certificates \ + libelf-dev \ libgtpnl-dev \ - libosmocore-dev && \ + libosmocore-dev \ + linux-image-amd64 \ + pax-utils \ + qemu-system-x86 \ + telnet && \ apt-get clean \ ;; \ centos*) \ diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh new file mode 100755 index 0000000..cce4de8 --- /dev/null +++ b/scripts/kernel-test/initrd-build.sh @@ -0,0 +1,114 @@ +#!/bin/sh -ex + +# Add one or more files to the initramfs, with parent directories +# $@: path to files +initrd_add_file() { + cp -a --parents "$@" /tmp/initrd +} + +# Add kernel module files with dependencies +# $@: kernel module names +initrd_add_mod() { + if [ "$KERNEL_BUILD" = 1 ]; then + # Custom kernel will be built, don't add any modules from the + # distribution's kernel to the initramfs. + return + fi + + local kernel="$(basename /lib/modules/*)" + local files="$(modprobe \ + -a \ + --dry-run \ + --show-depends \ + --set-version="$kernel" \ + "$@" \ + | sort -u \ + | cut -d ' ' -f 2)" + + initrd_add_file $files + + # Save the list of modules, so initrd-init.sh can load all of them + for i in $@; do + echo "$i" >> /tmp/initrd/modules + done +} + +# Add binaries with depending libraries +# $@: paths to binaries +initrd_add_bin() { + local bin + local bin_path + local file + + for bin in "$@"; do + local bin_path="$(which "$bin")" + if [ -z "$bin_path" ]; then + echo "ERROR: file not found: $bin" + exit 1 + fi + + lddtree_out="$(lddtree -l "$bin_path")" + if [ -z "$lddtree_out" ]; then + echo "ERROR: lddtree failed on '$bin_path'" + exit 1 + fi + + for file in $lddtree_out; do + initrd_add_file "$file" + + # Copy resolved symlink + if [ -L "$file" ]; then + initrd_add_file "$(realpath "$file")" + fi + done + done +} + +# Add command to run inside the initramfs +# $@: commands +initrd_add_cmd() { + local i + + if ! [ -e /tmp/initrd/cmd.sh ]; then + echo "#!/bin/sh -ex" > /tmp/initrd/cmd.sh + chmod +x /tmp/initrd/cmd.sh + fi + + for i in "$@"; do + echo "$i" >> /tmp/initrd/cmd.sh + done +} + +mkdir -p /tmp/initrd +cd /tmp/initrd + +mkdir -p \ + dev/net \ + proc \ + sbin \ + sys \ + tmp \ + usr/bin \ + usr/sbin + +initrd_add_bin \ + busybox + +initrd_add_mod \ + virtio_net \ + virtio_pci + +initrd_add_file \ + /lib/modules/*/modules.dep + +# Required for osmo-ggsn +mknod dev/net/tun c 10 200 + +cp /kernel-test/initrd-init.sh init + +# Add project specific files (e.g. osmo-ggsn and gtp kernel module) +. /cache/kernel-test/initrd-project-script.sh + +find . -print0 \ + | cpio --quiet -o -0 -H newc \ + | gzip -1 > /cache/kernel-test/initrd diff --git a/scripts/kernel-test/initrd-init.sh b/scripts/kernel-test/initrd-init.sh new file mode 100755 index 0000000..1c198b8 --- /dev/null +++ b/scripts/kernel-test/initrd-init.sh @@ -0,0 +1,38 @@ +#!/bin/busybox sh +echo "Running initrd-init.sh" +set -ex + +export HOME=/root +export LD_LIBRARY_PATH=/usr/local/lib +export PATH=/usr/local/bin:/usr/bin:/bin:/sbin:/usr/local/sbin:/usr/sbin +export TERM=screen + +/bin/busybox --install -s + +hostname qemu + +mount -t proc proc /proc +mount -t sysfs sys /sys + +# Load modules from initrd-build.sh:initrd_add_mod() +if [ -e /modules ]; then + cat /modules | xargs -t -n1 modprobe +fi + +ip link set lo up +ip link set eth0 up + +if grep -q SMOKE_TEST /proc/cmdline; then + # Called from scripts/kernel-test/prepare.sh:kernel_smoke_test() to + # verify that the kernel + initramfs boot up properly. Output this + # string instead of running the actual commands. + echo "SMOKE_TEST_SUCCESS" +else + # Run project specific commands, added with initrd_add_cmd (see + # inird-ggsn.sh for example). Use '|| true' to avoid "attempting to + # kill init" kernel panic on failure. + /cmd.sh || true +fi + +# Avoid kernel panic when init exits +poweroff -f diff --git a/scripts/kernel-test/kernel-build.sh b/scripts/kernel-test/kernel-build.sh new file mode 100755 index 0000000..d261051 --- /dev/null +++ b/scripts/kernel-test/kernel-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -ex +# Environment variables are described in README.md + +KERNEL_REMOTE_NAME="${KERNEL_REMOTE_NAME:-net-next}" +KERNEL_URL="${KERNEL_URL:-https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git}" +KERNEL_BRANCH="${KERNEL_BRANCH:-master}" +KERNEL_DIR=/cache/linux + + +# Add the kernel repository as git remote, fetch it, checkout the given branch +prepare_git_repo() { + if ! [ -d "$KERNEL_DIR" ]; then + mkdir -p "$KERNEL_DIR" + git -C "$KERNEL_DIR" init + fi + + cd "$KERNEL_DIR" + + if ! git remote | grep -q "^$KERNEL_REMOTE_NAME$"; then + git remote add "$KERNEL_REMOTE_NAME" "$KERNEL_URL" + fi + + git fetch "$KERNEL_REMOTE_NAME" + git checkout "$KERNEL_REMOTE_NAME/$KERNEL_BRANCH" +} + +update_kernel_config() { + local previous="/cache/kernel-test/previous.config" + local fragment="/cache/kernel-test/fragment.config" + + cd "$KERNEL_DIR" + make "$KERNEL_CONFIG_BASE" + scripts/kconfig/merge_config.sh -m .config "$fragment" + make olddefconfig + + if [ -e "$previous" ] && ! diff -q "$previous" .config; then + # Remove everything built with previous config + echo "Kernel config changed, running 'make clean'" + make clean + fi + + cp .config "$previous" +} + +prepare_git_repo +update_kernel_config + +make "-j$(nproc)" +cp arch/x86/boot/bzImage /cache/kernel-test/linux diff --git a/scripts/kernel-test/prepare.sh b/scripts/kernel-test/prepare.sh new file mode 100755 index 0000000..0fc9675 --- /dev/null +++ b/scripts/kernel-test/prepare.sh @@ -0,0 +1,23 @@ +#!/bin/sh -ex +KERNEL_BUILD="${KERNEL_BUILD:-0}" + +# Test if the kernel boots up, and initd code runs through without error +kernel_smoke_test() { + local log=/cache/kernel-test/smoke_test.log + /kernel-test/run-qemu.sh SMOKE_TEST > "$log" 2>&1 || true + if ! grep -q SMOKE_TEST_SUCCESS "$log"; then + cat "$log" + echo "ERROR: failed to boot the kernel and initrd in QEMU!" + exit 1 + fi +} + +/kernel-test/initrd-build.sh + +if [ "$KERNEL_BUILD" = 1 ]; then + /kernel-test/kernel-build.sh +else + cp /boot/vmlinuz-* /cache/kernel-test/linux +fi + +kernel_smoke_test diff --git a/scripts/kernel-test/qemu-ifdown.sh b/scripts/kernel-test/qemu-ifdown.sh new file mode 100755 index 0000000..f74f445 --- /dev/null +++ b/scripts/kernel-test/qemu-ifdown.sh @@ -0,0 +1,9 @@ +#!/bin/sh -e +br=br-test +qemu_if=$1 + +echo "[host] qemu-ifdown: $br and $qemu_if" +set +x + +ip link set "$br" down +brctl delbr $br diff --git a/scripts/kernel-test/qemu-ifup.sh b/scripts/kernel-test/qemu-ifup.sh new file mode 100755 index 0000000..809cd4e --- /dev/null +++ b/scripts/kernel-test/qemu-ifup.sh @@ -0,0 +1,18 @@ +#!/bin/sh -e +br=br-test +docker_if=eth0 +qemu_if=$1 + +echo "[host] qemu-ifup: $br, $qemu_if, $docker_if" +set +x + +ip link set "$qemu_if" up + +brctl addbr "$br" +brctl addif "$br" "$qemu_if" +brctl addif "$br" "$docker_if" + +ip link set "$br" up + +ip a +ip route diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh new file mode 100755 index 0000000..0a1824f --- /dev/null +++ b/scripts/kernel-test/run-qemu.sh @@ -0,0 +1,30 @@ +#!/bin/sh -ex +# Arguments are appended to the kernel cmdline + +random_mac() { + printf "52:54:" + date "+%c %N" | sha1sum | sed 's/\(.\{2\}\)/\1:/g' | cut -d: -f 1-4 +} + +KERNEL_CMDLINE=" + root=/dev/ram0 + console=ttyS0 + panic=-1 + $@ +" + +qemu-system-x86_64 \ + -machine pc,accel=kvm \ + -smp 1 \ + -m 512M \ + -nodefconfig -no-user-config -nodefaults -display none \ + -gdb unix:/cache/kernel-test/gdb.pipe,server,nowait \ + -no-reboot \ + -kernel /cache/kernel-test/linux \ + -initrd /cache/kernel-test/initrd \ + -append "${KERNEL_CMDLINE}" \ + -serial stdio \ + -chardev socket,id=charserial1,path=/cache/kernel-test/gdb-serial.pipe,server,nowait \ + -device isa-serial,chardev=charserial1,id=serial1 \ + -netdev tap,id=nettest,script=/kernel-test/qemu-ifup.sh,downscript=/kernel-test/qemu-ifdown.sh \ + -device virtio-net-pci,netdev=nettest,mac="$(random_mac)" diff --git a/ttcn3-ggsn-test/fragment.config b/ttcn3-ggsn-test/fragment.config new file mode 100644 index 0000000..8a72dc2 --- /dev/null +++ b/ttcn3-ggsn-test/fragment.config @@ -0,0 +1,268 @@ +# CONFIG_ACPI_BGRT is not set +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_EFI_STUB is not set +CONFIG_FAILOVER=y +CONFIG_FDDI=y +CONFIG_GTP=y +CONFIG_HAMRADIO=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_SET=y +CONFIG_LEGACY_VSYSCALL_EMULATE=y +# CONFIG_LEGACY_VSYSCALL_XONLY is not set +CONFIG_LIBCRC32C=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NETFILTER_XT_MARK=y +CONFIG_NETFILTER_XT_NAT=y +CONFIG_NETFILTER_XT_TARGET_LOG=y +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y +CONFIG_NET_9P=y +CONFIG_NET_FAILOVER=y +CONFIG_NF_LOG_COMMON=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NF_LOG_IPV6=y +CONFIG_OVERLAY_FS=y +CONFIG_PAGE_REPORTING=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_PCIEAER=y +# CONFIG_R8169 is not set +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RAS=y +# CONFIG_RCU_TRACE is not set +# CONFIG_REALTEK_PHY is not set +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_OSSEMUL=y +# CONFIG_STRICT_DEVMEM is not set +CONFIG_UEVENT_HELPER=y +# CONFIG_USB is not set +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_9P_FS=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_ACPI_EXTLOG is not set +# CONFIG_ACRN_GUEST is not set +# CONFIG_AIX_PARTITION is not set +CONFIG_AMIGA_PARTITION=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y +# CONFIG_ATARI_PARTITION is not set +# CONFIG_AX25 is not set +CONFIG_BALLOON_COMPACTION=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_CMDLINE_PARTITION is not set +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_CRYPTO_ENGINE=y +CONFIG_CRYPTO_LIB_DES=y +# CONFIG_DEFXX is not set +# CONFIG_DRM_VIRTIO_GPU is not set +CONFIG_EDAC=y +# CONFIG_EDAC_AMD64 is not set +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=y +# CONFIG_EDAC_E752X is not set +# CONFIG_EDAC_I10NM is not set +# CONFIG_EDAC_I3000 is not set +# CONFIG_EDAC_I3200 is not set +# CONFIG_EDAC_I5000 is not set +# CONFIG_EDAC_I5100 is not set +# CONFIG_EDAC_I5400 is not set +# CONFIG_EDAC_I7300 is not set +# CONFIG_EDAC_I7CORE is not set +# CONFIG_EDAC_I82975X is not set +# CONFIG_EDAC_IE31200 is not set +# CONFIG_EDAC_IGEN6 is not set +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_PND2 is not set +# CONFIG_EDAC_SBRIDGE is not set +# CONFIG_EDAC_SKX is not set +# CONFIG_EDAC_X38 is not set +CONFIG_HALTPOLL_CPUIDLE=y +# CONFIG_HW_RANDOM_VIRTIO is not set +# CONFIG_HYPERV is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_SRH is not set +CONFIG_IP6_NF_NAT=y +# CONFIG_IP6_NF_SECURITY is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_TARGET_MASQUERADE=y +# CONFIG_IP6_NF_TARGET_NPT is not set +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_NF_ARPTABLES is not set +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_MATCH_TTL is not set +# CONFIG_IP_NF_SECURITY is not set +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_NETMAP is not set +# CONFIG_IP_NF_TARGET_REDIRECT is not set +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_SET_BITMAP_IP is not set +# CONFIG_IP_SET_BITMAP_IPMAC is not set +# CONFIG_IP_SET_BITMAP_PORT is not set +# CONFIG_IP_SET_HASH_IP is not set +# CONFIG_IP_SET_HASH_IPMAC is not set +# CONFIG_IP_SET_HASH_IPMARK is not set +# CONFIG_IP_SET_HASH_IPPORT is not set +# CONFIG_IP_SET_HASH_IPPORTIP is not set +# CONFIG_IP_SET_HASH_IPPORTNET is not set +# CONFIG_IP_SET_HASH_MAC is not set +# CONFIG_IP_SET_HASH_NET is not set +# CONFIG_IP_SET_HASH_NETIFACE is not set +# CONFIG_IP_SET_HASH_NETNET is not set +# CONFIG_IP_SET_HASH_NETPORT is not set +# CONFIG_IP_SET_HASH_NETPORTNET is not set +# CONFIG_IP_SET_LIST_SET is not set +CONFIG_IP_SET_MAX=256 +# CONFIG_JAILHOUSE_GUEST is not set +CONFIG_KARMA_PARTITION=y +CONFIG_KVM_GUEST=y +# CONFIG_LDM_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MEMORY_BALLOON=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +# CONFIG_MOUSE_PS2_VMMOUSE is not set +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_OSF is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +CONFIG_NETFILTER_XT_CONNMARK=y +# CONFIG_NETFILTER_XT_MATCH_BPF is not set +# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ECN is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_SET is not set +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +# CONFIG_NET_9P_DEBUG is not set +CONFIG_NET_9P_VIRTIO=y +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set +# CONFIG_NET_EMATCH_IPSET is not set +CONFIG_NET_UDP_TUNNEL=y +# CONFIG_NF_CONNTRACK_AMANDA is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CONNTRACK_ZONES is not set +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_OSF_PARTITION=y +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_METACOPY is not set +CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y +CONFIG_OVERLAY_FS_REDIRECT_DIR=y +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PTP_1588_CLOCK_KVM=y +# CONFIG_PTP_1588_CLOCK_VMW is not set +# CONFIG_PVH is not set +CONFIG_SGI_PARTITION=y +# CONFIG_SKFP is not set +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_SEQ_MIDI_EVENT=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SUN_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_VIRTIO=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_INPUT=y +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +CONFIG_VIRTIO_NET=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_X86_HV_CALLBACK_VECTOR=y +# CONFIG_X86_X2APIC is not set +# CONFIG_XEN is not set diff --git a/ttcn3-ggsn-test/initrd-ggsn.sh b/ttcn3-ggsn-test/initrd-ggsn.sh new file mode 100644 index 0000000..831dfff --- /dev/null +++ b/ttcn3-ggsn-test/initrd-ggsn.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Sourced by scripts/kernel-test/initrd-build.sh + +initrd_add_mod \ + gtp \ + tun + +initrd_add_bin \ + osmo-ggsn + +initrd_add_file \ + /data/osmo-ggsn.cfg + +initrd_add_cmd \ + "ip addr add 172.18.3.201/24 brd 172.18.3.255 dev eth0" \ + "ip route add default via 172.18.3.1 dev eth0" \ + "osmo-ggsn -c /data/osmo-ggsn.cfg" diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 95cbc2f..c6ea729 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -1,6 +1,14 @@ #!/bin/sh +# Environment variables: +# * KERNEL_TEST: set to 1 to run osmo-ggsn with the kernel module in QEMU +# * KERNEL_BUILD: set to 1 to build the kernel instead of using a pre-built one +# * KERNEL_REMOTE_NAME: git remote name (to add multiple repos in the same local linux clone) +# * KERNEL_URL: git remote url +# * KERNEL_BRANCH: branch to checkout . ../jenkins-common.sh + +KERNEL_TEST="${KERNEL_TEST:-0}" IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ "osmo-ggsn-$IMAGE_SUFFIX" \ @@ -13,23 +21,48 @@ cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ mkdir $VOL_BASE_DIR/ggsn -cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ SUBNET=3 network_create $SUBNET # start container with ggsn in background +GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" +GGSN_DOCKER_ARGS="" +if [ "$KERNEL_TEST" = "1" ]; then + cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg + + kernel_test_prepare \ + "defconfig" \ + "fragment.config" \ + "initrd-ggsn.sh" \ + "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ + -v $VOL_BASE_DIR/ggsn:/data + + GGSN_CMD="/kernel-test/run-qemu.sh" + GGSN_DOCKER_ARGS=" + $(docker_network_params $SUBNET 200) + --device /dev/kvm:/dev/kvm + -v "$KERNEL_TEST_DIR:/kernel-test:ro" + -v "$CACHE_DIR:/cache" + " +else + cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ + + GGSN_DOCKER_ARGS=" + $(docker_network_params $SUBNET 201) + " +fi docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --rm \ - $(docker_network_params $SUBNET 201) \ --ulimit core=-1 \ -v $VOL_BASE_DIR/ggsn:/data \ --name ${BUILD_TAG}-ggsn -d \ $DOCKER_ARGS \ + $GGSN_DOCKER_ARGS \ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ - /bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1" + /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg new file mode 100644 index 0000000..0288d60 --- /dev/null +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg @@ -0,0 +1,59 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log gsmtap 172.18.3.202 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 172.18.3.201 + apn internet + gtpu-mode kernel-gtp + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.222.0/24 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.222.0/24 + no shutdown +# apn inet6 +# apn inet46 + default-apn internet + no shutdown ggsn -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54e752048eed2a170a1cf4e0fd410de255b9de5d Gerrit-Change-Number: 23005 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:12:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:12:10 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: support epoch In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23112 ) Change subject: osmo-release.sh: support epoch ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/23112/1/osmo-release.sh File osmo-release.sh: https://gerrit.osmocom.org/c/libosmocore/+/23112/1/osmo-release.sh at 104 PS1, Line 104: case "$VERSION" in I don't think VERSION here contains the X: epoch version. Did you verify that? I see .version being "0.1.0" currently in osmo-gbproxy. Regarding how to run the script, see: https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release#osmocom-releasemk -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 Gerrit-Change-Number: 23112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 10:12:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:17:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:17:26 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23111 ) Change subject: Correct configuration written from vty ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 10:17:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:21:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:21:01 +0000 Subject: Change in osmo-pcu[master]: tbf: Log timeslot allocation failure In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23105 ) Change subject: tbf: Log timeslot allocation failure ...................................................................... tbf: Log timeslot allocation failure Change-Id: I48fc1eac37eeb74649bfc0888e06afc0079a58f8 --- M src/tbf.cpp M tests/alloc/AllocTest.err M tests/tbf/TbfTest.err 3 files changed, 43 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 1885927..b1121bb 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -751,6 +751,9 @@ rc = the_pcu->alloc_algorithm(bts, m_ms, this, single_slot, use_trx); /* if no resource */ if (rc < 0) { + LOGPTBF(this, LOGL_NOTICE, + "Timeslot Allocation failed: trx = %d, single_slot = %d\n", + use_trx, single_slot); return -1; } /* assign control ts */ diff --git a/tests/alloc/AllocTest.err b/tests/alloc/AllocTest.err index 0866c9c..8c175f5 100644 --- a/tests/alloc/AllocTest.err +++ b/tests/alloc/AllocTest.err @@ -194,6 +194,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=0/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=1 TLLI=0xffffffff DIR=DL STATE=RELEASING) free @@ -306,6 +307,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 Allocating UL TBF: MS_CLASS=0/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=1 TLLI=0xffffffff DIR=UL STATE=NULL) free @@ -714,6 +716,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=0/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free @@ -932,6 +935,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 00 Allocating UL TBF: MS_CLASS=0/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free @@ -189960,6 +189964,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 80 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -190052,6 +190057,7 @@ TBF(TFI=14 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 18 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=12/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -190144,6 +190150,7 @@ TBF(TFI=14 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 18 Allocating UL TBF: MS_CLASS=12/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -190284,6 +190291,7 @@ TBF(TFI=22 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78 Allocating UL TBF: MS_CLASS=12/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -190388,6 +190396,7 @@ TBF(TFI=16 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = f8 Allocating UL TBF: MS_CLASS=18/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -190493,6 +190502,7 @@ Allocating UL TBF: MS_CLASS=18/0 No USF available [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 @@ -190708,6 +190718,7 @@ TBF(TFI=7 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=7 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -190804,6 +190815,7 @@ TBF(TFI=15 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40, dl_slots = f0 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=15 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -190901,6 +190913,7 @@ Allocating UL TBF: MS_CLASS=10/0 No USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=15 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -192029,6 +192042,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -192260,6 +192274,7 @@ Allocating DL TBF: MS_CLASS=10/0 No TFI available (suggested TRX: 0). [DL] algo B (suggested TRX: 0): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 @@ -193042,6 +193057,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=10/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 @@ -193292,6 +193308,7 @@ TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -193403,6 +193420,7 @@ TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 40, dl_slots = f0 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 @@ -193515,6 +193533,7 @@ Allocating UL TBF: MS_CLASS=10/0 No USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=RELEASING) free Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -193623,6 +193642,7 @@ TBF(TFI=6 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 Allocating UL TBF: MS_CLASS=1/0 [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -193670,6 +193690,7 @@ TBF(TFI=14 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 18, dl_slots = 00 Allocating UL TBF: MS_CLASS=10/0 No USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 00 @@ -193742,6 +193763,7 @@ Allocating UL TBF: MS_CLASS=10/0 No USF available [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 08 @@ -194229,6 +194251,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=1/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78 @@ -194329,6 +194352,7 @@ Allocating DL TBF: MS_CLASS=10/0 No TFI available (suggested TRX: -1). [DL] algo B (suggested TRX: -1): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating DL TBF: MS_CLASS=10/0 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Setting Control TS 5 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Allocated: trx = 0, ul_slots = 20, dl_slots = 78 @@ -194706,6 +194730,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=10/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 @@ -195833,6 +195858,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=23/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously -1) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) Setting Control TS 3 @@ -195941,6 +195967,7 @@ TBF(TFI=6 TLLI=0xc0000022 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 Allocating UL TBF: MS_CLASS=36/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xc0000023 DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 Allocated 35 TBFs (previously 160) TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=1/0 @@ -197419,6 +197446,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=23/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 160) TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=1/0 @@ -198222,6 +198250,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=23/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 160) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -198454,6 +198483,7 @@ Allocating DL TBF: MS_CLASS=33/0 No TFI available (suggested TRX: 0). [DL] algo B (suggested TRX: 0): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free Allocated 32 TBFs (previously -1) Allocating UL TBF: MS_CLASS=1/0 @@ -198509,6 +198539,7 @@ TBF(TFI=16 TLLI=0xc0000010 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 88, dl_slots = 00 Allocating UL TBF: MS_CLASS=18/0 No USF available +TBF(TFI=0 TLLI=0xc0000011 DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 Allocated 17 TBFs (previously 32) TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=1/0 @@ -198821,6 +198852,7 @@ Allocating DL TBF: MS_CLASS=33/0 No TFI available (suggested TRX: 0). [DL] algo B (suggested TRX: 0): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) free Allocated 32 TBFs (previously 32) TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free @@ -198986,6 +199018,7 @@ Allocating DL TBF: MS_CLASS=33/0 No TFI available (suggested TRX: -1). [DL] algo B (suggested TRX: -1): failed to allocate a TFI +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 32 TBFs (previously 32) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 3 @@ -199672,6 +199705,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=44/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 89 TBFs (previously -1) Allocating UL TBF: MS_CLASS=1/0 TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) Setting Control TS 3 @@ -199726,6 +199760,7 @@ TBF(TFI=6 TLLI=0xc0000010 DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 08, dl_slots = 00 Allocating UL TBF: MS_CLASS=18/0 [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xc0000011 DIR=UL STATE=NULL) Timeslot Allocation failed: trx = 0, single_slot = 0 Allocated 17 TBFs (previously 89) TBF(TFI=0 TLLI=0xc0000000 DIR=UL STATE=NULL) free Allocating UL TBF: MS_CLASS=1/0 @@ -200974,6 +201009,7 @@ No TFI available (suggested TRX: 0). Allocating UL TBF: MS_CLASS=23/0 [UL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 89) TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=RELEASING) free Allocating DL TBF: MS_CLASS=1/0 @@ -201777,6 +201813,7 @@ No TFI available (suggested TRX: 0). Allocating DL TBF: MS_CLASS=23/0 [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 0 Allocated 160 TBFs (previously 160) Allocating DL TBF: MS_CLASS=11/11 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=NULL EGPRS) Setting Control TS 6 diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index eb197d4..26e4b69 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1342,6 +1342,7 @@ Allocating DL TBF: MS_CLASS=45/0 [DL] algo A (suggested TRX: -1): Alloc start [DL] algo A (suggested TRX: -1): failed to find a usable TRX (TFI exhausted) +TBF(TFI=0 TLLI=0xc0000020 DIR=DL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 1 No PDCH resource === end test_tbf_exhaustion === Destroying MS object, TLLI = 0xc0000020 @@ -6193,6 +6194,7 @@ - Skipping TS 6, because not enabled - Skipping TS 7, because no USF available [UL] algo A (suggested TRX: -1): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 1 No PDCH resource for Uplink TBF Tx Immediate Assignment Reject on AGCH Destroying MS object, TLLI = 0xffffffff @@ -7630,6 +7632,7 @@ - Skipping TS 6, because not enabled - Skipping TS 7, because no USF available [UL] algo A (suggested TRX: 0): failed to allocate a TS, no USF available +TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NULL EGPRS) Timeslot Allocation failed: trx = 0, single_slot = 0 No PDCH resource TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NULL) changes state from NULL to ASSIGN Attaching TBF to MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48fc1eac37eeb74649bfc0888e06afc0079a58f8 Gerrit-Change-Number: 23105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:21:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:21:02 +0000 Subject: Change in osmo-pcu[master]: bts: Count TBF TS allocation failure In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23106 ) Change subject: bts: Count TBF TS allocation failure ...................................................................... bts: Count TBF TS allocation failure Related: OS#2282 Change-Id: I0696bf77364bd31b96c00614a58ce66809683d1c --- M src/bts.cpp M src/bts.h M src/tbf.cpp 3 files changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 11aef3f..8d1fb3f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -100,6 +100,7 @@ { "tbf:reused", "TBF Reused "}, { "tbf:alloc:algo-a", "TBF Alloc Algo A "}, { "tbf:alloc:algo-b", "TBF Alloc Algo B "}, + { "tbf:alloc:failed", "TBF Alloc Failure "}, { "rlc:sent", "RLC Sent "}, { "rlc:resent", "RLC Resent "}, { "rlc:restarted", "RLC Restarted "}, diff --git a/src/bts.h b/src/bts.h index 90367ac..d321b8d 100644 --- a/src/bts.h +++ b/src/bts.h @@ -87,6 +87,7 @@ CTR_TBF_REUSED, CTR_TBF_ALLOC_ALGO_A, CTR_TBF_ALLOC_ALGO_B, + CTR_TBF_ALLOC_FAIL, CTR_RLC_SENT, CTR_RLC_RESENT, CTR_RLC_RESTARTED, diff --git a/src/tbf.cpp b/src/tbf.cpp index b1121bb..2f58375 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -335,6 +335,7 @@ /* if no resource */ if (rc < 0) { LOGPTBF(this, LOGL_ERROR, "No resource after update???\n"); + bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); return -rc; } @@ -754,6 +755,7 @@ LOGPTBF(this, LOGL_NOTICE, "Timeslot Allocation failed: trx = %d, single_slot = %d\n", use_trx, single_slot); + bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); return -1; } /* assign control ts */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0696bf77364bd31b96c00614a58ce66809683d1c Gerrit-Change-Number: 23106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:55:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:55:03 +0000 Subject: Change in osmo-pcu[master]: pdch: Standarize and improve logging In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23107 to look at the new patch set (#2). Change subject: pdch: Standarize and improve logging ...................................................................... pdch: Standarize and improve logging Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 --- M src/pdch.cpp M src/pdch.h M tests/app_info/AppInfoTest.err M tests/tbf/TbfTest.err 4 files changed, 527 insertions(+), 520 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/07/23107/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 Gerrit-Change-Number: 23107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:55:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:55:03 +0000 Subject: Change in osmo-pcu[master]: tbf: Improve logging when TBF being allocated or no TBF avail In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23108 to look at the new patch set (#2). Change subject: tbf: Improve logging when TBF being allocated or no TBF avail ...................................................................... tbf: Improve logging when TBF being allocated or no TBF avail Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f --- M src/tbf_dl.cpp M src/tbf_ul.cpp M tests/alloc/AllocTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.err 5 files changed, 50,859 insertions(+), 50,861 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/23108/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f Gerrit-Change-Number: 23108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:55:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 10:55:03 +0000 Subject: Change in osmo-pcu[master]: bts: Add new stats to detect TBF allocation failure reasons In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/23110 to look at the new patch set (#2). Change subject: bts: Add new stats to detect TBF allocation failure reasons ...................................................................... bts: Add new stats to detect TBF allocation failure reasons This is specially useful to detect for instance if a cell is handling too many users, ending up in TFI or USF exhaustions. This information can be later in the future used to tune TBF allocation algorithm behavior (either manually/statially through config file, or automatically/dynamically in code based on some thresholds). Related: OS#5042 Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_ts_alloc.cpp 3 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/10/23110/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 Gerrit-Change-Number: 23110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 10:55:21 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 10:55:21 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: support epoch In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/23112 to look at the new patch set (#2). Change subject: osmo-release.sh: support epoch ...................................................................... osmo-release.sh: support epoch Related: OS#5046 Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 --- M osmo-release.sh 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/23112/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 Gerrit-Change-Number: 23112 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:13:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 11:13:36 +0000 Subject: Change in osmo-pcu[master]: pdch: Standarize and improve logging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23107 ) Change subject: pdch: Standarize and improve logging ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 Gerrit-Change-Number: 23107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 11:13:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:14:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 11:14:05 +0000 Subject: Change in osmo-pcu[master]: tbf: Improve logging when TBF being allocated or no TBF avail In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23108 ) Change subject: tbf: Improve logging when TBF being allocated or no TBF avail ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f Gerrit-Change-Number: 23108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 11:14:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:31:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:31:40 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: support epoch In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23112 ) Change subject: osmo-release.sh: support epoch ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 Gerrit-Change-Number: 23112 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 11:31:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:31:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:31:43 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: support epoch In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23112 ) Change subject: osmo-release.sh: support epoch ...................................................................... osmo-release.sh: support epoch Related: OS#5046 Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 --- M osmo-release.sh 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index eea17cf..c0b0b4a 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -247,7 +247,24 @@ git add TODO-RELEASE fi -gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" +# Add missing epoch (OS#5046) +DEB_VER=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') +NEW_VER_WITH_EPOCH="$NEW_VER" +case "$DEB_VER" in +*:*) + epoch="$(echo "$DEB_VER" | cut -d: -f1)" + NEW_VER_WITH_EPOCH="$epoch:$NEW_VER" + ;; +esac + +gbp dch \ + --debian-tag='%(version)s' \ + --auto \ + --meta \ + --git-author \ + --multimaint-merge \ + --ignore-branch \ + --new-version="$NEW_VER_WITH_EPOCH" dch -r -m --distribution "unstable" "" git add ${GIT_TOPDIR}/debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5d9d18d7cc84f185222ee176e6546bb3553a3598 Gerrit-Change-Number: 23112 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:32:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:32:07 +0000 Subject: Change in osmo-pcu[master]: pdch: Standarize and improve logging In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23107 ) Change subject: pdch: Standarize and improve logging ...................................................................... pdch: Standarize and improve logging Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 --- M src/pdch.cpp M src/pdch.h M tests/app_info/AppInfoTest.err M tests/tbf/TbfTest.err 4 files changed, 527 insertions(+), 520 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1686a72eb9f9014ed3365376bc43d59d60bee8a5 Gerrit-Change-Number: 23107 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:32:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:32:09 +0000 Subject: Change in osmo-pcu[master]: tbf: Improve logging when TBF being allocated or no TBF avail In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23108 ) Change subject: tbf: Improve logging when TBF being allocated or no TBF avail ...................................................................... tbf: Improve logging when TBF being allocated or no TBF avail Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f --- M src/tbf_dl.cpp M src/tbf_ul.cpp M tests/alloc/AllocTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.err 5 files changed, 50,859 insertions(+), 50,861 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I68491fe2c643262e35b4d4f1ecac34afcf61848f Gerrit-Change-Number: 23108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:32:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:32:10 +0000 Subject: Change in osmo-pcu[master]: Remove uneeded ms param from alloc_algorithm_func_t func In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23109 ) Change subject: Remove uneeded ms param from alloc_algorithm_func_t func ...................................................................... Remove uneeded ms param from alloc_algorithm_func_t func Since a while ago, the data architecture was changed so that TBF is guaranteed to always have a MS object associated. Hence, it makes no sense to pass the MS object as a separate param as we can take it from tbf object and makes code less confusing. Change-Id: Idc0c76cf6f007afa4236480cdad0d8e99dabec5f --- M src/gprs_pcu.h M src/gprs_rlcmac.h M src/gprs_rlcmac_ts_alloc.cpp M src/tbf.cpp M tests/alloc/AllocTest.cpp 5 files changed, 17 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h index 76e3937..a17144c 100644 --- a/src/gprs_pcu.h +++ b/src/gprs_pcu.h @@ -67,7 +67,6 @@ struct gprs_rlcmac_tbf; typedef int (*alloc_algorithm_func_t)(struct gprs_rlcmac_bts *bts, - struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_tbf); diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h index 69fd6a4..cf95c37 100644 --- a/src/gprs_rlcmac.h +++ b/src/gprs_rlcmac.h @@ -104,13 +104,13 @@ extern "C" { #endif -int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, +int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx); -int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, +int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx); -int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, +int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx); int gprs_rlcmac_paging_request(struct gprs_rlcmac_bts *bts, const struct osmo_mobile_identity *mi, uint16_t pgroup); diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 7202423..1dc31f6 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -338,13 +338,12 @@ * Assign single slot for uplink and downlink * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] ms_ Pointer to MS object * \param[in,out] tbf_ Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, int8_t use_trx) { struct gprs_rlcmac_pdch *pdch; @@ -355,7 +354,7 @@ int usf = -1; uint8_t mask = 0xff; const char *mask_reason = NULL; - const GprsMs *ms = ms_; + struct GprsMs *ms = tbf_->ms(); const gprs_rlcmac_tbf *tbf = tbf_; gprs_rlcmac_trx *trx = ms_current_trx(ms); @@ -420,7 +419,7 @@ tbf_->trx = trx; /* the only one TS is the common TS */ tbf_->first_ts = tbf_->first_common_ts = ts; - ms_set_reserved_slots(ms_, trx, 1 << ts, 1 << ts); + ms_set_reserved_slots(ms, trx, 1 << ts, 1 << ts); tbf_->upgrade_to_multislot = 0; bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_A); @@ -853,13 +852,12 @@ * Assign one uplink slot. (With free USF) * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] ms_ Pointer to MS object * \param[in,out] tbf_ Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, int8_t use_trx) { uint8_t dl_slots; @@ -873,7 +871,7 @@ int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; int rc; int tfi; - const GprsMs *ms = ms_; + struct GprsMs *ms = tbf_->ms(); const gprs_rlcmac_tbf *tbf = tbf_; gprs_rlcmac_trx *trx; @@ -881,10 +879,7 @@ /* Step 1: Get current state from the MS object */ - if (!ms) { - LOGP(DRLCMAC, LOGL_ERROR, "MS not set\n"); - return -EINVAL; - } + OSMO_ASSERT(ms); dl_slots = ms_reserved_dl_slots(ms); ul_slots = ms_reserved_ul_slots(ms); @@ -958,7 +953,7 @@ /* Step 4: Update MS and TBF and really allocate the resources */ - update_ms_reserved_slots(trx, ms_, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots); + update_ms_reserved_slots(trx, ms, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots); tbf_->trx = trx; tbf_->first_common_ts = first_common_ts; @@ -983,13 +978,12 @@ * goal is to provide the highest possible bandwidth per MS. * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] ms_ Pointer to MS object * \param[in,out] tbf_ Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, GprsMs *ms_, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, int8_t use_trx) { int rc; @@ -1002,7 +996,7 @@ } if (!bts->multislot_disabled) { - rc = alloc_algorithm_b(bts, ms_, tbf_, single, use_trx); + rc = alloc_algorithm_b(bts, tbf_, single, use_trx); if (rc >= 0) return rc; @@ -1011,7 +1005,7 @@ bts->multislot_disabled = 1; } - return alloc_algorithm_a(bts, ms_, tbf_, single, use_trx); + return alloc_algorithm_a(bts, tbf_, single, use_trx); } int gprs_alloc_max_dl_slots_per_ms(const struct gprs_rlcmac_bts *bts, uint8_t ms_class) diff --git a/src/tbf.cpp b/src/tbf.cpp index 2f58375..5ca34f4 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -331,7 +331,7 @@ LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF update **********\n"); tbf_unlink_pdch(this); - rc = the_pcu->alloc_algorithm(bts, ms(), this, false, -1); + rc = the_pcu->alloc_algorithm(bts, this, false, -1); /* if no resource */ if (rc < 0) { LOGPTBF(this, LOGL_ERROR, "No resource after update???\n"); @@ -749,7 +749,7 @@ m_created_ts = time(NULL); /* select algorithm */ - rc = the_pcu->alloc_algorithm(bts, m_ms, this, single_slot, use_trx); + rc = the_pcu->alloc_algorithm(bts, this, single_slot, use_trx); /* if no resource */ if (rc < 0) { LOGPTBF(this, LOGL_NOTICE, diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index d626692..fe803e3 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -423,9 +423,6 @@ test_all_alloc_b(); } -typedef int (*algo_t)(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, bool single, - int8_t use_trx); - static char get_dir_char(uint8_t mask, uint8_t tx, uint8_t rx, uint8_t busy) { int offs = busy ? 32 : 0; @@ -640,7 +637,7 @@ return counter; } -static void test_successive_allocation(algo_t algo, unsigned min_class, +static void test_successive_allocation(alloc_algorithm_func_t algo, unsigned min_class, unsigned max_class, enum test_mode mode, unsigned expect_num, const char *text) { @@ -674,7 +671,7 @@ talloc_free(bts); } -static void test_many_connections(algo_t algo, unsigned expect_num, +static void test_many_connections(alloc_algorithm_func_t algo, unsigned expect_num, const char *text) { struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idc0c76cf6f007afa4236480cdad0d8e99dabec5f Gerrit-Change-Number: 23109 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:43:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:43:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Enable by default References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 ) Change subject: StatsD_Checker: Enable by default ...................................................................... StatsD_Checker: Enable by default It was previously disabled by default in order to avoid test breakage with older versions of osmocom projects not supporting them. Since we just did a new release, all -latest contian now master which should work fine. Don't remove the moduleparam yet in order to avoid breakage with some cfg files in docker-playground.git still setting it to true. Related: OS#5042 Change-Id: I4e2049c109986906d3c985ca2282174b1abff581 --- M bsc/BSC_Tests.default M library/StatsD_Checker.ttcn M ns/NS_Tests.default M pcu/PCU_Tests.default 4 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/23113/1 diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default index c5d1559..50c5c0a 100644 --- a/bsc/BSC_Tests.default +++ b/bsc/BSC_Tests.default @@ -29,6 +29,5 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBSC"; -StatsD_Checker.mp_enable_stats := true; [EXECUTE] diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn index 540e479..1c8fd12 100644 --- a/library/StatsD_Checker.ttcn +++ b/library/StatsD_Checker.ttcn @@ -38,7 +38,7 @@ modulepar { /* Whether to test stats values */ - boolean mp_enable_stats := false; + boolean mp_enable_stats := true; } type record StatsDExpect { diff --git a/ns/NS_Tests.default b/ns/NS_Tests.default index 951c1c2..1c61bec 100644 --- a/ns/NS_Tests.default +++ b/ns/NS_Tests.default @@ -8,7 +8,6 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoNSdummy"; -StatsD_Checker.mp_enable_stats := true; [TESTPORT_PARAMETERS] *.NSVTY.CTRL_MODE := "client" diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 4d6c0a2..6f633d2 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -30,7 +30,6 @@ }; Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; PCUIF_Types.mp_pcuif_version := 10; -StatsD_Checker.mp_enable_stats := true; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 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: I4e2049c109986906d3c985ca2282174b1abff581 Gerrit-Change-Number: 23113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:47:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:47:16 +0000 Subject: Change in docker-playground[master]: Get rid of uneeded param StatsD_Checker.mp_enable_stats References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23114 ) Change subject: Get rid of uneeded param StatsD_Checker.mp_enable_stats ...................................................................... Get rid of uneeded param StatsD_Checker.mp_enable_stats This param is currently set to true by default and will be removed soon. Related: OS#5042 Depends: osmo-ttcn3-hacks.git Change-Id I4e2049c109986906d3c985ca2282174b1abff581 Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 --- M ttcn3-bsc-test/BSC_Tests.cfg M ttcn3-bsc-test/sccplite/BSC_Tests.cfg M ttcn3-pcu-test/PCU_Tests.cfg 3 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/14/23114/1 diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 2a9b435..83de0ef 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -68,7 +68,6 @@ BSC_Tests_CBSP.mp_cbc_ip6 := "fd02:db8:2::203"; BSC_Tests_CBSP.mp_bsc_cbsp_ip := "172.18.2.20"; BSC_Tests_CBSP.mp_bsc_cbsp_ip6 := "fd02:db8:2::20"; -StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg index 0ad10b2..f1f02d6 100644 --- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -26,7 +26,6 @@ rctx := 0 } }; -StatsD_Checker.mp_enable_stats := true; BSC_Tests.mp_enable_lcs_tests := false; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 43e9d88..07d9c3a 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -36,7 +36,6 @@ } } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; -StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 Gerrit-Change-Number: 23114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:47:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:47:47 +0000 Subject: Change in docker-playground[master]: Get rid of uneeded param StatsD_Checker.mp_enable_stats In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23114 ) Change subject: Get rid of uneeded param StatsD_Checker.mp_enable_stats ...................................................................... Patch Set 1: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 must be merged before this patch. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 Gerrit-Change-Number: 23114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 11:47:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 26 11:49:32 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 11:49:32 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6038e05291680_6772ac5bdd365f0498169@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_8.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 134s] | #define HAVE_STRING_H 1 [ 134s] | #define HAVE_MEMORY_H 1 [ 134s] | #define HAVE_STRINGS_H 1 [ 134s] | #define HAVE_INTTYPES_H 1 [ 134s] | #define HAVE_STDINT_H 1 [ 134s] | #define HAVE_UNISTD_H 1 [ 134s] | #define HAVE_DLFCN_H 1 [ 134s] | #define LT_OBJDIR ".libs/" [ 134s] | #define BUILD_SMPP 1 [ 134s] | #define STDC_HEADERS 1 [ 134s] | #define HAVE_DBI_DBD_H 1 [ 134s] | #define HAVE_PCAP_PCAP_H 1 [ 134s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 134s] | [ 134s] | configure: exit 0 [ 134s] [ 134s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 134s] make[1]: *** [override_dh_auto_test] Error 1 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] debian/rules:13: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] ### VM INTERACTION START ### [ 135s] Powering off. [ 135s] [ 126.220157] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 136s] lamb25 failed "build openbsc_1.3.2.dsc" at Fri Feb 26 11:49:29 UTC 2021. [ 136s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:53:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:53:55 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23115 ) Change subject: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 ...................................................................... ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 This param is true by default and there's no one setting it to false anymore (and soon will be removed). Related: OS#5042 Change-Id: I1780320c69ec4a9f086677fd4884dec674f8332e --- M ttcn3-bsc-test/BSC_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/23115/1 diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 83de0ef..ad189c9 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -13,7 +13,6 @@ BSC_Tests.mp_bsc_ip := "172.18.2.20"; BSC_Tests.mp_test_ip := "172.18.2.203"; BSC_Tests.mp_enable_osmux_test := true; -BSC_Tests.mp_media_mgw_offer_ipv6 := true; BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1780320c69ec4a9f086677fd4884dec674f8332e Gerrit-Change-Number: 23115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 11:56:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 11:56:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Get rid of module param mp_media_mgw_offer_ipv6 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23116 ) Change subject: bsc: Get rid of module param mp_media_mgw_offer_ipv6 ...................................................................... bsc: Get rid of module param mp_media_mgw_offer_ipv6 This param is not needed anymore sincenew releases used in -latest don't need to disable it. Let's keep the possibility to change behavior from within test and leave v6 enabled by default as it used to be. Related: OS#5042 Change-Id: Ic693885dd3d4259dc6ce80643d25c7d432148d3d --- M bsc/BSC_Tests.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/23116/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index dc94b74..e4e2d1a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -671,8 +671,6 @@ boolean mp_enable_osmux_test := true; /* Value set in osmo-bsc.cfg "ms max power" */ uint8_t mp_exp_ms_power_level := 7; - - boolean mp_media_mgw_offer_ipv6 := true; } private function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams { @@ -685,7 +683,6 @@ } pars.exp_ms_power_level := mp_exp_ms_power_level; pars.mscpool.bssap_idx := bssap_idx; - pars.media_mgw_offer_ipv6 := mp_media_mgw_offer_ipv6; return pars; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23116 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: Ic693885dd3d4259dc6ce80643d25c7d432148d3d Gerrit-Change-Number: 23116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 26 11:57:13 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 11:57:13 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <6038e234ac4b8_6772ac5bdd365f04994cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 154s] | #define HAVE_STRING_H 1 [ 154s] | #define HAVE_MEMORY_H 1 [ 154s] | #define HAVE_STRINGS_H 1 [ 154s] | #define HAVE_INTTYPES_H 1 [ 154s] | #define HAVE_STDINT_H 1 [ 154s] | #define HAVE_UNISTD_H 1 [ 154s] | #define HAVE_DLFCN_H 1 [ 154s] | #define LT_OBJDIR ".libs/" [ 154s] | #define BUILD_SMPP 1 [ 154s] | #define STDC_HEADERS 1 [ 154s] | #define HAVE_DBI_DBD_H 1 [ 154s] | #define HAVE_PCAP_PCAP_H 1 [ 154s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 154s] | [ 154s] | configure: exit 0 [ 154s] [ 154s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 154s] make[1]: *** [override_dh_auto_test] Error 1 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] debian/rules:13: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 154s] ### VM INTERACTION START ### [ 157s] [ 146.163989] sysrq: Power Off [ 157s] [ 146.170272] reboot: Power down [ 157s] ### VM INTERACTION END ### [ 157s] [ 157s] lamb04 failed "build openbsc_1.3.2.dsc" at Fri Feb 26 11:57:07 UTC 2021. [ 157s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Feb 26 11:58:56 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 11:58:56 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <6038e28f285e3_6772ac5bdd365f0499789@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_8.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 236s] | configure: failed program was: [ 236s] | | /* confdefs.h */ [ 236s] | | #define PACKAGE_NAME "openbsc" [ 236s] | | #define PACKAGE_TARNAME "openbsc" [ 236s] | | #define PACKAGE_VERSION "UNKNOWN" [ 236s] | | #define PACKAGE_STRING "openbsc UNKNOWN" [ 236s] | | #define PACKAGE_BUGREPORT "openbsc at lists.osmocom.org" [ 236s] | | #define PACKAGE_URL "" [ 236s] | | #define PACKAGE "openbsc" [ 236s] | | #define VERSION "UNKNOWN" [ 236s] | | #define STDC_HEADERS 1 [ 236s] | | #define HAVE_SYS_TYPES_H 1 [ 236s] | | #define HAVE_SYS_STAT_H 1 [ 236s] | | #define HAVE_STDLIB_H 1 [ 236s] | | #define HAVE_STRING_H 1 [ 236s] | | #define HAVE_MEMORY_H 1 [ 236s] | | #define HAVE_STRINGS_H 1 [ 236s] | | #define HAVE_INTTYPES_H 1 [ 236s] | | #define HAVE_STDINT_H 1 [ 236s] | | #define HAVE_UNISTD_H 1 [ 236s] | | #define HAVE_DLFCN_H 1 [ 236s] | | #define LT_OBJDIR ".libs/" [ 236s] | | #define BUILD_SMPP 1 [ 236s] | | #defPowering off. [ 236s] [ 207.133991] reboot: Power down [ 237s] ### VM INTERACTION END ### [ 237s] [ 237s] cloud104 failed "build openbsc_1.3.2.dsc" at Fri Feb 26 11:58:39 UTC 2021. [ 237s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:01:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:01:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 ) Change subject: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid ...................................................................... RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid This param is not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I39e9c1986ea682d54dcb22b31798ca91f1677949 Related: OS#5042 --- M library/RSL_Emulation.ttcn 1 file changed, 0 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/23117/1 diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 0a20459..f436c66 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -36,9 +36,6 @@ modulepar { - /* Work around switch for ttcn3-bts-test-latest, enables patching of IPA - * stream ID in the "BSC" mode. See I5927f59a49724170a63e87be604973f7c9d5d8be. */ - boolean mp_rslem_patch_ipa_cid := false; }; /* General "base class" component definition, of which specific implementations @@ -419,19 +416,6 @@ return TrxConnMap[trx_nr]; } -/* Work around for a bug in osmo-bts when all transceivers use IPAC_PROTO_RSL_TRX0 */ -private function f_trx_conn_map_patch_ud(inout ASP_RSL_Unitdata ud) -runs on RSL_Emulation_CT { - for (var integer i := 0; i < sizeof(TrxConnMap); i := i + 1) { - if (ud.conn_id == TrxConnMap[i]) { - ud.streamId := f_streamId_by_trx(i); - return; /* We're done */ - } - } - - testcase.stop("Failed to patch IPA stream ID in ASP RSL UD: ", ud); -} - private type record of ASP_RSL_Unitdata ASP_RSL_UDList; type component RSL_Emulation_CT { @@ -587,17 +571,11 @@ /* Forward common channel management to the special port for it */ [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeT(?), sid := ?)) -> value rx_rsl { - if (not bts_role and mp_rslem_patch_ipa_cid) { - f_trx_conn_map_patch_ud(rx_rsl); - } CCHAN_PT.send(rx_rsl); } /* Forward common channel management to the special port for it */ [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeC(?), sid := ?)) -> value rx_rsl { - if (not bts_role and mp_rslem_patch_ipa_cid) { - f_trx_conn_map_patch_ud(rx_rsl); - } CCHAN_PT.send(rx_rsl); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 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: I39e9c1986ea682d54dcb22b31798ca91f1677949 Gerrit-Change-Number: 23117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:03:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:03:00 +0000 Subject: Change in docker-playground[master]: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23118 ) Change subject: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid ...................................................................... bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid Since we updated -latest to new releases, this param is never set to true anymore. Furtermore, it will be dropped soon completely. Related: OS#5042 Depends: osmo-ttcn3-hacks.git Change-Id I39e9c1986ea682d54dcb22b31798ca91f1677949 Change-Id: I4bda577f1ed6964a2114df1aba366177998f0854 --- M ttcn3-bts-test/BTS_Tests.cfg 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/23118/1 diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/BTS_Tests.cfg index 97608bb..a899b5c 100644 --- a/ttcn3-bts-test/BTS_Tests.cfg +++ b/ttcn3-bts-test/BTS_Tests.cfg @@ -16,9 +16,6 @@ L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" BTS_Tests.mp_ctrl_ip := "172.18.9.20" -# Workaround for osmo-bts-latest: enable IPA stream ID patching -RSL_Emulation.mp_rslem_patch_ipa_cid := false; - [MAIN_CONTROLLER] [EXECUTE] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4bda577f1ed6964a2114df1aba366177998f0854 Gerrit-Change-Number: 23118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:06:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:06:12 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23119 ) Change subject: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm ...................................................................... ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm Since -latest was updated to newer releases, this param is never set to false anymore, and it already defaults to true, so there's no need to set it here explicitly. Furthermore, it will be completely dropped soon. Change-Id: Icab36eba29ad4fadd07ec804ef713910b80ce706 --- M ttcn3-hlr-test/HLR_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/19/23119/1 diff --git a/ttcn3-hlr-test/HLR_Tests.cfg b/ttcn3-hlr-test/HLR_Tests.cfg index 9258cea..b8aa886 100644 --- a/ttcn3-hlr-test/HLR_Tests.cfg +++ b/ttcn3-hlr-test/HLR_Tests.cfg @@ -9,7 +9,6 @@ [MODULE_PARAMETERS] HLR_Tests.mp_hlr_ip := "172.18.10.20" -HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icab36eba29ad4fadd07ec804ef713910b80ce706 Gerrit-Change-Number: 23119 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:08:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:08:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Get rid of module param mp_hlr_supports_dgsm References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23120 ) Change subject: hlr: Get rid of module param mp_hlr_supports_dgsm ...................................................................... hlr: Get rid of module param mp_hlr_supports_dgsm This param is not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I484267c169646310564bd6d9cd13a196b61400e4 Related: OS#5042 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.ttcn 2 files changed, 6 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/23120/1 diff --git a/hlr/HLR_Tests.cfg b/hlr/HLR_Tests.cfg index 1ab6e87..7416362 100644 --- a/hlr/HLR_Tests.cfg +++ b/hlr/HLR_Tests.cfg @@ -12,7 +12,6 @@ [MODULE_PARAMETERS] -HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index ea450b3..959c680 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -70,9 +70,6 @@ /* emulated GSUP server (second HLR) */ charstring mp_hlr_ts_ip := "127.0.0.99"; integer mp_hlr_ts_port := 4222; - - /* drop after osmo-hlr release > 1.2.0 */ - boolean mp_hlr_supports_dgsm := true; }; type record HlrSubscrAud2G { @@ -154,9 +151,7 @@ map(self:VTY, system:VTY); f_vty_set_prompts(VTY); f_vty_transceive(VTY, "enable"); - if (mp_hlr_supports_dgsm) { - f_vty_config(VTY, "mslookup", "no mdns bind"); - } + f_vty_config(VTY, "mslookup", "no mdns bind"); } private altstep as_Tguard() runs on test_CT { @@ -1973,13 +1968,11 @@ execute( TC_subscr_create_on_demand_ul() ); execute( TC_subscr_create_on_demand_sai() ); - if (mp_hlr_supports_dgsm) { - execute( TC_MSLookup_mDNS_service_other_home() ); - execute( TC_MSLookup_GSUP_proxy() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); - execute( TC_MSLookup_mDNS_service_other_proxy() ); - } + execute( TC_MSLookup_mDNS_service_other_home() ); + execute( TC_MSLookup_GSUP_proxy() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); + execute( TC_MSLookup_mDNS_service_other_proxy() ); }; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23120 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: I484267c169646310564bd6d9cd13a196b61400e4 Gerrit-Change-Number: 23120 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:10:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:10:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 to look at the new patch set (#2). Change subject: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid ...................................................................... RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid This param is not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I39e9c1986ea682d54dcb22b31798ca91f1677949 Related: OS#5042 --- M library/RSL_Emulation.ttcn 1 file changed, 0 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/23117/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 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: I39e9c1986ea682d54dcb22b31798ca91f1677949 Gerrit-Change-Number: 23117 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:15:59 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:15:59 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I1f337af1e2de6db05b22636bc31a535404235559 Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/23006/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:15:59 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:15:59 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add wipe_workspace to job template References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23121 ) Change subject: jobs/ttcn3: add wipe_workspace to job template ...................................................................... jobs/ttcn3: add wipe_workspace to job template Prepare for the ggsn kernel module test, where we don't want to wipe the workspace with the cloned linux git tree. Related: OS#3208 Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/23121/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index eb46770..d787957 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -7,6 +7,7 @@ node: ttcn3 # Block *-latest for all master jobs (without suffix) blocking: "^{job-name}.*" + wipe_workspace: true jobs: - "{job-name}" # Folders from docker-playground.git @@ -246,6 +247,7 @@ url: git://git.osmocom.org/docker-playground git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' + wipe-workspace: "{obj:wipe_workspace}" triggers: - timed: "{obj:timer}" publishers: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 Gerrit-Change-Number: 23121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:16:00 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:16:00 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: shell cmd: put job-name into DIR var References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: shell cmd: put job-name into DIR var ...................................................................... jobs/ttcn3: shell cmd: put job-name into DIR var Refactor the shell script that eventually launches jenkins.sh, so it can be extended for the ggsn kernel module test. Related: OS#3208 Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 --- M jobs/ttcn3-testsuites.yml 1 file changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/23122/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index d787957..68e8d7d 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -222,24 +222,29 @@ builders: - shell: |- export REGISTRY_HOST="registry.osmocom.org" - case "{job-name}" in + DIR="{job-name}" + + # Split IMAGE_SUFFIX from DIR + case "$DIR" in TTCN3-centos-*-latest) - cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" - IMAGE_SUFFIX="latest-centos8" ./jenkins.sh + DIR="$(echo "$DIR" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" + export IMAGE_SUFFIX="latest-centos8" ;; TTCN3-centos-*) - cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)" - IMAGE_SUFFIX="master-centos8" ./jenkins.sh + DIR="$(echo "$DIR" | sed s/^TTCN3-centos\-/ttcn3-/)" + export IMAGE_SUFFIX="master-centos8" ;; *-latest) - cd "$(echo "{job-name}" | sed s/\-latest$//)" - IMAGE_SUFFIX="latest" ./jenkins.sh + DIR="$(echo "$DIR" | sed s/\-latest$//)" + export IMAGE_SUFFIX="latest" ;; *) - cd "{job-name}" - IMAGE_SUFFIX="master" ./jenkins.sh + export IMAGE_SUFFIX="master" ;; esac + + cd "$DIR" + ./jenkins.sh scm: - git: branches: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:16:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:16:53 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 3: Verified+1 * https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-ggsn-test-kernel/ * https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-ggsn-test-kernel-latest/ * https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-ggsn-test-kernel-net-next/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 12:16:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:17:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:17:03 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add wipe_workspace to job template In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23121 ) Change subject: jobs/ttcn3: add wipe_workspace to job template ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 Gerrit-Change-Number: 23121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 12:17:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:17:09 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:17:09 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: shell cmd: put job-name into DIR var In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: shell cmd: put job-name into DIR var ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 12:17:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:17:42 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:17:42 +0000 Subject: Change in docker-playground[master]: kernel-test: add KERNEL_TEST_KVM env var References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: add KERNEL_TEST_KVM env var ...................................................................... kernel-test: add KERNEL_TEST_KVM env var Allow to disable KVM, as the jenkins nodes apparently don't support it. This makes the tests run a bit slower, but not much. Related: OS#3208 Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 --- M README.md M jenkins-common.sh M scripts/kernel-test/run-qemu.sh M ttcn3-ggsn-test/jenkins.sh 4 files changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/23123/1 diff --git a/README.md b/README.md index 27a589e..6a9f4b9 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Environment variables: * `KERNEL_TEST`: set to 1 to run the SUT in QEMU +* `KERNEL_TEST_KVM`: set to 0 to disable KVM acceleration * `KERNEL_BUILD`: set to 1 to build the kernel instead of using the pre-built one * `KERNEL_REMOTE_NAME`: git remote name (to add multiple git diff --git a/jenkins-common.sh b/jenkins-common.sh index 6c54109..e19b321 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -194,6 +194,12 @@ trap clean_up_common EXIT INT TERM 0 } +docker_kvm_param() { + if [ "$KERNEL_TEST_KVM" != 0 ]; then + echo "--device /dev/kvm:/dev/kvm" + fi +} + # Generate the initrd, and optionally build a kernel, for tests that involve # kernel modules. Boot the kernel once in QEMU inside docker to verify that it # works. See README.md for description of the KERNEL_* environment variables. @@ -212,6 +218,11 @@ local docker_image="$4" shift 4 + if [ "$KERNEL_TEST_KVM" != 0 ] && ! [ -e /dev/kvm ]; then + echo "ERROR: /dev/kvm not found! Consider running with: KERNEL_TEST_KVM=0" + exit 1 + fi + mkdir -p "$CACHE_DIR/kernel-test" cp "$kernel_config_fragment" \ @@ -221,7 +232,7 @@ docker run \ --cap-add=NET_ADMIN \ - --device /dev/kvm:/dev/kvm \ + $(docker_kvm_param) \ --device /dev/net/tun:/dev/net/tun \ -v "$CACHE_DIR:/cache" \ -v "$KERNEL_TEST_DIR:/kernel-test:ro" \ diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh index 0a1824f..1873af4 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -13,8 +13,14 @@ $@ " +if [ -e /dev/kvm ]; then + MACHINE_ARG="-machine pc,accel=kvm" +else + MACHINE_ARG="-machine pc" +fi + qemu-system-x86_64 \ - -machine pc,accel=kvm \ + $MACHINE_ARG \ -smp 1 \ -m 512M \ -nodefconfig -no-user-config -nodefaults -display none \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index c6ea729..1881d59 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -41,7 +41,7 @@ GGSN_CMD="/kernel-test/run-qemu.sh" GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 200) - --device /dev/kvm:/dev/kvm + $(docker_kvm_param) \ -v "$KERNEL_TEST_DIR:/kernel-test:ro" -v "$CACHE_DIR:/cache" " @@ -64,6 +64,10 @@ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" +if [ "$KERNEL_TEST" = 1 ] && [ "$KERNEL_TEST_KVM" = 0 ]; then + sleep 5 +fi + # start docker container with testsuite in foreground docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:17:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:17:56 +0000 Subject: Change in docker-playground[master]: ttcn3-msc: Drop uneeded module param mp_hlr_supports_dgsm References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23124 ) Change subject: ttcn3-msc: Drop uneeded module param mp_hlr_supports_dgsm ...................................................................... ttcn3-msc: Drop uneeded module param mp_hlr_supports_dgsm Since -latest was updated to newer releases, this param is never set to false anymore, and it already defaults to true, so there's no need to set it here explicitly. Furthermore, it will be completely dropped soon. Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Related: OS#5042 --- M ttcn3-msc-test/MSC_Tests.cfg 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/24/23124/1 diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg index d7b38fb..83c18c7 100644 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ b/ttcn3-msc-test/MSC_Tests.cfg @@ -51,10 +51,6 @@ # local (emulation) side) MSC_Tests.mp_hlr_ip := "172.18.20.103"; MSC_Tests.mp_mgw_ip := "172.18.20.103"; -MSC_Tests.mp_enable_crashing_tests := true; -MSC_Tests.mp_enable_cell_id_test := true; -BSC_ConnectionHandler.mp_expect_common_id := true; -MNCC_Emulation.mp_mncc_version := 7; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Gerrit-Change-Number: 23124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:18:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:18:52 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23125 ) Change subject: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version ...................................................................... ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version Since -latest was updated to newer releases, this param is never set to changed anymore, so there's no need to set it here explicitly. Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Related: OS#5042 --- M ttcn3-sip-test/SIP_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/25/23125/1 diff --git a/ttcn3-sip-test/SIP_Tests.cfg b/ttcn3-sip-test/SIP_Tests.cfg index b39d73d..2904e76 100644 --- a/ttcn3-sip-test/SIP_Tests.cfg +++ b/ttcn3-sip-test/SIP_Tests.cfg @@ -13,7 +13,6 @@ SIP_Tests.mp_local_host := "172.18.11.103" SIP_Tests.mp_osmosip_host := "172.18.11.10" SIP_Tests.mp_mncc := "/data/unix/mncc" -MNCC_Emulation.mp_mncc_version := 7 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Gerrit-Change-Number: 23125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:22:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:22:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Get rid of several uneeded module params References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23126 ) Change subject: msc: Get rid of several uneeded module params ...................................................................... msc: Get rid of several uneeded module params These params are not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I16575ae4f615bf7c42d5921917003007ba4872a0 Related: OS#5042 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 4 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/23126/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 3996a87..30adb03 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -62,10 +62,6 @@ import from TCCConversion_Functions { function f_strstr }; -modulepar { - boolean mp_expect_common_id := true; -} - /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends RAN_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr { var BSC_ConnHdlrPars g_pars; @@ -528,9 +524,7 @@ function f_expect_common_id() runs on BSC_ConnHdlr { if (g_pars.ran_is_geran) { - if (mp_expect_common_id) { - BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi)); - } + BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi)); } else { BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 6bad9c3..7a54e17 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -162,10 +162,6 @@ rctx := 1 } }; - - boolean mp_enable_cell_id_test := true; - - boolean mp_enable_crashing_tests := true; } /* altstep for the global guard timer (only used when BSSAP_DIRECT @@ -404,7 +400,7 @@ ran_is_geran := ran_is_geran, use_osmux := use_osmux, use_ipv6 := false, - verify_cell_id := mp_enable_cell_id_test and verify_cell_id + verify_cell_id := verify_cell_id }; if (not ran_is_geran) { pars.use_umts_aka := true; @@ -6534,10 +6530,8 @@ execute( TC_invalid_mgcp_crash() ); execute( TC_mm_id_resp_no_identity() ); execute( TC_lu_and_expire_while_paging() ); - if (mp_enable_crashing_tests) { - execute( TC_paging_response_imsi_unknown() ); - execute( TC_paging_response_tmsi_unknown() ); - } + execute( TC_paging_response_imsi_unknown() ); + execute( TC_paging_response_tmsi_unknown() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23126 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: I16575ae4f615bf7c42d5921917003007ba4872a0 Gerrit-Change-Number: 23126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:22:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:22:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: Don't need to set default value of MNNC version References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 ) Change subject: sip: Don't need to set default value of MNNC version ...................................................................... sip: Don't need to set default value of MNNC version The module param default value is already v7, no need to set it. Change-Id: Idb075f78e1de5a74a442f85dcf2c9e900e5511cb Related: OS#5042 --- M sip/SIP_Tests.default 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/23127/1 diff --git a/sip/SIP_Tests.default b/sip/SIP_Tests.default index 1c8c2dd..4434a1a 100644 --- a/sip/SIP_Tests.default +++ b/sip/SIP_Tests.default @@ -25,7 +25,6 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSIPcon"; -MNCC_Emulation.mp_mncc_version := 7; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 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: Idb075f78e1de5a74a442f85dcf2c9e900e5511cb Gerrit-Change-Number: 23127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:24:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:24:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Enable by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 ) Change subject: StatsD_Checker: Enable by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 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: I4e2049c109986906d3c985ca2282174b1abff581 Gerrit-Change-Number: 23113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:24:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:25:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:25:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Get rid of module param mp_media_mgw_offer_ipv6 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23116 ) Change subject: bsc: Get rid of module param mp_media_mgw_offer_ipv6 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23116 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: Ic693885dd3d4259dc6ce80643d25c7d432148d3d Gerrit-Change-Number: 23116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:25:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:25:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 12:25:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Enable by default In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 ) Change subject: StatsD_Checker: Enable by default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 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: I4e2049c109986906d3c985ca2282174b1abff581 Gerrit-Change-Number: 23113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 12:25:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:26:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:26:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 ) Change subject: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 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: I39e9c1986ea682d54dcb22b31798ca91f1677949 Gerrit-Change-Number: 23117 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:26:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:27:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:27:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Get rid of several uneeded module params In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23126 ) Change subject: msc: Get rid of several uneeded module params ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23126 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: I16575ae4f615bf7c42d5921917003007ba4872a0 Gerrit-Change-Number: 23126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:27:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:28:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:28:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: Don't need to set default value of MNNC version In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 ) Change subject: sip: Don't need to set default value of MNNC version ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 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: Idb075f78e1de5a74a442f85dcf2c9e900e5511cb Gerrit-Change-Number: 23127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:28:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:28:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:28:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Get rid of module param mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23120 ) Change subject: hlr: Get rid of module param mp_hlr_supports_dgsm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23120 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: I484267c169646310564bd6d9cd13a196b61400e4 Gerrit-Change-Number: 23120 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:28:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:30:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:30:21 +0000 Subject: Change in docker-playground[master]: Get rid of uneeded param StatsD_Checker.mp_enable_stats In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23114 ) Change subject: Get rid of uneeded param StatsD_Checker.mp_enable_stats ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 Gerrit-Change-Number: 23114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 12:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:30:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:30:49 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23115 ) Change subject: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1780320c69ec4a9f086677fd4884dec674f8332e Gerrit-Change-Number: 23115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:30:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:31:18 +0000 Subject: Change in docker-playground[master]: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23118 ) Change subject: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4bda577f1ed6964a2114df1aba366177998f0854 Gerrit-Change-Number: 23118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:31:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:31:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:31:33 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23119 ) Change subject: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icab36eba29ad4fadd07ec804ef713910b80ce706 Gerrit-Change-Number: 23119 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:31:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:32:34 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:32:34 +0000 Subject: Change in docker-playground[master]: ttcn3-msc: Drop uneeded module param mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23124 ) Change subject: ttcn3-msc: Drop uneeded module param mp_hlr_supports_dgsm ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/23124/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/23124/1//COMMIT_MSG at 7 PS1, Line 7: mp_hlr_supports_dgsm This parameter has nothing to do with osmo-msc. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Gerrit-Change-Number: 23124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:32:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:33:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:33:09 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23125 ) Change subject: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Gerrit-Change-Number: 23125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:33:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:36:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:36:08 +0000 Subject: Change in docker-playground[master]: ttcn3-msc: Drop uneeded module params In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/23124 ) Change subject: ttcn3-msc: Drop uneeded module params ...................................................................... ttcn3-msc: Drop uneeded module params Since -latest was updated to newer releases, there's no need to change the values of these params. Furthermore, they will be completely dropped soon. Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Related: OS#5042 --- M ttcn3-msc-test/MSC_Tests.cfg 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/24/23124/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Gerrit-Change-Number: 23124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:36:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:36:08 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version In-Reply-To: References: Message-ID: Hello fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23125 to look at the new patch set (#2). Change subject: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version ...................................................................... ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version Since -latest was updated to newer releases, this param is never set to changed anymore, so there's no need to set it here explicitly. Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Related: OS#5042 --- M ttcn3-sip-test/SIP_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/25/23125/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Gerrit-Change-Number: 23125 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:41:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23128 ) Change subject: BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid ...................................................................... BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid Since we have new releases in -latest, we don't need this param since it's never set to true. Related: OS~5042 Change-Id: Ic496407fd2139b3a5221c30f1798797320cdee24 --- M library/BSSGP_Emulation.ttcnpp M pcu/PCU_Tests_NS.ttcn 2 files changed, 1 insertion(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/23128/1 diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 1f32cc2..593abd8 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -37,12 +37,6 @@ import from SNDCP_Types all; - -modulepar { - /* tolerate CellID absence/presence in BVC-RESET in violation to spec */ - boolean mp_tolerate_bvc_reset_cellid := false; -} - /*********************************************************************** * Communication between Client Components and per-BVC component ***********************************************************************/ @@ -292,16 +286,6 @@ } BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0)); } - - /* work-around for old, buggy libosmogb before Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1 */ - [mp_tolerate_bvc_reset_cellid] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, g_cfg.bvc[0].cell_id), 0)) -> value udi { - log("Rx BVC-RESET for Signaling BVCI=0"); - f_sign_change_state(BVC_S_UNBLOCKED); - if (MGMT.checkstate("Connected")) { - MGMT.send(BssgpResetIndication:{0}); - } - BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0)); - } } private template PDU_BSSGP tr_GLOBAL_SIG := ( diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index 9cf37b5..e2bad4f 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -25,11 +25,6 @@ import from PCUIF_CodecPort all; import from RAW_NS all; -modulepar { - /* tolerate CellID absence/presence in BVC-RESET in violation to spec */ - boolean mp_tolerate_bvc_reset_cellid := false; -} - type component RAW_PCU_CT { /* PCUIF (we emulate the BTS part) */ port PCUIF_CODEC_PT PCU; @@ -197,11 +192,7 @@ f_outgoing_ns_alive(); /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - if (mp_tolerate_bvc_reset_cellid) { - as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.bvc[0].cell_id, omit, oneshot := true); - } else { - as_rx_bvc_reset_tx_ack(0, omit, omit, oneshot := true); - } + as_rx_bvc_reset_tx_ack(0, omit, omit, oneshot := true); as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id, omit, oneshot := true); as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvc[0].bvci, oneshot := true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23128 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: Ic496407fd2139b3a5221c30f1798797320cdee24 Gerrit-Change-Number: 23128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:41:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 12:41:55 +0000 Subject: Change in docker-playground[master]: ttcn3-msc: Drop uneeded module params In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23124 ) Change subject: ttcn3-msc: Drop uneeded module params ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Gerrit-Change-Number: 23124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 26 Feb 2021 12:41:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:49:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:49:56 +0000 Subject: Change in docker-playground[master]: kernel-test: add KERNEL_TEST_KVM env var In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: add KERNEL_TEST_KVM env var ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/docker-playground/+/23123/1/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/c/docker-playground/+/23123/1/jenkins-common.sh at 198 PS1, Line 198: if [ "$KERNEL_TEST_KVM" != 0 ]; then iiuc you are doing string comparisong here, so better use "0"? or "z$KERNEL_TEST_KVM" != "z0" or whatever https://gerrit.osmocom.org/c/docker-playground/+/23123/1/jenkins-common.sh at 221 PS1, Line 221: if [ "$KERNEL_TEST_KVM" != 0 ] && ! [ -e /dev/kvm ]; then Why not simply mounting /dev/kvm automatically if it exists? let's not add more flags which are not really needed? https://gerrit.osmocom.org/c/docker-playground/+/23123/1/ttcn3-ggsn-test/jenkins.sh File ttcn3-ggsn-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23123/1/ttcn3-ggsn-test/jenkins.sh at 68 PS1, Line 68: sleep 5 so it seems we finally need some sort of synchronization point? ;) Please add a comment explaining why is this needed. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 12:49:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:50:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:50:58 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add wipe_workspace to job template In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23121 ) Change subject: jobs/ttcn3: add wipe_workspace to job template ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 Gerrit-Change-Number: 23121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 12:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:53:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:53:27 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: shell cmd: put job-name into DIR var In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: shell cmd: put job-name into DIR var ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/23122/1/jobs/ttcn3-testsuites.yml File jobs/ttcn3-testsuites.yml: https://gerrit.osmocom.org/c/osmo-ci/+/23122/1/jobs/ttcn3-testsuites.yml at 228 PS1, Line 228: case "$DIR" in so this is not really DIR, but job-name. The change is misleading. I would avoid setting DIR="{job-name}" directly above. Better add a JOB_NAME="{job-name}" var if you want. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 12:53:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 12:55:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 12:55:37 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-ci/+/23006/3/jobs/ttcn3-testsuites.yml File jobs/ttcn3-testsuites.yml: https://gerrit.osmocom.org/c/osmo-ci/+/23006/3/jobs/ttcn3-testsuites.yml at 25 PS3, Line 25: - ttcn3-ggsn-test-kernel: Did you check 10 min per run is enough? Looks a bit tight imho. https://gerrit.osmocom.org/c/osmo-ci/+/23006/3/jobs/ttcn3-testsuites.yml at 236 PS3, Line 236: export KERNEL_TEST_KVM=0 see my point on automatically disabling kvm accel if not present in host. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 12:55:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 13:59:41 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 13:59:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: Don't need to set default value of MNNC version In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 ) Change subject: sip: Don't need to set default value of MNNC version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 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: Idb075f78e1de5a74a442f85dcf2c9e900e5511cb Gerrit-Change-Number: 23127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 13:59:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 14:00:44 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 14:00:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23128 ) Change subject: BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23128 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: Ic496407fd2139b3a5221c30f1798797320cdee24 Gerrit-Change-Number: 23128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 14:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 14:41:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 14:41:29 +0000 Subject: Change in docker-playground[master]: kernel-test: add KERNEL_TEST_KVM env var In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23123 to look at the new patch set (#2). Change subject: kernel-test: add KERNEL_TEST_KVM env var ...................................................................... kernel-test: add KERNEL_TEST_KVM env var Allow to disable KVM, as the jenkins nodes apparently don't support it. This makes the tests run a bit slower, but not much. Add kernel_test_wait_for_vm to sleep until the VM is booted up (~5 s instead of ~1s without KVM), so the first test in the testsuite does not fail when using KVM. The variable is useful to test the non-KVM code path even if KVM is available on the host. Related: OS#3208 Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 --- M README.md M jenkins-common.sh M scripts/kernel-test/initrd-init.sh M scripts/kernel-test/run-qemu.sh M ttcn3-ggsn-test/jenkins.sh 5 files changed, 50 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/23123/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 14:42:18 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 14:42:18 +0000 Subject: Change in docker-playground[master]: kernel-test: add KERNEL_TEST_KVM env var In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: add KERNEL_TEST_KVM env var ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/docker-playground/+/23123/1/jenkins-common.sh File jenkins-common.sh: https://gerrit.osmocom.org/c/docker-playground/+/23123/1/jenkins-common.sh at 198 PS1, Line 198: if [ "$KERNEL_TEST_KVM" != 0 ]; then > iiuc you are doing string comparisong here, so better use "0"? or "z$KERNEL_TEST_KVM" != "z0" or wh [?] Yes, '!=' is always doing string comparison (see 'man test'). "" is needed around variables $FOO, but not around strings without special characters (spaces, ...). z$FOO is only needed if using `set -u` (which I personally don't like so much, as it makes the code less readable with little to none practical benefit). So this comes down to personal preference... really, I think this line is pretty clear as it is. https://gerrit.osmocom.org/c/docker-playground/+/23123/1/jenkins-common.sh at 221 PS1, Line 221: if [ "$KERNEL_TEST_KVM" != 0 ] && ! [ -e /dev/kvm ]; then > Why not simply mounting /dev/kvm automatically if it exists? let's not add more flags which are not [?] This is useful to run the same code path locally, as it would run on jenkins. Even if KVM is available locally. Noted this in the commit message. https://gerrit.osmocom.org/c/docker-playground/+/23123/1/ttcn3-ggsn-test/jenkins.sh File ttcn3-ggsn-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/23123/1/ttcn3-ggsn-test/jenkins.sh at 68 PS1, Line 68: sleep 5 > so it seems we finally need some sort of synchronization point? ;) Right, that would be more elegant. Added it again. I chose to grep the log file (like the smoke test), because there's no shared directory between docker and QEMU. > Please add a comment explaining why is this needed. The new function has a descriptive name, so there should be no need to describe it in jenkins.sh. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 14:42:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 14:42:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 14:42:28 +0000 Subject: Change in docker-playground[master]: kernel-test: add KERNEL_TEST_KVM env var In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: add KERNEL_TEST_KVM env var ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 14:42:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 14:50:35 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 14:50:35 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-ci/+/23006/3/jobs/ttcn3-testsuites.yml File jobs/ttcn3-testsuites.yml: https://gerrit.osmocom.org/c/osmo-ci/+/23006/3/jobs/ttcn3-testsuites.yml at 25 PS3, Line 25: - ttcn3-ggsn-test-kernel: > Did you check 10 min per run is enough? Looks a bit tight imho. Currently the runtime is 2 to 3 minutes for all ttcn3-ggsn-test-*, when all docker containers are already built, and in case of the one building a kernel, if the sources are already cloned (only happens once, subsequent jobs just pull) and if the kernel is already built (also previous kernel is reused if nothing changed). (From "Last Duration" column in https://jenkins.osmocom.org/jenkins/view/TTCN3/ ) If the jobs should not be finished already, they get added to the queue. They don't run in parallel because of the "blocking:" thing. So IMHO this is fine. But if you insist, I can move the whole block down (e.g. to 11:00) with more spaced out timers. https://gerrit.osmocom.org/c/osmo-ci/+/23006/3/jobs/ttcn3-testsuites.yml at 236 PS3, Line 236: export KERNEL_TEST_KVM=0 > see my point on automatically disabling kvm accel if not present in host. Let's discuss this in the other patch; this one depends on it anyway: https://gerrit.osmocom.org/c/docker-playground/+/23123 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 14:50:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:20:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:20:54 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: tweak shell cmd In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 to look at the new patch set (#2). Change subject: jobs/ttcn3: tweak shell cmd ...................................................................... jobs/ttcn3: tweak shell cmd Move 'cd' and './jenkins.sh' commands towards the end, so they are not repeated in the case block of each pattern. This is in preparation for the ggsn kernel mod test, which will need new patterns. Related: OS#3208 Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 --- M jobs/ttcn3-testsuites.yml 1 file changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/23122/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:20:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:20:54 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 to look at the new patch set (#4). Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I1f337af1e2de6db05b22636bc31a535404235559 Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/23006/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:21:11 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:21:11 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: tweak shell cmd In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: tweak shell cmd ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/23122/1/jobs/ttcn3-testsuites.yml File jobs/ttcn3-testsuites.yml: https://gerrit.osmocom.org/c/osmo-ci/+/23122/1/jobs/ttcn3-testsuites.yml at 228 PS1, Line 228: case "$DIR" in > so this is not really DIR, but job-name. The change is misleading. [?] You are right, this is weird. I've kept {job-name} without extra shell var and changed the logic in the follow-up patch, to simply extend this case...esac instead of adding another. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:21:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:26:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:26:37 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 to look at the new patch set (#5). Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I1f337af1e2de6db05b22636bc31a535404235559 Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 33 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/23006/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Enable by default In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 ) Change subject: StatsD_Checker: Enable by default ...................................................................... StatsD_Checker: Enable by default It was previously disabled by default in order to avoid test breakage with older versions of osmocom projects not supporting them. Since we just did a new release, all -latest contian now master which should work fine. Don't remove the moduleparam yet in order to avoid breakage with some cfg files in docker-playground.git still setting it to true. Related: OS#5042 Change-Id: I4e2049c109986906d3c985ca2282174b1abff581 --- M bsc/BSC_Tests.default M library/StatsD_Checker.ttcn M ns/NS_Tests.default M pcu/PCU_Tests.default 4 files changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default index c5d1559..50c5c0a 100644 --- a/bsc/BSC_Tests.default +++ b/bsc/BSC_Tests.default @@ -29,6 +29,5 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBSC"; -StatsD_Checker.mp_enable_stats := true; [EXECUTE] diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn index 540e479..1c8fd12 100644 --- a/library/StatsD_Checker.ttcn +++ b/library/StatsD_Checker.ttcn @@ -38,7 +38,7 @@ modulepar { /* Whether to test stats values */ - boolean mp_enable_stats := false; + boolean mp_enable_stats := true; } type record StatsDExpect { diff --git a/ns/NS_Tests.default b/ns/NS_Tests.default index 951c1c2..1c61bec 100644 --- a/ns/NS_Tests.default +++ b/ns/NS_Tests.default @@ -8,7 +8,6 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoNSdummy"; -StatsD_Checker.mp_enable_stats := true; [TESTPORT_PARAMETERS] *.NSVTY.CTRL_MODE := "client" diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default index 4d6c0a2..6f633d2 100644 --- a/pcu/PCU_Tests.default +++ b/pcu/PCU_Tests.default @@ -30,7 +30,6 @@ }; Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; PCUIF_Types.mp_pcuif_version := 10; -StatsD_Checker.mp_enable_stats := true; [TESTPORT_PARAMETERS] *.PCU.socket_type := "SEQPACKET" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23113 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: I4e2049c109986906d3c985ca2282174b1abff581 Gerrit-Change-Number: 23113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Get rid of module param mp_media_mgw_offer_ipv6 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23116 ) Change subject: bsc: Get rid of module param mp_media_mgw_offer_ipv6 ...................................................................... bsc: Get rid of module param mp_media_mgw_offer_ipv6 This param is not needed anymore sincenew releases used in -latest don't need to disable it. Let's keep the possibility to change behavior from within test and leave v6 enabled by default as it used to be. Related: OS#5042 Change-Id: Ic693885dd3d4259dc6ce80643d25c7d432148d3d --- M bsc/BSC_Tests.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index dc94b74..e4e2d1a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -671,8 +671,6 @@ boolean mp_enable_osmux_test := true; /* Value set in osmo-bsc.cfg "ms max power" */ uint8_t mp_exp_ms_power_level := 7; - - boolean mp_media_mgw_offer_ipv6 := true; } private function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams { @@ -685,7 +683,6 @@ } pars.exp_ms_power_level := mp_exp_ms_power_level; pars.mscpool.bssap_idx := bssap_idx; - pars.media_mgw_offer_ipv6 := mp_media_mgw_offer_ipv6; return pars; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23116 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: Ic693885dd3d4259dc6ce80643d25c7d432148d3d Gerrit-Change-Number: 23116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 ) Change subject: RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid ...................................................................... RSL_Emulation: Get rid of module param mp_rslem_patch_ipa_cid This param is not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I39e9c1986ea682d54dcb22b31798ca91f1677949 Related: OS#5042 --- M library/RSL_Emulation.ttcn 1 file changed, 0 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 0a20459..cb8b763 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -34,13 +34,6 @@ import from IPA_Types all; import from IPA_Emulation all; - -modulepar { - /* Work around switch for ttcn3-bts-test-latest, enables patching of IPA - * stream ID in the "BSC" mode. See I5927f59a49724170a63e87be604973f7c9d5d8be. */ - boolean mp_rslem_patch_ipa_cid := false; -}; - /* General "base class" component definition, of which specific implementations * derive themselves by means of the "extends" feature */ type component RSL_DchanHdlr { @@ -419,19 +412,6 @@ return TrxConnMap[trx_nr]; } -/* Work around for a bug in osmo-bts when all transceivers use IPAC_PROTO_RSL_TRX0 */ -private function f_trx_conn_map_patch_ud(inout ASP_RSL_Unitdata ud) -runs on RSL_Emulation_CT { - for (var integer i := 0; i < sizeof(TrxConnMap); i := i + 1) { - if (ud.conn_id == TrxConnMap[i]) { - ud.streamId := f_streamId_by_trx(i); - return; /* We're done */ - } - } - - testcase.stop("Failed to patch IPA stream ID in ASP RSL UD: ", ud); -} - private type record of ASP_RSL_Unitdata ASP_RSL_UDList; type component RSL_Emulation_CT { @@ -587,17 +567,11 @@ /* Forward common channel management to the special port for it */ [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeT(?), sid := ?)) -> value rx_rsl { - if (not bts_role and mp_rslem_patch_ipa_cid) { - f_trx_conn_map_patch_ud(rx_rsl); - } CCHAN_PT.send(rx_rsl); } /* Forward common channel management to the special port for it */ [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeC(?), sid := ?)) -> value rx_rsl { - if (not bts_role and mp_rslem_patch_ipa_cid) { - f_trx_conn_map_patch_ud(rx_rsl); - } CCHAN_PT.send(rx_rsl); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23117 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: I39e9c1986ea682d54dcb22b31798ca91f1677949 Gerrit-Change-Number: 23117 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Get rid of several uneeded module params In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23126 ) Change subject: msc: Get rid of several uneeded module params ...................................................................... msc: Get rid of several uneeded module params These params are not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I16575ae4f615bf7c42d5921917003007ba4872a0 Related: OS#5042 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 4 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 3996a87..30adb03 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -62,10 +62,6 @@ import from TCCConversion_Functions { function f_strstr }; -modulepar { - boolean mp_expect_common_id := true; -} - /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends RAN_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr { var BSC_ConnHdlrPars g_pars; @@ -528,9 +524,7 @@ function f_expect_common_id() runs on BSC_ConnHdlr { if (g_pars.ran_is_geran) { - if (mp_expect_common_id) { - BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi)); - } + BSSAP.receive(tr_BSSMAP_CommonId(g_pars.imsi)); } else { BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 6bad9c3..7a54e17 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -162,10 +162,6 @@ rctx := 1 } }; - - boolean mp_enable_cell_id_test := true; - - boolean mp_enable_crashing_tests := true; } /* altstep for the global guard timer (only used when BSSAP_DIRECT @@ -404,7 +400,7 @@ ran_is_geran := ran_is_geran, use_osmux := use_osmux, use_ipv6 := false, - verify_cell_id := mp_enable_cell_id_test and verify_cell_id + verify_cell_id := verify_cell_id }; if (not ran_is_geran) { pars.use_umts_aka := true; @@ -6534,10 +6530,8 @@ execute( TC_invalid_mgcp_crash() ); execute( TC_mm_id_resp_no_identity() ); execute( TC_lu_and_expire_while_paging() ); - if (mp_enable_crashing_tests) { - execute( TC_paging_response_imsi_unknown() ); - execute( TC_paging_response_tmsi_unknown() ); - } + execute( TC_paging_response_imsi_unknown() ); + execute( TC_paging_response_tmsi_unknown() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23126 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: I16575ae4f615bf7c42d5921917003007ba4872a0 Gerrit-Change-Number: 23126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sip: Don't need to set default value of MNNC version In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 ) Change subject: sip: Don't need to set default value of MNNC version ...................................................................... sip: Don't need to set default value of MNNC version The module param default value is already v7, no need to set it. Change-Id: Idb075f78e1de5a74a442f85dcf2c9e900e5511cb Related: OS#5042 --- M sip/SIP_Tests.default 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/sip/SIP_Tests.default b/sip/SIP_Tests.default index 1c8c2dd..4434a1a 100644 --- a/sip/SIP_Tests.default +++ b/sip/SIP_Tests.default @@ -25,7 +25,6 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSIPcon"; -MNCC_Emulation.mp_mncc_version := 7; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23127 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: Idb075f78e1de5a74a442f85dcf2c9e900e5511cb Gerrit-Change-Number: 23127 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Get rid of module param mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23120 ) Change subject: hlr: Get rid of module param mp_hlr_supports_dgsm ...................................................................... hlr: Get rid of module param mp_hlr_supports_dgsm This param is not needed anymore since new releases used in -latest don't need to disable it. Change-Id: I484267c169646310564bd6d9cd13a196b61400e4 Related: OS#5042 --- M hlr/HLR_Tests.cfg M hlr/HLR_Tests.ttcn 2 files changed, 6 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/hlr/HLR_Tests.cfg b/hlr/HLR_Tests.cfg index 1ab6e87..7416362 100644 --- a/hlr/HLR_Tests.cfg +++ b/hlr/HLR_Tests.cfg @@ -12,7 +12,6 @@ [MODULE_PARAMETERS] -HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index ea450b3..959c680 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -70,9 +70,6 @@ /* emulated GSUP server (second HLR) */ charstring mp_hlr_ts_ip := "127.0.0.99"; integer mp_hlr_ts_port := 4222; - - /* drop after osmo-hlr release > 1.2.0 */ - boolean mp_hlr_supports_dgsm := true; }; type record HlrSubscrAud2G { @@ -154,9 +151,7 @@ map(self:VTY, system:VTY); f_vty_set_prompts(VTY); f_vty_transceive(VTY, "enable"); - if (mp_hlr_supports_dgsm) { - f_vty_config(VTY, "mslookup", "no mdns bind"); - } + f_vty_config(VTY, "mslookup", "no mdns bind"); } private altstep as_Tguard() runs on test_CT { @@ -1973,13 +1968,11 @@ execute( TC_subscr_create_on_demand_ul() ); execute( TC_subscr_create_on_demand_sai() ); - if (mp_hlr_supports_dgsm) { - execute( TC_MSLookup_mDNS_service_other_home() ); - execute( TC_MSLookup_GSUP_proxy() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); - execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); - execute( TC_MSLookup_mDNS_service_other_proxy() ); - } + execute( TC_MSLookup_mDNS_service_other_home() ); + execute( TC_MSLookup_GSUP_proxy() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_home() ); + execute( TC_MSLookup_mDNS_service_GSUP_HLR_proxy() ); + execute( TC_MSLookup_mDNS_service_other_proxy() ); }; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23120 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: I484267c169646310564bd6d9cd13a196b61400e4 Gerrit-Change-Number: 23120 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23128 ) Change subject: BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid ...................................................................... BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid Since we have new releases in -latest, we don't need this param since it's never set to true. Related: OS~5042 Change-Id: Ic496407fd2139b3a5221c30f1798797320cdee24 --- M library/BSSGP_Emulation.ttcnpp M pcu/PCU_Tests_NS.ttcn 2 files changed, 1 insertion(+), 26 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 1f32cc2..593abd8 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -37,12 +37,6 @@ import from SNDCP_Types all; - -modulepar { - /* tolerate CellID absence/presence in BVC-RESET in violation to spec */ - boolean mp_tolerate_bvc_reset_cellid := false; -} - /*********************************************************************** * Communication between Client Components and per-BVC component ***********************************************************************/ @@ -292,16 +286,6 @@ } BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0)); } - - /* work-around for old, buggy libosmogb before Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1 */ - [mp_tolerate_bvc_reset_cellid] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, g_cfg.bvc[0].cell_id), 0)) -> value udi { - log("Rx BVC-RESET for Signaling BVCI=0"); - f_sign_change_state(BVC_S_UNBLOCKED); - if (MGMT.checkstate("Connected")) { - MGMT.send(BssgpResetIndication:{0}); - } - BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0)); - } } private template PDU_BSSGP tr_GLOBAL_SIG := ( diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn index 9cf37b5..e2bad4f 100644 --- a/pcu/PCU_Tests_NS.ttcn +++ b/pcu/PCU_Tests_NS.ttcn @@ -25,11 +25,6 @@ import from PCUIF_CodecPort all; import from RAW_NS all; -modulepar { - /* tolerate CellID absence/presence in BVC-RESET in violation to spec */ - boolean mp_tolerate_bvc_reset_cellid := false; -} - type component RAW_PCU_CT { /* PCUIF (we emulate the BTS part) */ port PCUIF_CODEC_PT PCU; @@ -197,11 +192,7 @@ f_outgoing_ns_alive(); /* Expect BVC-RESET for signaling (0) and ptp BVCI */ - if (mp_tolerate_bvc_reset_cellid) { - as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.bvc[0].cell_id, omit, oneshot := true); - } else { - as_rx_bvc_reset_tx_ack(0, omit, omit, oneshot := true); - } + as_rx_bvc_reset_tx_ack(0, omit, omit, oneshot := true); as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id, omit, oneshot := true); as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvc[0].bvci, oneshot := true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23128 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: Ic496407fd2139b3a5221c30f1798797320cdee24 Gerrit-Change-Number: 23128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:24 +0000 Subject: Change in docker-playground[master]: Get rid of uneeded param StatsD_Checker.mp_enable_stats In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23114 ) Change subject: Get rid of uneeded param StatsD_Checker.mp_enable_stats ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 Gerrit-Change-Number: 23114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:31:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:26 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23115 ) Change subject: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1780320c69ec4a9f086677fd4884dec674f8332e Gerrit-Change-Number: 23115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:31:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:27 +0000 Subject: Change in docker-playground[master]: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23118 ) Change subject: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4bda577f1ed6964a2114df1aba366177998f0854 Gerrit-Change-Number: 23118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:31:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:29 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23119 ) Change subject: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icab36eba29ad4fadd07ec804ef713910b80ce706 Gerrit-Change-Number: 23119 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:31 +0000 Subject: Change in docker-playground[master]: ttcn3-msc: Drop uneeded module params In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23124 ) Change subject: ttcn3-msc: Drop uneeded module params ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Gerrit-Change-Number: 23124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:31:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:32 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23125 ) Change subject: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Gerrit-Change-Number: 23125 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:31:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:34 +0000 Subject: Change in docker-playground[master]: Get rid of uneeded param StatsD_Checker.mp_enable_stats In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23114 ) Change subject: Get rid of uneeded param StatsD_Checker.mp_enable_stats ...................................................................... Get rid of uneeded param StatsD_Checker.mp_enable_stats This param is currently set to true by default and will be removed soon. Related: OS#5042 Depends: osmo-ttcn3-hacks.git Change-Id I4e2049c109986906d3c985ca2282174b1abff581 Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 --- M ttcn3-bsc-test/BSC_Tests.cfg M ttcn3-bsc-test/sccplite/BSC_Tests.cfg M ttcn3-pcu-test/PCU_Tests.cfg 3 files changed, 0 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 2a9b435..83de0ef 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -68,7 +68,6 @@ BSC_Tests_CBSP.mp_cbc_ip6 := "fd02:db8:2::203"; BSC_Tests_CBSP.mp_bsc_cbsp_ip := "172.18.2.20"; BSC_Tests_CBSP.mp_bsc_cbsp_ip6 := "fd02:db8:2::20"; -StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg index 0ad10b2..f1f02d6 100644 --- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -26,7 +26,6 @@ rctx := 0 } }; -StatsD_Checker.mp_enable_stats := true; BSC_Tests.mp_enable_lcs_tests := false; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 43e9d88..07d9c3a 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -36,7 +36,6 @@ } } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; -StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3c7e7dc985a339d884dc388b33bf8a6ec986c5b7 Gerrit-Change-Number: 23114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:35 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23115 ) Change subject: ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 ...................................................................... ttcn3-bsc: Get rid of uneeded param BSC_Tests.mp_media_mgw_offer_ipv6 This param is true by default and there's no one setting it to false anymore (and soon will be removed). Related: OS#5042 Change-Id: I1780320c69ec4a9f086677fd4884dec674f8332e --- M ttcn3-bsc-test/BSC_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 83de0ef..ad189c9 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -13,7 +13,6 @@ BSC_Tests.mp_bsc_ip := "172.18.2.20"; BSC_Tests.mp_test_ip := "172.18.2.203"; BSC_Tests.mp_enable_osmux_test := true; -BSC_Tests.mp_media_mgw_offer_ipv6 := true; BSC_Tests.mp_bssap_cfg := { { transport := BSSAP_TRANSPORT_AoIP, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1780320c69ec4a9f086677fd4884dec674f8332e Gerrit-Change-Number: 23115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:36 +0000 Subject: Change in docker-playground[master]: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23118 ) Change subject: bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid ...................................................................... bts-test: Drop uneeded module param RSL_Emulation.mp_rslem_patch_ipa_cid Since we updated -latest to new releases, this param is never set to true anymore. Furtermore, it will be dropped soon completely. Related: OS#5042 Depends: osmo-ttcn3-hacks.git Change-Id I39e9c1986ea682d54dcb22b31798ca91f1677949 Change-Id: I4bda577f1ed6964a2114df1aba366177998f0854 --- M ttcn3-bts-test/BTS_Tests.cfg 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/BTS_Tests.cfg index 97608bb..a899b5c 100644 --- a/ttcn3-bts-test/BTS_Tests.cfg +++ b/ttcn3-bts-test/BTS_Tests.cfg @@ -16,9 +16,6 @@ L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" BTS_Tests.mp_ctrl_ip := "172.18.9.20" -# Workaround for osmo-bts-latest: enable IPA stream ID patching -RSL_Emulation.mp_rslem_patch_ipa_cid := false; - [MAIN_CONTROLLER] [EXECUTE] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4bda577f1ed6964a2114df1aba366177998f0854 Gerrit-Change-Number: 23118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:37 +0000 Subject: Change in docker-playground[master]: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23119 ) Change subject: ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm ...................................................................... ttcn3-hlr: Drop uneeded module param HLR_Tests.mp_hlr_supports_dgsm Since -latest was updated to newer releases, this param is never set to false anymore, and it already defaults to true, so there's no need to set it here explicitly. Furthermore, it will be completely dropped soon. Change-Id: Icab36eba29ad4fadd07ec804ef713910b80ce706 --- M ttcn3-hlr-test/HLR_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Verified diff --git a/ttcn3-hlr-test/HLR_Tests.cfg b/ttcn3-hlr-test/HLR_Tests.cfg index 9258cea..b8aa886 100644 --- a/ttcn3-hlr-test/HLR_Tests.cfg +++ b/ttcn3-hlr-test/HLR_Tests.cfg @@ -9,7 +9,6 @@ [MODULE_PARAMETERS] HLR_Tests.mp_hlr_ip := "172.18.10.20" -HLR_Tests.mp_hlr_supports_dgsm := true [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icab36eba29ad4fadd07ec804ef713910b80ce706 Gerrit-Change-Number: 23119 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:37 +0000 Subject: Change in docker-playground[master]: ttcn3-msc: Drop uneeded module params In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23124 ) Change subject: ttcn3-msc: Drop uneeded module params ...................................................................... ttcn3-msc: Drop uneeded module params Since -latest was updated to newer releases, there's no need to change the values of these params. Furthermore, they will be completely dropped soon. Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Related: OS#5042 --- M ttcn3-msc-test/MSC_Tests.cfg 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Verified diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg index d7b38fb..83c18c7 100644 --- a/ttcn3-msc-test/MSC_Tests.cfg +++ b/ttcn3-msc-test/MSC_Tests.cfg @@ -51,10 +51,6 @@ # local (emulation) side) MSC_Tests.mp_hlr_ip := "172.18.20.103"; MSC_Tests.mp_mgw_ip := "172.18.20.103"; -MSC_Tests.mp_enable_crashing_tests := true; -MSC_Tests.mp_enable_cell_id_test := true; -BSC_ConnectionHandler.mp_expect_common_id := true; -MNCC_Emulation.mp_mncc_version := 7; [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6121b435c5b984eab64d953e9d3f26eecc0e7bc5 Gerrit-Change-Number: 23124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:31:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:31:37 +0000 Subject: Change in docker-playground[master]: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23125 ) Change subject: ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version ...................................................................... ttcn3-sip: Drop uneeded module param MNCC_Emulation.mp_mncc_version Since -latest was updated to newer releases, this param is never set to changed anymore, so there's no need to set it here explicitly. Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Related: OS#5042 --- M ttcn3-sip-test/SIP_Tests.cfg 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: pespin: Verified fixeria: Looks good to me, approved diff --git a/ttcn3-sip-test/SIP_Tests.cfg b/ttcn3-sip-test/SIP_Tests.cfg index b39d73d..2904e76 100644 --- a/ttcn3-sip-test/SIP_Tests.cfg +++ b/ttcn3-sip-test/SIP_Tests.cfg @@ -13,7 +13,6 @@ SIP_Tests.mp_local_host := "172.18.11.103" SIP_Tests.mp_osmosip_host := "172.18.11.10" SIP_Tests.mp_mncc := "/data/unix/mncc" -MNCC_Emulation.mp_mncc_version := 7 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9d6b7f383d6532f8f2da381e80f98af82a98e74 Gerrit-Change-Number: 23125 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:32:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:32:34 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: tweak shell cmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: tweak shell cmd ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:32:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:32:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:32:38 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add wipe_workspace to job template In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23121 ) Change subject: jobs/ttcn3: add wipe_workspace to job template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 Gerrit-Change-Number: 23121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:32:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:33:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:33:32 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:33:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:36:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 15:36:37 +0000 Subject: Change in docker-playground[master]: kernel-test: add KERNEL_TEST_KVM env var In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: add KERNEL_TEST_KVM env var ...................................................................... Patch Set 2: Ok, fine with keeping the flag then, but can we simply make it 1/0 by default on whether host has /dev/kvm? This way if one wants to test a specific code path it's still possible, but in general we don't care. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:36:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:47:48 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:47:48 +0000 Subject: Change in docker-playground[master]: kernel-test: don't try to use KVM if not available In-Reply-To: References: Message-ID: Hello pespin, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23123 to look at the new patch set (#3). Change subject: kernel-test: don't try to use KVM if not available ...................................................................... kernel-test: don't try to use KVM if not available Disable KVM if /dev/kvm is missing, as it is apparently the case on our jenkins nodes. This makes the tests run a bit slower, but not much. Add kernel_test_wait_for_vm to sleep until the VM is booted up (~5 s instead of ~1s without KVM), so the first test in the testsuite does not fail when using KVM. The variable is useful to test the non-KVM code path even if KVM is available on the host. Related: OS#3208 Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 --- M README.md M jenkins-common.sh M scripts/kernel-test/initrd-init.sh M scripts/kernel-test/run-qemu.sh M ttcn3-ggsn-test/jenkins.sh 5 files changed, 54 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/23123/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:48:08 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:48:08 +0000 Subject: Change in docker-playground[master]: kernel-test: don't try to use KVM if not available In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: don't try to use KVM if not available ...................................................................... Patch Set 2: > Patch Set 2: > > Ok, fine with keeping the flag then, but can we simply make it 1/0 by default on whether host has /dev/kvm? This way if one wants to test a specific code path it's still possible, but in general we don't care. Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:48:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:49:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:49:25 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 to look at the new patch set (#6). Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I1f337af1e2de6db05b22636bc31a535404235559 Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/06/23006/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:50:24 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:50:24 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... Patch Set 6: Verified+1 Code-Review+2 Removed export KERNEL_TEST_KVM=0, as it gets autodetected now (see other patch review). Re-applying +2. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:50:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:50:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:50:29 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: tweak shell cmd In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: tweak shell cmd ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 15:50:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:50:49 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:50:49 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add wipe_workspace to job template In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23121 ) Change subject: jobs/ttcn3: add wipe_workspace to job template ...................................................................... jobs/ttcn3: add wipe_workspace to job template Prepare for the ggsn kernel module test, where we don't want to wipe the workspace with the cloned linux git tree. Related: OS#3208 Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index eb46770..d787957 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -7,6 +7,7 @@ node: ttcn3 # Block *-latest for all master jobs (without suffix) blocking: "^{job-name}.*" + wipe_workspace: true jobs: - "{job-name}" # Folders from docker-playground.git @@ -246,6 +247,7 @@ url: git://git.osmocom.org/docker-playground git-config-name: 'Jenkins Builder' git-config-email: 'jenkins at osmocom.org' + wipe-workspace: "{obj:wipe_workspace}" triggers: - timed: "{obj:timer}" publishers: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5843513c376d2b78be8ab90b21a747d31a827f1 Gerrit-Change-Number: 23121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:50:49 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:50:49 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: tweak shell cmd In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23122 ) Change subject: jobs/ttcn3: tweak shell cmd ...................................................................... jobs/ttcn3: tweak shell cmd Move 'cd' and './jenkins.sh' commands towards the end, so they are not repeated in the case block of each pattern. This is in preparation for the ggsn kernel mod test, which will need new patterns. Related: OS#3208 Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 --- M jobs/ttcn3-testsuites.yml 1 file changed, 14 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index d787957..59f0397 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -222,24 +222,30 @@ builders: - shell: |- export REGISTRY_HOST="registry.osmocom.org" + + # Translate job name to docker-playground dir and relevant + # environment variables case "{job-name}" in TTCN3-centos-*-latest) - cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" - IMAGE_SUFFIX="latest-centos8" ./jenkins.sh + DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" + export IMAGE_SUFFIX="latest-centos8" ;; TTCN3-centos-*) - cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)" - IMAGE_SUFFIX="master-centos8" ./jenkins.sh + DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)" + export IMAGE_SUFFIX="master-centos8" ;; *-latest) - cd "$(echo "{job-name}" | sed s/\-latest$//)" - IMAGE_SUFFIX="latest" ./jenkins.sh + DIR="$(echo "{job-name}" | sed s/\-latest$//)" + export IMAGE_SUFFIX="latest" ;; *) - cd "{job-name}" - IMAGE_SUFFIX="master" ./jenkins.sh + DIR="{job-name}" + export IMAGE_SUFFIX="master" ;; esac + + cd "$DIR" + ./jenkins.sh scm: - git: branches: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0fac24b961b1abb09317144ec2f65d4e21eb70c2 Gerrit-Change-Number: 23122 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:50:50 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:50:50 +0000 Subject: Change in osmo-ci[master]: jobs/ttcn3: add osmo-ggsn kernel tests In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23006 ) Change subject: jobs/ttcn3: add osmo-ggsn kernel tests ...................................................................... jobs/ttcn3: add osmo-ggsn kernel tests Run osmo-ggsn ttcn3 tests against the gtp kernel module from the debian kernel and from HEAD of the linux netdev/net-next git repository. Depends: docker-playground I1f337af1e2de6db05b22636bc31a535404235559 Related: OS#3208 Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb --- M jobs/ttcn3-testsuites.yml 1 file changed, 32 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 59f0397..cc66836 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -22,9 +22,21 @@ - ttcn3-ggsn-test: blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * + - ttcn3-ggsn-test-kernel: + blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" + timer: 10 04 * * * + - ttcn3-ggsn-test-kernel-latest: + blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" + timer: 20 04 * * * + - ttcn3-ggsn-test-kernel-net-next: + blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" + timer: 30 04 * * * + # Cache the linux source tree in the workspace of one node + node: ttcn3-ggsn-test-kernel-net-next + wipe_workspace: false - ttcn3-msc-test: blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" - timer: 30 04 * * * + timer: 40 04 * * * - ttcn3-pcu-test: blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * @@ -226,6 +238,25 @@ # Translate job name to docker-playground dir and relevant # environment variables case "{job-name}" in + ttcn3-ggsn-test-kernel) + DIR="ttcn3-ggsn-test" + export IMAGE_SUFFIX="master" + # Run against debian's kernel + export KERNEL_TEST=1 + ;; + ttcn3-ggsn-test-kernel-latest) + DIR="ttcn3-ggsn-test" + export IMAGE_SUFFIX="latest" + export KERNEL_TEST=1 + ;; + ttcn3-ggsn-test-kernel-net-next) + DIR="ttcn3-ggsn-test" + export IMAGE_SUFFIX="master" + # Build net-next kernel from source, default git repo from: + # docker-playground.git scripts/kernel-test/kernel-build.sh + export KERNEL_TEST=1 + export KERNEL_BUILD=1 + ;; TTCN3-centos-*-latest) DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" export IMAGE_SUFFIX="latest-centos8" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c496af78820d95549da22c1271bafe911f7eefb Gerrit-Change-Number: 23006 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 15:59:11 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 15:59:11 +0000 Subject: Change in osmo-pcu[master]: bts: Add new stats to detect TBF allocation failure reasons In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23110 ) Change subject: bts: Add new stats to detect TBF allocation failure reasons ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/23110/2/src/bts.cpp File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23110/2/src/bts.cpp at 103 PS2, Line 103: { "tbf:alloc:failed", "TBF Alloc Failure (ALL)"}, "(ALL)" sounds like this can somehow display the sum of the specific TBF Alloc Failure counters below. Does it work like this and does this happen automatically? Other than that, LGTM! -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 Gerrit-Change-Number: 23110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 15:59:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:03:24 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 16:03:24 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: add support for SGSN oriented RESET In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22945 ) Change subject: gprs_bssgp: add support for SGSN oriented RESET ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c at 134 PS2, Line 134: */ > missing return info Ack https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c at 143 PS2, Line 143: msgb_bvci(msg) = 0; /* Signalling */ > BVCI_SIGNALLING in the next commit https://gerrit.osmocom.org/c/libosmocore/+/22945/2/src/gb/gprs_bssgp.c at 150 PS2, Line 150: bssgp_create_cell_id(bssgp_cid, ra_id, cell_id); > I really wonder why do we have this kind of APIs storing into a buffer instead of having a packet st [?] don't ask me. i've refactored it a little bit to show you, that's not my fault ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:03:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:03:36 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 16:03:36 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: add support for SGSN oriented RESET In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22945 to look at the new patch set (#3). Change subject: gprs_bssgp: add support for SGSN oriented RESET ...................................................................... gprs_bssgp: add support for SGSN oriented RESET To support SGSN oriented RESET introduce a role flag to track what's running the gprs_bssgp (local side). Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c 2 files changed, 59 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/22945/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:03:36 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 16:03:36 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/23013 to look at the new patch set (#2). Change subject: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 ...................................................................... gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 Makes more understandable and clear what's meant in the code. Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 --- M src/gb/gprs_bssgp.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/23013/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 Gerrit-Change-Number: 23013 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:07:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 16:07:35 +0000 Subject: Change in docker-playground[master]: kernel-test: don't try to use KVM if not available In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: don't try to use KVM if not available ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:07:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:08:30 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 16:08:30 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: add support for SGSN oriented RESET In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22945 to look at the new patch set (#4). Change subject: gprs_bssgp: add support for SGSN oriented RESET ...................................................................... gprs_bssgp: add support for SGSN oriented RESET To support SGSN oriented RESET introduce a role flag to track what's running the gprs_bssgp (local side). Related: OS#3879 Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c 2 files changed, 59 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/22945/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:08:30 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 16:08:30 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/23013 to look at the new patch set (#3). Change subject: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 ...................................................................... gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 Makes more understandable and clear what's meant in the code. Related: OS#3879 Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 --- M src/gb/gprs_bssgp.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/23013/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 Gerrit-Change-Number: 23013 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:09:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 16:09:47 +0000 Subject: Change in osmo-pcu[master]: bts: Add new stats to detect TBF allocation failure reasons In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23110 ) Change subject: bts: Add new stats to detect TBF allocation failure reasons ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/23110/2/src/bts.cpp File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/23110/2/src/bts.cpp at 103 PS2, Line 103: { "tbf:alloc:failed", "TBF Alloc Failure (ALL)"}, > "(ALL)" sounds like this can somehow display the sum of the specific TBF Alloc Failure counters belo [?] Yes, more than the sum, it simply is increment when tbf allocation failed, regardless of the reason. It's not a sum, it's simply one counter in a generic code path. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5402e937ff8d800684655e500ef8e5c867141dc3 Gerrit-Change-Number: 23110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 26 Feb 2021 16:09:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:18:05 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 16:18:05 +0000 Subject: Change in docker-playground[master]: kernel-test: don't try to use KVM if not available In-Reply-To: References: Message-ID: Hello pespin, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/23123 to look at the new patch set (#4). Change subject: kernel-test: don't try to use KVM if not available ...................................................................... kernel-test: don't try to use KVM if not available Disable KVM if /dev/kvm is missing, as it is apparently the case on our jenkins nodes. This makes the tests run a bit slower, but not much. Add kernel_test_wait_for_vm to sleep until the VM is booted up (~5s instead of ~1s without KVM), so the first test in the testsuite does not fail when using KVM. The variable is useful to test the non-KVM code path even if KVM is available on the host. Related: OS#3208 Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 --- M README.md M jenkins-common.sh M scripts/kernel-test/initrd-init.sh M scripts/kernel-test/run-qemu.sh M ttcn3-ggsn-test/jenkins.sh 5 files changed, 54 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/23123/4 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:18:20 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 16:18:20 +0000 Subject: Change in docker-playground[master]: kernel-test: don't try to use KVM if not available In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: don't try to use KVM if not available ...................................................................... Patch Set 4: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:18:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:18:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 16:18:26 +0000 Subject: Change in docker-playground[master]: kernel-test: don't try to use KVM if not available In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23123 ) Change subject: kernel-test: don't try to use KVM if not available ...................................................................... kernel-test: don't try to use KVM if not available Disable KVM if /dev/kvm is missing, as it is apparently the case on our jenkins nodes. This makes the tests run a bit slower, but not much. Add kernel_test_wait_for_vm to sleep until the VM is booted up (~5s instead of ~1s without KVM), so the first test in the testsuite does not fail when using KVM. The variable is useful to test the non-KVM code path even if KVM is available on the host. Related: OS#3208 Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 --- M README.md M jenkins-common.sh M scripts/kernel-test/initrd-init.sh M scripts/kernel-test/run-qemu.sh M ttcn3-ggsn-test/jenkins.sh 5 files changed, 54 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/README.md b/README.md index 27a589e..6a9f4b9 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Environment variables: * `KERNEL_TEST`: set to 1 to run the SUT in QEMU +* `KERNEL_TEST_KVM`: set to 0 to disable KVM acceleration * `KERNEL_BUILD`: set to 1 to build the kernel instead of using the pre-built one * `KERNEL_REMOTE_NAME`: git remote name (to add multiple git diff --git a/jenkins-common.sh b/jenkins-common.sh index 6c54109..25d5426 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -194,6 +194,12 @@ trap clean_up_common EXIT INT TERM 0 } +docker_kvm_param() { + if [ "$KERNEL_TEST_KVM" != 0 ]; then + echo "--device /dev/kvm:/dev/kvm" + fi +} + # Generate the initrd, and optionally build a kernel, for tests that involve # kernel modules. Boot the kernel once in QEMU inside docker to verify that it # works. See README.md for description of the KERNEL_* environment variables. @@ -212,6 +218,15 @@ local docker_image="$4" shift 4 + # Store KVM availibility in global KERNEL_TEST_KVM + if [ -z "$KERNEL_TEST_KVM" ]; then + if [ -e "/dev/kvm" ]; then + KERNEL_TEST_KVM=1 + else + KERNEL_TEST_KVM=0 + fi + fi + mkdir -p "$CACHE_DIR/kernel-test" cp "$kernel_config_fragment" \ @@ -221,7 +236,7 @@ docker run \ --cap-add=NET_ADMIN \ - --device /dev/kvm:/dev/kvm \ + $(docker_kvm_param) \ --device /dev/net/tun:/dev/net/tun \ -v "$CACHE_DIR:/cache" \ -v "$KERNEL_TEST_DIR:/kernel-test:ro" \ @@ -235,6 +250,31 @@ "/kernel-test/prepare.sh" } +# Wait until the linux kernel is booted inside QEMU inside docker, and the +# initrd is right before running the project-specific commands (e.g. starting +# osmo-ggsn). This may take a few seconds if running without KVM. +# $1: path to the VM's log file +kernel_test_wait_for_vm() { + local log="$1" + local i + + if [ "$KERNEL_TEST" != 1 ]; then + return + fi + + for i in $(seq 1 10); do + sleep 1 + + if grep -q KERNEL_TEST_VM_IS_READY "$log"; then + return + fi + done + + # Let clean_up_common kill the VM + echo "Timeout while waiting for kernel test VM" + exit 1 +} + set -x # non-jenkins execution: assume local user name diff --git a/scripts/kernel-test/initrd-init.sh b/scripts/kernel-test/initrd-init.sh index 1c198b8..c2d936a 100755 --- a/scripts/kernel-test/initrd-init.sh +++ b/scripts/kernel-test/initrd-init.sh @@ -22,6 +22,8 @@ ip link set lo up ip link set eth0 up +echo "KERNEL_TEST_VM_IS_READY" + if grep -q SMOKE_TEST /proc/cmdline; then # Called from scripts/kernel-test/prepare.sh:kernel_smoke_test() to # verify that the kernel + initramfs boot up properly. Output this diff --git a/scripts/kernel-test/run-qemu.sh b/scripts/kernel-test/run-qemu.sh index 0a1824f..1873af4 100755 --- a/scripts/kernel-test/run-qemu.sh +++ b/scripts/kernel-test/run-qemu.sh @@ -13,8 +13,14 @@ $@ " +if [ -e /dev/kvm ]; then + MACHINE_ARG="-machine pc,accel=kvm" +else + MACHINE_ARG="-machine pc" +fi + qemu-system-x86_64 \ - -machine pc,accel=kvm \ + $MACHINE_ARG \ -smp 1 \ -m 512M \ -nodefconfig -no-user-config -nodefaults -display none \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index c6ea729..ba5e76d 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -41,7 +41,7 @@ GGSN_CMD="/kernel-test/run-qemu.sh" GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 200) - --device /dev/kvm:/dev/kvm + $(docker_kvm_param) -v "$KERNEL_TEST_DIR:/kernel-test:ro" -v "$CACHE_DIR:/cache" " @@ -64,6 +64,8 @@ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" +kernel_test_wait_for_vm "$VOL_BASE_DIR/ggsn/osmo-ggsn.log" + # start docker container with testsuite in foreground docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f337af1e2de6db05b22636bc31a535404235559 Gerrit-Change-Number: 23123 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:35:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 16:35:25 +0000 Subject: Change in osmo-ci[master]: repo-install-test: install repo after repo key References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23129 ) Change subject: repo-install-test: install repo after repo key ...................................................................... repo-install-test: install repo after repo key In previous patch 27ee885a689163cede1fc0c7f76584ccbb7abb41, I made sure that "apt-get update" runs before trying to install wget to download the repository key. But of course the OBS repository should not be present before installing the repo key, or else it will fail: E: The repository 'http://download.opensuse.org/.../Debian_10 ./ InRelease' is not signed. Fixes: 27ee885 ("repo-install-test: apt update before install wget") Change-Id: If79484f9ffe2a14ce6481b53867f5aee111aa11b --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/23129/1 diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index 2ed78f6..4a5f01a 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -106,7 +106,6 @@ local release_key="/var/cache/apt/${proj}_Release.key" echo "Configuring Osmocom repository" - echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list" # Add repository key if ! [ -e "$release_key" ]; then @@ -116,6 +115,7 @@ fi apt-key add "$release_key" + echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list" apt-get update } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If79484f9ffe2a14ce6481b53867f5aee111aa11b Gerrit-Change-Number: 23129 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:43:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 16:43:17 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: add support for SGSN oriented RESET In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22945 ) Change subject: gprs_bssgp: add support for SGSN oriented RESET ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcbaffa94cbdc4296a8a7c372304ac11d50d9559 Gerrit-Change-Number: 22945 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:43:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:43:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 16:43:30 +0000 Subject: Change in libosmocore[master]: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23013 ) Change subject: gprs_bssgp: use BVCI_SIGNALLING/BVCI_PTM instead of 0/1 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d0545fac0af0dcc1783040a376a9b8e65a92699 Gerrit-Change-Number: 23013 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:43:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:44:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 26 Feb 2021 16:44:33 +0000 Subject: Change in osmo-ci[master]: repo-install-test: install repo after repo key In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23129 ) Change subject: repo-install-test: install repo after repo key ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If79484f9ffe2a14ce6481b53867f5aee111aa11b Gerrit-Change-Number: 23129 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:44:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:45:59 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 16:45:59 +0000 Subject: Change in osmo-ci[master]: repo-install-test: install repo after repo key In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23129 ) Change subject: repo-install-test: install repo after repo key ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If79484f9ffe2a14ce6481b53867f5aee111aa11b Gerrit-Change-Number: 23129 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 16:45:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 16:46:01 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 26 Feb 2021 16:46:01 +0000 Subject: Change in osmo-ci[master]: repo-install-test: install repo after repo key In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23129 ) Change subject: repo-install-test: install repo after repo key ...................................................................... repo-install-test: install repo after repo key In previous patch 27ee885a689163cede1fc0c7f76584ccbb7abb41, I made sure that "apt-get update" runs before trying to install wget to download the repository key. But of course the OBS repository should not be present before installing the repo key, or else it will fail: E: The repository 'http://download.opensuse.org/.../Debian_10 ./ InRelease' is not signed. Fixes: 27ee885 ("repo-install-test: apt update before install wget") Change-Id: If79484f9ffe2a14ce6481b53867f5aee111aa11b --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved osmith: Verified diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index 2ed78f6..4a5f01a 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -106,7 +106,6 @@ local release_key="/var/cache/apt/${proj}_Release.key" echo "Configuring Osmocom repository" - echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list" # Add repository key if ! [ -e "$release_key" ]; then @@ -116,6 +115,7 @@ fi apt-key add "$release_key" + echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list" apt-get update } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If79484f9ffe2a14ce6481b53867f5aee111aa11b Gerrit-Change-Number: 23129 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 17:06:26 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 17:06:26 +0000 Subject: Change in libosmocore[master]: one step References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/23130 ) Change subject: one step ...................................................................... one step Change-Id: I1e264633105c71ad8202c38bb05c6afd4f70e202 --- M src/gb/gprs_ns2_sns.c 1 file changed, 123 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/23130/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index a82da95..5852e4e 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -102,6 +102,12 @@ { 0, NULL } }; +enum sns_procedure { + SNS_ADD, + SNS_DEL, + SNS_UPDATE_WEIGHT, +}; + struct sns_endpoint { struct llist_head list; struct osmo_sockaddr saddr; @@ -112,6 +118,12 @@ struct gprs_ns2_vc_bind *bind; }; +struct ns2_sns_procedure { + struct llist_head list; + struct gprs_ns2_vc_bind *bind; + enum sns_procedure procedure; +}; + struct ns2_sns_state { struct gprs_ns2_nse *nse; @@ -133,6 +145,12 @@ struct sns_endpoint *initial; /* all SNS PDU will be sent over this nsvc */ struct gprs_ns2_vc *sns_nsvc; + + /* all pending local procedures*/ + struct llist_head *procedures; + /* all current procedure */ + struct ns2_sns_procedure *current; + /* timer N */ int N; /* true if at least one nsvc is alive */ @@ -167,6 +185,34 @@ return gss->nse; } +static struct gprs_ns_ie_ip4_elem *ip4_elem_by_saddr(struct gprs_ns_ie_ip4_elem *ip4, size_t num, const struct osmo_sockaddr *saddr) +{ + if (saddr->u.sa.sa_family != AF_INET) + return NULL; + + for (size_t i = 0; i < num; i++) { + if (ip4[i].ip_addr == saddr->u.sin.sin_addr.s_addr && + ip4->udp_port == saddr->u.sin.sin_port) + return &ip4[i]; + } + + return NULL; +} + +static struct gprs_ns_ie_ip6_elem *ip6_elem_by_saddr(struct gprs_ns_ie_ip6_elem *ip6, size_t num, const struct osmo_sockaddr *saddr) +{ + if (saddr->u.sa.sa_family != AF_INET6) + return NULL; + + for (size_t i = 0; i < num; i++) { + if (memcmp(&ip6[i].ip_addr, &saddr->u.sin6.sin6_addr, sizeof(struct in6_addr)) == 0 && + ip6->udp_port == saddr->u.sin6.sin6_port) + return &ip6[i]; + } + + return NULL; +} + /* helper function to compute the sum of all (data or signaling) weights */ static int ip4_weight_sum(const struct gprs_ns_ie_ip4_elem *ip4, unsigned int num, bool data_weight) @@ -1927,12 +1973,86 @@ return 0; } -/* Update SNS weights - * \param[in] nsvc the NSVC which should be updated +/* Update SNS weights for a bind (local endpoint). */ +static void _ns2_sns_update_weights(struct ns2_sns_state *gss, struct ns2_sns_bind *sns_bind) { + // find the ip_local entry by using the initial connection for 0.0.0.0 + struct osmo_sockaddr *local, *remote; + const struct osmo_sockaddr *sa; + struct gprs_ns_ie_ip4_elem *ip4; + struct gprs_ns_ie_ip6_elem *ip6; + + sa = gprs_ns2_ip_bind_sockaddr(sns_bind->bind); + if (!sa) + return; + + switch (sa->u.sa.sa_family) { + case AF_INET: + if (sa->u.sin.sin_addr.s_addr == 0) { + if (osmo_sockaddr_local_ip(local, &gss->initial->saddr)) + return; + ip4 = ip4_elem_by_saddr(gss->ip4_local, gss->num_ip4_local, local); + } else { + ip4 = ip4_elem_by_saddr(gss->ip4_local, gss->num_ip4_local, sa); + } + + /* TODO: check if this bind is about to be added */ + if (!ip4) + return; + + /* did something change? */ + if (ip4->sig_weight == sns_bind->bind->sns_sig_weight && + ip4->data_weight == sns_bind->bind->sns_data_weight) + return; + + // TODO: create procedure + break; + case AF_INET6: + // in6addr_any + if (memcmp(&sa->u.sin6.sin6_addr, &in6addr_any, sizeof(struct in6_addr))) { + if (osmo_sockaddr_local_ip(local, remote)) + return; + ip6 = ip6_elem_by_saddr(gss->ip6_local, gss->num_ip6_local, local); + } else { + ip6 = ip6_elem_by_saddr(gss->ip6_local, gss->num_ip6_local, sa); + } + + /* TODO: check if this bind is about to be added */ + if (!ip6) + return; + + /* did something change? */ + if (ip6->sig_weight == sns_bind->bind->sns_sig_weight && + ip6->data_weight == sns_bind->bind->sns_data_weight) + return; + + // TODO: create procedure + break; + default: + OSMO_ASSERT(false); + break; + } +} + +/* Update SNS weights for a bind (local endpoint). + * \param[in] bind the bind which has been updated */ void ns2_sns_update_weights(struct gprs_ns2_vc_bind *bind) { - /* TODO: implement weights after binds per sns implemented */ + struct ns2_sns_bind *sns_bind; + struct gprs_ns2_nse *nse; + struct ns2_sns_state *gss; + llist_for_each_entry(nse, &bind->nsi->nse, list) { + if (!nse->bss_sns_fi) + continue; + + gss = nse->bss_sns_fi->priv; + llist_for_each_entry(sns_bind, &gss->binds, list) { + if (sns_bind->bind == bind) { + _ns2_sns_update_weights(gss, sns_bind); + break; + } + } + } } /* initialize osmo_ctx on main tread */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e264633105c71ad8202c38bb05c6afd4f70e202 Gerrit-Change-Number: 23130 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 19:33:10 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 19:33:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 to look at the new patch set (#2). Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... pcu: add TC_sns_so_bvc_reset_unknown_bvci Do an SGSN originated reset of signalling BVCI, then do a SGSN originated reset of an unknown BVCI. PCU -X SGSN: BVCI 0 BSSGP-RESET (ignores reset) PCU <- SGSN: BVCI 0 BSSGP-RESET PCU -> SGSN: BVCI 0 BSSGP-RESET-ACK (with cell information) PCU -X SGSN: BVCI 23 BSSGP-RESET (ignores reset, 23 is configured on PCU, 24 is not configured) PCU <- SGSN: BVCI 24 BSSGP-RESET (unconfigured BVCI) PCU -> SGSN: BVCI 24 BSSGP-STATUS Unknown BVCI Related: OS#3879 Change-Id: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/23016/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 19:33:18 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 26 Feb 2021 19:33:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 ) Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016/1/pcu/PCU_Tests_SNS.ttcn File pcu/PCU_Tests_SNS.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016/1/pcu/PCU_Tests_SNS.ttcn at 250 PS1, Line 250: /* do an SGSN oriented reset of signalling BVCI, then the SGSN tries to reset an unknown BVCI. */ > Ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 26 Feb 2021 19:33:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:18 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: decorate abstract methods as such References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23131 ) Change subject: trx_toolkit/data_msg.py: decorate abstract methods as such ...................................................................... trx_toolkit/data_msg.py: decorate abstract methods as such Change-Id: I27fdcfdabc2b5318ab3e958d2e5446e670fe9035 Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/23131/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 86670fc..22818a4 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -23,6 +23,7 @@ import random import struct +import abc from enum import Enum from gsm_shared import * @@ -55,7 +56,7 @@ return mod return None -class DATAMSG: +class DATAMSG(abc.ABC): """ TRXD (DATA) message codec (common part). The DATA messages are used to carry bursts in both directions @@ -135,24 +136,29 @@ # (VER + TN) + FN return 1 + 4 - # Generates message specific header + @abc.abstractmethod def gen_hdr(self): + ''' Generate message specific header. ''' raise NotImplementedError - # Parses message specific header + @abc.abstractmethod def parse_hdr(self, hdr): + ''' Parse message specific header. ''' raise NotImplementedError - # Generates message specific burst + @abc.abstractmethod def gen_burst(self): + ''' Generate message specific burst. ''' raise NotImplementedError - # Parses message specific burst + @abc.abstractmethod def parse_burst(self, burst): + ''' Parse message specific burst. ''' raise NotImplementedError - # Generate a random message specific burst + @abc.abstractmethod def rand_burst(self): + ''' Generate a random message specific burst. ''' raise NotImplementedError # Generates a random frame number -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I27fdcfdabc2b5318ab3e958d2e5446e670fe9035 Gerrit-Change-Number: 23131 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:18 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: convert comments into docstring for methods References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23132 ) Change subject: trx_toolkit/data_msg.py: convert comments into docstring for methods ...................................................................... trx_toolkit/data_msg.py: convert comments into docstring for methods Change-Id: I856b54fd1baca4ae0edd2aa59be6a76372cef667 Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 70 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/23132/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 22818a4..15c310a 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -123,18 +123,16 @@ CHDR_VERSION_MAX = 0b1111 known_versions = [0x00, 0x01] - # Common constructor def __init__(self, fn = None, tn = None, burst = None, ver = 0): self.burst = burst self.ver = ver self.fn = fn self.tn = tn - # The common header length @property def CHDR_LEN(self): - # (VER + TN) + FN - return 1 + 4 + ''' The common header length. ''' + return 1 + 4 # (VER + TN) + FN @abc.abstractmethod def gen_hdr(self): @@ -161,21 +159,22 @@ ''' Generate a random message specific burst. ''' raise NotImplementedError - # Generates a random frame number def rand_fn(self): + ''' Generate a random frame number. ''' return random.randint(0, GSM_HYPERFRAME) - # Generates a random timeslot number def rand_tn(self): + ''' Generate a random timeslot number. ''' return random.randint(0, 7) - # Randomizes the message header def rand_hdr(self): + ''' Randomize the message header. ''' self.fn = self.rand_fn() self.tn = self.rand_tn() - # Generates human-readable header description def desc_hdr(self): + ''' Generate human-readable header description. ''' + result = "" if self.ver > 0: @@ -192,28 +191,29 @@ return result - # Converts unsigned soft-bits {254..0} to soft-bits {-127..127} @staticmethod def usbit2sbit(bits): + ''' Convert unsigned soft-bits {254..0} to soft-bits {-127..127}. ''' return [-127 if (b == 0xff) else 127 - b for b in bits] - # Converts soft-bits {-127..127} to unsigned soft-bits {254..0} @staticmethod def sbit2usbit(bits): + ''' Convert soft-bits {-127..127} to unsigned soft-bits {254..0}. ''' return [127 - b for b in bits] - # Converts soft-bits {-127..127} to bits {1..0} @staticmethod def sbit2ubit(bits): + ''' Convert soft-bits {-127..127} to bits {1..0}. ''' return [int(b < 0) for b in bits] - # Converts bits {1..0} to soft-bits {-127..127} @staticmethod def ubit2sbit(bits): + ''' Convert bits {1..0} to soft-bits {-127..127}. ''' return [-127 if b else 127 for b in bits] - # Validates the message fields (throws ValueError) def validate(self): + ''' Validate the message fields (throws ValueError). ''' + if not self.ver in self.known_versions: raise ValueError("Unknown TRXD header version %d" % self.ver) @@ -229,8 +229,9 @@ if self.tn < 0 or self.tn > 7: raise ValueError("TDMA time-slot %d is out of range" % self.tn) - # Generates a TRX DATA message def gen_msg(self, legacy = False): + ''' Generate a TRX DATA message. ''' + # Validate all the fields self.validate() @@ -258,8 +259,9 @@ return buf - # Parses a TRX DATA message def parse_msg(self, msg): + ''' Parse a TRX DATA message. ''' + # Make sure we have at least common header if len(msg) < self.CHDR_LEN: raise ValueError("Message is to short: missing common header") @@ -317,9 +319,10 @@ # Specific message fields pwr = None - # Calculates header length depending on its version @property def HDR_LEN(self): + ''' Calculate header length depending on its version. ''' + # Common header length length = self.CHDR_LEN @@ -331,8 +334,9 @@ return length - # Validates the message fields (throws ValueError) def validate(self): + ''' Validate the message fields (throws ValueError). ''' + # Validate common fields DATAMSG.validate(self) @@ -350,8 +354,9 @@ if len(self.burst) not in (GSM_BURST_LEN, EDGE_BURST_LEN): raise ValueError("Tx burst has odd length %u" % len(self.burst)) - # Generates a random power level def rand_pwr(self, min = None, max = None): + ''' Generate a random power level. ''' + if min is None: min = self.PWR_MIN @@ -360,13 +365,15 @@ return random.randint(min, max) - # Randomizes message specific header def rand_hdr(self): + ''' Randomize message specific header. ''' + DATAMSG.rand_hdr(self) self.pwr = self.rand_pwr() - # Generates human-readable header description def desc_hdr(self): + ''' Generate human-readable header description. ''' + # Describe the common part result = DATAMSG.desc_hdr(self) @@ -376,8 +383,9 @@ # Strip useless whitespace and return return result.strip() - # Generates message specific header part def gen_hdr(self): + ''' Generate message specific header part. ''' + # Allocate an empty byte-array buf = bytearray() @@ -386,18 +394,21 @@ return buf - # Parses message specific header part def parse_hdr(self, hdr): + ''' Parse message specific header part. ''' + # Parse power level self.pwr = hdr[5] - # Generates message specific burst def gen_burst(self): + ''' Generate message specific burst. ''' + # Copy burst 'as is' return bytearray(self.burst) - # Parses message specific burst def parse_burst(self, burst): + ''' Parse message specific burst. ''' + length = len(burst) # Distinguish between GSM and EDGE @@ -406,12 +417,13 @@ else: self.burst = list(burst[:GSM_BURST_LEN]) - # Generate a random message specific burst def rand_burst(self, length = GSM_BURST_LEN): + ''' Generate a random message specific burst. ''' self.burst = [random.randint(0, 1) for _ in range(length)] - # Transforms this message to TRX2L1 message def gen_trx2l1(self, ver = None): + ''' Transform this message to TRX2L1 message. ''' + # Allocate a new message msg = DATAMSG_TRX2L1(fn = self.fn, tn = self.tn, ver = self.ver if ver is None else ver) @@ -545,9 +557,10 @@ tsc = None ci = None - # Calculates header length depending on its version @property def HDR_LEN(self): + ''' Calculate header length depending on its version. ''' + # Common header length length = self.CHDR_LEN @@ -586,15 +599,17 @@ if len(self.burst) != self.mod_type.bl: raise ValueError("Rx burst has odd length %u" % len(self.burst)) - # Validates the burst (throws ValueError) def validate_burst(self): + ''' Validate the burst (throws ValueError). ''' + if self.ver == 0x00: self._validate_burst_v0() elif self.ver >= 0x01: self._validate_burst_v1() - # Validates the message header fields (throws ValueError) def validate(self): + ''' Validate the message header fields (throws ValueError). ''' + # Validate common fields DATAMSG.validate(self) @@ -641,8 +656,9 @@ self.validate_burst() - # Generates a random RSSI value def rand_rssi(self, min = None, max = None): + ''' Generate a random RSSI value. ''' + if min is None: min = self.RSSI_MIN @@ -651,8 +667,9 @@ return random.randint(min, max) - # Generates a ToA (Time of Arrival) value def rand_toa256(self, min = None, max = None): + ''' Generate a random ToA (Time of Arrival) value. ''' + if min is None: min = self.TOA256_MIN @@ -661,8 +678,9 @@ return random.randint(min, max) - # Randomizes message specific header def rand_hdr(self): + ''' Randomize message specific header. ''' + DATAMSG.rand_hdr(self) self.rssi = self.rand_rssi() self.toa256 = self.rand_toa256() @@ -678,8 +696,9 @@ # C/I: Carrier-to-Interference ratio self.ci = random.randint(self.CI_MIN, self.CI_MAX) - # Generates human-readable header description def desc_hdr(self): + ''' Generate human-readable header description. ''' + # Describe the common part result = DATAMSG.desc_hdr(self) @@ -705,8 +724,9 @@ # Strip useless whitespace and return return result.strip() - # Encodes Modulation and Training Sequence info def gen_mts(self): + ''' Encode Modulation and Training Sequence info. ''' + # IDLE / nope indication has no MTS info if self.nope_ind: return self.NOPE_IND @@ -720,8 +740,9 @@ return mts - # Parses Modulation and Training Sequence info def parse_mts(self, mts): + ''' Parse Modulation and Training Sequence info. ''' + # IDLE / nope indication has no MTS info self.nope_ind = (mts & self.NOPE_IND) > 0 if self.nope_ind: @@ -744,8 +765,9 @@ self.mod_type = Modulation.ModGMSK self.tsc_set = mts & 0b11 - # Generates message specific header part def gen_hdr(self): + ''' Generate message specific header part. ''' + # Allocate an empty byte-array buf = bytearray() @@ -766,8 +788,9 @@ return buf - # Parses message specific header part def parse_hdr(self, hdr): + ''' Parse message specific header part. ''' + # Parse RSSI self.rssi = -(hdr[5]) @@ -781,16 +804,18 @@ # C/I: Carrier-to-Interference ratio (in centiBels) self.ci = struct.unpack(">h", hdr[9:11])[0] - # Generates message specific burst def gen_burst(self): + ''' Generate message specific burst. ''' + # Convert soft-bits to unsigned soft-bits burst_usbits = self.sbit2usbit(self.burst) # Encode to bytes return bytearray(burst_usbits) - # Parses message specific burst for header version 0 def _parse_burst_v0(self, burst): + ''' Parse message specific burst for header version 0. ''' + bl = len(burst) # We need to guess modulation by the length of burst @@ -804,8 +829,9 @@ return burst[:self.mod_type.bl] - # Parses message specific burst def parse_burst(self, burst): + ''' Parse message specific burst. ''' + burst = list(burst) if self.ver == 0x00: @@ -814,15 +840,17 @@ # Convert unsigned soft-bits to soft-bits self.burst = self.usbit2sbit(burst) - # Generate a random message specific burst def rand_burst(self, length = None): + ''' Generate a random message specific burst. ''' + if length is None: length = self.mod_type.bl self.burst = [random.randint(-127, 127) for _ in range(length)] - # Transforms this message to L12TRX message def gen_l12trx(self, ver = None): + ''' Transform this message to L12TRX message. ''' + # Allocate a new message msg = DATAMSG_L12TRX(fn = self.fn, tn = self.tn, ver = self.ver if ver is None else ver) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I856b54fd1baca4ae0edd2aa59be6a76372cef667 Gerrit-Change-Number: 23132 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:19 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use tuple for DATAMSG.known_versions References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23133 ) Change subject: trx_toolkit/data_msg.py: use tuple for DATAMSG.known_versions ...................................................................... trx_toolkit/data_msg.py: use tuple for DATAMSG.known_versions Change-Id: I79de5fe478297e1850d9582426888411a0189d3f Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/23133/1 diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 15c310a..19bd8dd 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -121,7 +121,7 @@ # NOTE: up to 16 versions can be encoded CHDR_VERSION_MAX = 0b1111 - known_versions = [0x00, 0x01] + known_versions = (0, 1) def __init__(self, fn = None, tn = None, burst = None, ver = 0): self.burst = burst -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I79de5fe478297e1850d9582426888411a0189d3f Gerrit-Change-Number: 23133 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:20 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: use uppercase for KNOWN_VERSIONS References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23134 ) Change subject: trx_toolkit/data_msg.py: use uppercase for KNOWN_VERSIONS ...................................................................... trx_toolkit/data_msg.py: use uppercase for KNOWN_VERSIONS Change-Id: Ie4dcc8e91115c514ace243a95a9b44a17cd976b4 Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/burst_gen.py M src/target/trx_toolkit/data_if.py M src/target/trx_toolkit/data_msg.py M src/target/trx_toolkit/test_data_msg.py 4 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/23134/1 diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py index 7028c24..7f154b3 100755 --- a/src/target/trx_toolkit/burst_gen.py +++ b/src/target/trx_toolkit/burst_gen.py @@ -176,7 +176,7 @@ help = "How many bursts to send (default %(default)s)") bg_group.add_argument("-v", "--hdr-version", metavar = "VER", dest = "hdr_ver", type = int, - default = 0, choices = DATAMSG.known_versions, + default = 0, choices = DATAMSG.KNOWN_VERSIONS, help = "TRXD header version (default %(default)s)") bg_group.add_argument("-f", "--frame-number", metavar = "FN", dest = "tdma_fn", type = int, diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py index cab25aa..07f3d32 100644 --- a/src/target/trx_toolkit/data_if.py +++ b/src/target/trx_toolkit/data_if.py @@ -35,7 +35,7 @@ log.debug("Init TRXD interface (%s)" % self.desc_link()) def set_hdr_ver(self, ver): - if not ver in DATAMSG.known_versions: + if not ver in DATAMSG.KNOWN_VERSIONS: return False self._hdr_ver = ver @@ -43,7 +43,7 @@ def pick_hdr_ver(self, ver_req): # Pick a version that is lower or equal to ver_req - for ver in DATAMSG.known_versions[::-1]: + for ver in DATAMSG.KNOWN_VERSIONS[::-1]: if ver <= ver_req: return ver diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py index 19bd8dd..8b9b73c 100644 --- a/src/target/trx_toolkit/data_msg.py +++ b/src/target/trx_toolkit/data_msg.py @@ -121,7 +121,7 @@ # NOTE: up to 16 versions can be encoded CHDR_VERSION_MAX = 0b1111 - known_versions = (0, 1) + KNOWN_VERSIONS = (0, 1) def __init__(self, fn = None, tn = None, burst = None, ver = 0): self.burst = burst @@ -214,7 +214,7 @@ def validate(self): ''' Validate the message fields (throws ValueError). ''' - if not self.ver in self.known_versions: + if not self.ver in self.KNOWN_VERSIONS: raise ValueError("Unknown TRXD header version %d" % self.ver) if self.fn is None: @@ -268,7 +268,7 @@ # Parse the header version first self.ver = (msg[0] >> 4) - if not self.ver in self.known_versions: + if not self.ver in self.KNOWN_VERSIONS: raise ValueError("Unknown TRXD header version %d" % self.ver) # Parse TDMA TN and FN diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py index 6254203..9550d36 100644 --- a/src/target/trx_toolkit/test_data_msg.py +++ b/src/target/trx_toolkit/test_data_msg.py @@ -120,7 +120,7 @@ # Validate encoding and decoding def test_enc_dec(self): - for ver in DATAMSG.known_versions: + for ver in DATAMSG.KNOWN_VERSIONS: with self.subTest("L1 -> TRX message", ver = ver): msg = DATAMSG_L12TRX(ver = ver) self._test_enc_dec(msg) @@ -180,7 +180,7 @@ # Validate message transformation def test_transform(self): - for ver in DATAMSG.known_versions: + for ver in DATAMSG.KNOWN_VERSIONS: with self.subTest("L1 -> TRX message", ver = ver): msg = DATAMSG_L12TRX(ver = ver) self._test_transform(msg) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie4dcc8e91115c514ace243a95a9b44a17cd976b4 Gerrit-Change-Number: 23134 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:20 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: check in simple declarative codec References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23135 ) Change subject: trx_toolkit: check in simple declarative codec ...................................................................... trx_toolkit: check in simple declarative codec Change-Id: I7ff46b278c59af3720ee7f3950ea5a8b2f1313e1 Related: OS#4006, SYS#4895 --- A src/target/trx_toolkit/codec.py A src/target/trx_toolkit/test_codec.py 2 files changed, 765 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/35/23135/1 diff --git a/src/target/trx_toolkit/codec.py b/src/target/trx_toolkit/codec.py new file mode 100644 index 0000000..e3cd600 --- /dev/null +++ b/src/target/trx_toolkit/codec.py @@ -0,0 +1,294 @@ +# -*- coding: utf-8 -*- + +''' +Very simple (performance oriented) declarative message codec. +Inspired by Pycrate and Scapy. +''' + +# TRX Toolkit +# +# (C) 2021 by sysmocom - s.f.m.c. GmbH +# Author: Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +from typing import Callable, Tuple, Any +import abc + +class ProtocolError(Exception): + ''' Error in a protocol definition. ''' + +class DecodeError(Exception): + ''' Error during decoding of a field/message. ''' + +class EncodeError(Exception): + ''' Error during encoding of a field/message. ''' + + +class Codec(abc.ABC): + ''' Base class providing encoding and decoding API. ''' + + @abc.abstractmethod + def from_bytes(self, vals: dict, data: bytes) -> int: + ''' Decode value(s) from the given buffer of bytes. ''' + raise NotImplementedError + + @abc.abstractmethod + def to_bytes(self, vals: dict) -> bytes: + ''' Encode value(s) into bytes. ''' + raise NotImplementedError + + +class Field(Codec): + ''' Base class representing one field in a Message. ''' + + # Default length (0 means the whole buffer) + DEF_LEN: int = 0 + + # Default parameters + DEF_PARAMS: dict = { } + + # Presence of a field during decoding and encoding + get_pres_dec: Callable[[dict, bytes], bool] + get_pres_enc: Callable[[dict], bool] + + # Length of a field for self.from_bytes() + get_len: Callable[[dict, bytes], int] + # Value of a field for self.to_bytes() + get_val: Callable[[dict], Any] + + def __init__(self, name: str, **kw) -> None: + self.name = name + + self.len = kw.get('len', self.DEF_LEN) + if self.len == 0: # flexible field + self.get_len = lambda _, data: len(data) + else: # fixed length + self.get_len = lambda vals, _: self.len + + # Field is unconditionally present by default + self.get_pres_dec = lambda vals, data: True + self.get_pres_enc = lambda vals: True + # Field takes it's value from the given dict by default + self.get_val = lambda vals: vals[self.name] + + # Additional parameters for derived field types + self.p = { key : kw.get(key, self.DEF_PARAMS[key]) + for key in self.DEF_PARAMS } + + def from_bytes(self, vals: dict, data: bytes) -> int: + if self.get_pres_dec(vals, data) is False: + return 0 + length = self.get_len(vals, data) + if len(data) < length: + raise DecodeError('Short read') + self._from_bytes(vals, data[:length]) + return length + + def to_bytes(self, vals: dict) -> bytes: + if self.get_pres_enc(vals) is False: + return b'' + data = self._to_bytes(vals) + if self.len > 0 and len(data) != self.len: + raise EncodeError('Field length mismatch') + return data + + @abc.abstractmethod + def _from_bytes(self, vals: dict, data: bytes) -> None: + ''' Decode value(s) from the given buffer of bytes. ''' + raise NotImplementedError + + @abc.abstractmethod + def _to_bytes(self, vals: dict) -> bytes: + ''' Encode value(s) into bytes. ''' + raise NotImplementedError + + +class Buf(Field): + ''' A sequence of octets. ''' + + def _from_bytes(self, vals: dict, data: bytes) -> None: + vals[self.name] = data + + def _to_bytes(self, vals: dict) -> bytes: + # TODO: handle len(self.get_val()) < self.get_len() + return self.get_val(vals) + + +class Uint(Field): + ''' An integer field: unsigned, N bits, big endian. ''' + + # Uint8 by default + DEF_LEN = 1 + + # Default parameters + DEF_PARAMS = { + 'offset' : 0, + 'mult' : 1, + } + + # Big endian, unsigned + SIGN = False + BO = 'big' + + def _from_bytes(self, vals: dict, data: bytes) -> None: + val = int.from_bytes(data, self.BO, signed=self.SIGN) + vals[self.name] = val * self.p['mult'] + self.p['offset'] + + def _to_bytes(self, vals: dict) -> bytes: + val = (self.get_val(vals) - self.p['offset']) // self.p['mult'] + return val.to_bytes(self.len, self.BO, signed=self.SIGN) + +class Uint16BE(Uint): + DEF_LEN = 16 // 8 + +class Uint16LE(Uint16BE): + BO = 'little' + +class Uint32BE(Uint): + DEF_LEN = 32 // 8 + +class Uint32LE(Uint32BE): + BO = 'little' + +class Int(Uint): + SIGN = True + +class Int16BE(Int): + DEF_LEN = 16 // 8 + +class Int16LE(Int16BE): + BO = 'little' + +class Int32BE(Int): + DEF_LEN = 32 // 8 + +class Int32LE(Int32BE): + BO = 'little' + + +class BitFieldSet(Field): + ''' A set of bit-fields. ''' + + # Default parameters + DEF_PARAMS = { + # Default field order (MSB first) + 'order' : 'big', + } + + # To be defined by derived types + STRUCT: Tuple['BitField', ...] = () + + def __init__(self, **kw) -> None: + Field.__init__(self, self.__class__.__name__, **kw) + + self._fields = kw.get('set', self.STRUCT) + if type(self._fields) is not tuple: + raise ProtocolError('Expected a tuple') + + # LSB first is basically reversed order + if self.p['order'] in ('little', 'lsb'): + self._fields = self._fields[::-1] + + # Calculate the overall field length + if self.len == 0: + bl_sum = sum([f.bl for f in self._fields]) + self.len = bl_sum // 8 + if bl_sum % 8 > 0: + self.len += 1 + + # Re-define self.get_len() since we always know the length + self.get_len = lambda vals, data: self.len + + # Pre-calculate offset and mask for each field + offset = self.len * 8 + for f in self._fields: + if f.bl > offset: + raise ProtocolError(f, 'BitFieldSet overflow') + f.offset = offset - f.bl + f.mask = 2 ** f.bl - 1 + offset -= f.bl + + def _from_bytes(self, vals: dict, data: bytes) -> None: + blob = int.from_bytes(data, byteorder='big') # intentionally using 'big' here + vals.update({ f.name : (blob >> f.offset) & f.mask for f in self._fields }) + + def _to_bytes(self, vals: dict) -> bytes: + blob = 0x00 + for f in self._fields: # TODO: use functools.reduce()? + blob |= (f.get_val(vals) & f.mask) << f.offset + return blob.to_bytes(self.len, byteorder='big') + +class BitField: + ''' One field in a BitFieldSet. ''' + + # Special fields for BitFieldSet + offset: int = 0 + mask: int = 0 + + def __init__(self, name: str, bl: int) -> None: + self.name = name + self.bl = bl + + # Ensure proper length + if self.bl < 1: + raise ProtocolError('Incorrect bit-field length') + + def get_val(self, vals: dict) -> Any: + return vals[self.name] + + +class Envelope(Codec): + ''' A group of related fields. ''' + + STRUCT: Tuple[Codec, ...] = () + + def __init__(self, check_len: bool = True): + # TODO: ensure uniqueue field names in self.STRUCT + self.check_len = check_len + self.content: dict = { } + + def __getitem__(self, key: str) -> Any: + return self.content[key] + + def __setitem__(self, key: str, val: Any) -> None: + self.content[key] = val + + def __delitem__(self, key: str) -> None: + del self.content[key] + + def from_bytes(self, data: bytes, offset: int = 0) -> int: + self.content = { } # forget the old content + try: # Fields throw exceptions + for f in self.STRUCT: + offset += f.from_bytes(self.content, data[offset:]) + except Exception as e: + # Add contextual info + raise DecodeError(self, f, offset) from e + if self.check_len and len(data) != offset: + raise DecodeError(self, 'Unhandled tail octets: %s' + % data[offset:].hex()) + return offset + + def to_bytes(self) -> bytes: + def proc(f: Codec): + try: # Fields throw exceptions + return f.to_bytes(self.content) + except Exception as e: + # Add contextual info + raise EncodeError(self, f) from e + return b''.join([proc(f) for f in self.STRUCT]) diff --git a/src/target/trx_toolkit/test_codec.py b/src/target/trx_toolkit/test_codec.py new file mode 100644 index 0000000..0499f3a --- /dev/null +++ b/src/target/trx_toolkit/test_codec.py @@ -0,0 +1,471 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +''' +Unit tests for declarative message codec. +''' + +# (C) 2021 by sysmocom - s.f.m.c. GmbH +# Author: Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import unittest +import struct +import codec + +class TestField(codec.Field): + DEF_PARAMS = { 'key' : 0xde } + DEF_LEN = 4 + + @staticmethod + def xor(data: bytes, key: int = 0x00): + return bytes([x ^ key for x in data]) + + def _from_bytes(self, vals: dict, data: bytes) -> None: + vals[self.name] = self.xor(data, self.p['key']) + + def _to_bytes(self, vals: dict) -> bytes: + return self.xor(self.get_val(vals), self.p['key']) + +class Field(unittest.TestCase): + MAGIC = b'\xde\xad\xbe\xef' + + def test_to_bytes(self): + vals = { 'magic' : self.MAGIC, 'other' : 'unrelated' } + encoded_de = TestField.xor(self.MAGIC, 0xde) + encoded_88 = TestField.xor(self.MAGIC, 0x88) + + with self.subTest('default length=4, default key=0xde'): + field = TestField('magic') + self.assertEqual(field.to_bytes(vals), encoded_de) + + with self.subTest('different length=2, default key=0xde'): + field = TestField('magic', len=2) + vals['magic'] = vals['magic'][:2] + self.assertEqual(field.to_bytes(vals), encoded_de[:2]) + + with self.subTest('EncodeError due to length mismatch'): + field = TestField('magic', len=8) + with self.assertRaises(codec.EncodeError): + field.to_bytes(vals) + + def test_from_bytes(self): + encoded_de = TestField.xor(self.MAGIC, 0xde) + b'\xff' * 60 + encoded_88 = TestField.xor(self.MAGIC, 0x88) + b'\xff' * 60 + vals = { 'magic' : 'overrien', 'other' : 'unchanged' } + + with self.subTest('default length=4, default key=0xde'): + field = TestField('magic') + offset = field.from_bytes(vals, encoded_de) + self.assertEqual(vals['other'], 'unchanged') + self.assertEqual(vals['magic'], self.MAGIC) + self.assertEqual(offset, len(self.MAGIC)) + + with self.subTest('default length=4, different key=0x88'): + field = TestField('magic', key=0x88) + offset = field.from_bytes(vals, encoded_88) + self.assertEqual(vals['other'], 'unchanged') + self.assertEqual(vals['magic'], self.MAGIC) + self.assertEqual(offset, len(self.MAGIC)) + + with self.subTest('different length=2, default key=0xde'): + field = TestField('magic', len=2) + offset = field.from_bytes(vals, encoded_de) + self.assertEqual(vals['other'], 'unchanged') + self.assertEqual(vals['magic'], self.MAGIC[:2]) + self.assertEqual(offset, 2) + + with self.subTest('full length, different key=0x88'): + field = TestField('magic', len=0, key=0x88) + offset = field.from_bytes(vals, encoded_88) + self.assertEqual(vals['other'], 'unchanged') + self.assertEqual(vals['magic'], self.MAGIC + b'\x77' * 60) + self.assertEqual(offset, len(encoded_88)) + + with self.subTest('DecodeError due to short read'): + field = TestField('magic', len=4) + with self.assertRaises(codec.DecodeError): + field.from_bytes(vals, b'\x00') + + def test_get_pres(self): + vals = { 'magic' : self.MAGIC } + + with self.subTest('to_bytes() for a non-existing field'): + field = TestField('not-there') + with self.assertRaises(KeyError): + field.to_bytes(vals) + + with self.subTest('to_bytes() for a field with get_pres_enc()'): + field = TestField('magic', key=0x00) + field.get_pres_enc = lambda v: not v['omit'] + + data = field.to_bytes({ **vals, 'omit' : False }) + self.assertEqual(data, self.MAGIC) + + data = field.to_bytes({ **vals, 'omit' : True }) + self.assertEqual(data, b'') + + with self.subTest('from_bytes() for a field with get_pres_dec()'): + field = TestField('magic', key=0x00) + field.get_pres_dec = lambda v, _: not v['omit'] + + vals = { 'omit' : False } + offset = field.from_bytes(vals, self.MAGIC) + self.assertEqual(vals['magic'], self.MAGIC) + self.assertEqual(offset, len(self.MAGIC)) + + vals = { 'omit' : True } + offset = field.from_bytes(vals, self.MAGIC) + self.assertFalse('magic' in vals) + self.assertEqual(offset, 0) + + def test_get_len(self): + vals = { 'len' : 32, 'unrelated' : 'foo' } + + field = TestField('magic', key=0x00) + field.get_len = lambda v, _: v['len'] + + with self.subTest('not enough octets in the buffer: 16 < 32'): + with self.assertRaises(codec.DecodeError): + field.from_bytes(vals, b'\xff' * 16) + + with self.subTest('more than enough octets in the buffer'): + offset = field.from_bytes(vals, b'\xff' * 64) + self.assertEqual(vals['magic'], b'\xff' * 32) + self.assertEqual(offset, 32) + + with self.subTest('length field does not exist'): + with self.assertRaises(KeyError): + field.from_bytes({ }, b'\xff' * 64) + + def test_get_val(self): + field = TestField('magic', key=0x00, len=0) + field.get_val = lambda v: v.get('val', self.MAGIC) + + with self.subTest('value is present in the dict'): + data = field.to_bytes({ 'val' : b'\xd0\xde' }) + self.assertEqual(data, b'\xd0\xde') + + with self.subTest('value is not present in the dict'): + data = field.to_bytes({ }) + self.assertEqual(data, self.MAGIC) + +class Buf(unittest.TestCase): + MAGIC = b'\xde\xad' * 4 + + def test_to_bytes(self): + vals = { 'buf' : self.MAGIC } + + with self.subTest('with no length constraints'): + field = codec.Buf('buf') # default: len=0 + self.assertEqual(field.to_bytes(vals), self.MAGIC) + + with self.subTest('with length constraints'): + field = codec.Buf('buf', len=len(self.MAGIC)) + self.assertEqual(field.to_bytes(vals), self.MAGIC) + + with self.subTest('EncodeError due to length mismatch'): + field = codec.Buf('buf', len=4) + with self.assertRaises(codec.EncodeError): + field.to_bytes(vals) + + def test_from_bytes(self): + vals = { } + + with self.subTest('with no length constraints'): + field = codec.Buf('buf') # default: len=0 + offset = field.from_bytes(vals, self.MAGIC) + self.assertEqual(vals['buf'], self.MAGIC) + self.assertEqual(offset, len(self.MAGIC)) + + with self.subTest('with length constraints'): + field = codec.Buf('buf', len=2) + offset = field.from_bytes(vals, self.MAGIC) + self.assertEqual(vals['buf'], self.MAGIC[:2]) + self.assertEqual(offset, len(self.MAGIC[:2])) + + with self.subTest('DecodeError due to not enough bytes'): + field = codec.Buf('buf', len=64) + with self.assertRaises(codec.DecodeError): + field.from_bytes(vals, self.MAGIC) + +class Uint(unittest.TestCase): + def _test_uint(self, field, fmt, vals): + for i in vals: + with self.subTest('to_bytes()'): + val = field.to_bytes({ field.name : i }) + self.assertEqual(val, struct.pack(fmt, i)) + + with self.subTest('from_bytes()'): + data, parsed = struct.pack(fmt, i), { } + offset = field.from_bytes(parsed, data) + self.assertEqual(offset, len(data)) + self.assertEqual(parsed[field.name], i) + + def test_uint8(self): + self._test_uint(codec.Uint('foo'), 'B', range(2 ** 8)) + + def test_int8(self): + self._test_uint(codec.Int('foo'), 'b', range(-128, 128)) + + def test_uint16(self): + vals = (0, 65, 128, 255, 512, 1023, 2 ** 16 - 1) + self._test_uint(codec.Uint16BE('foo'), '>H', vals) + self._test_uint(codec.Uint16LE('foo'), 'h', vals) + self._test_uint(codec.Int16LE('foo'), 'I', vals) + self._test_uint(codec.Uint32LE('foo'), 'i', vals) + self._test_uint(codec.Int32LE('foo'), ' 1 octet (with padding)'): + s = codec.BitFieldSet(set=( + codec.BitField('f1', bl=1), + codec.BitField('f2', bl=2), + )) + self.assertEqual(s.len, 1) + + with self.subTest('4 + 2 + 2 = 8 bits => 1 octet'): + s = codec.BitFieldSet(set=( + codec.BitField('f4', bl=4), + codec.BitField('f2a', bl=2), + codec.BitField('f2b', bl=2), + )) + self.assertEqual(s.len, 1) + + with self.subTest('12 + 4 + 2 = 18 bits => 3 octets (with padding)'): + s = codec.BitFieldSet(set=( + codec.BitField('f12', bl=12), + codec.BitField('f4', bl=4), + codec.BitField('f2', bl=2), + )) + self.assertEqual(s.len, 3) + + def test_overflow(self): + with self.assertRaises(codec.ProtocolError): + s = codec.BitFieldSet(len=1, set=( + codec.BitField('f6', bl=6), + codec.BitField('f4', bl=4), + )) + + def test_offset_mask(self): + calc = lambda s: [(f.name, f.offset, f.mask) for f in s._fields] + + with self.subTest('16 bit total (MSB): f4a + f8 + f4b'): + om = [('f4a', 8 + 4, 0x0f), ('f8', 4, 0xff), ('f4b', 0, 0x0f)] + self.assertEqual(len(self.S16._fields), 3) + self.assertEqual(calc(self.S16), om) + + with self.subTest('8 bit total (MSB): f4 + f1 + f3'): + om = [('f4', 1 + 3, 0x0f), ('f1', 3, 0x01), ('f3', 0, 0x07)] + self.assertEqual(len(self.S8M._fields), 3) + self.assertEqual(calc(self.S8M), om) + + with self.subTest('8 bit total (LSB): f4 + f1 + f3'): + om = [('f3', 1 + 4, 0x07), ('f1', 4, 0x01), ('f4', 0, 0x0f)] + self.assertEqual(len(self.S8L._fields), 3) + self.assertEqual(calc(self.S8L), om) + + def test_to_bytes(self): + with self.subTest('16 bit total (MSB): f4a + f8 + f4b'): + vals = { 'f4a' : 0x0f, 'f8' : 0xff, 'f4b' : 0x0f } + self.assertEqual(self.S16.to_bytes(vals), b'\xff\xff') + vals = { 'f4a' : 0x00, 'f8' : 0x00, 'f4b' : 0x00 } + self.assertEqual(self.S16.to_bytes(vals), b'\x00\x00') + vals = { 'f4a' : 0x0f, 'f8' : 0x00, 'f4b' : 0x0f } + self.assertEqual(self.S16.to_bytes(vals), b'\xf0\x0f') + vals = { 'f4a' : 0x00, 'f8' : 0xff, 'f4b' : 0x00 } + self.assertEqual(self.S16.to_bytes(vals), b'\x0f\xf0') + + with self.subTest('8 bit total (MSB): f4 + f1 + f3'): + vals = { 'f4' : 0x0f, 'f1' : 0x01, 'f3' : 0x07 } + self.assertEqual(self.S8M.to_bytes(vals), b'\xff') + vals = { 'f4' : 0x00, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(self.S8M.to_bytes(vals), b'\x00') + vals = { 'f4' : 0x0f, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(self.S8M.to_bytes(vals), b'\xf0') + + with self.subTest('8 bit total (LSB): f4 + f1 + f3'): + vals = { 'f4' : 0x0f, 'f1' : 0x01, 'f3' : 0x07 } + self.assertEqual(self.S8L.to_bytes(vals), b'\xff') + vals = { 'f4' : 0x00, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(self.S8L.to_bytes(vals), b'\x00') + vals = { 'f4' : 0x0f, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(self.S8L.to_bytes(vals), b'\x0f') + + def test_from_bytes(self): + def from_bytes(s, data): + vals = { } + s.from_bytes(vals, data) + return vals + + pad = b'\xff' * 64 + + with self.subTest('16 bit total (MSB): f4a + f8 + f4b'): + vals = { 'f4a' : 0x0f, 'f8' : 0xff, 'f4b' : 0x0f } + self.assertEqual(from_bytes(self.S16, b'\xff\xff' + pad), vals) + vals = { 'f4a' : 0x00, 'f8' : 0x00, 'f4b' : 0x00 } + self.assertEqual(from_bytes(self.S16, b'\x00\x00' + pad), vals) + vals = { 'f4a' : 0x0f, 'f8' : 0x00, 'f4b' : 0x0f } + self.assertEqual(from_bytes(self.S16, b'\xf0\x0f' + pad), vals) + vals = { 'f4a' : 0x00, 'f8' : 0xff, 'f4b' : 0x00 } + self.assertEqual(from_bytes(self.S16, b'\x0f\xf0' + pad), vals) + + with self.subTest('8 bit total (MSB): f4 + f1 + f3'): + vals = { 'f4' : 0x0f, 'f1' : 0x01, 'f3' : 0x07 } + self.assertEqual(from_bytes(self.S8M, b'\xff' + pad), vals) + vals = { 'f4' : 0x00, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(from_bytes(self.S8M, b'\x00' + pad), vals) + vals = { 'f4' : 0x0f, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(from_bytes(self.S8M, b'\xf0' + pad), vals) + + with self.subTest('8 bit total (LSB): f4 + f1 + f3'): + vals = { 'f4' : 0x0f, 'f1' : 0x01, 'f3' : 0x07 } + self.assertEqual(from_bytes(self.S8L, b'\xff' + pad), vals) + vals = { 'f4' : 0x00, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(from_bytes(self.S8L, b'\x00' + pad), vals) + vals = { 'f4' : 0x0f, 'f1' : 0x00, 'f3' : 0x00 } + self.assertEqual(from_bytes(self.S8L, b'\x0f' + pad), vals) + +class TestPDU(codec.Envelope): + STRUCT = ( + codec.BitFieldSet(len=2, set=( + codec.BitField('ver', bl=4), + codec.BitField('flag', bl=1), + )), + codec.Uint16BE('len'), + codec.Buf('data'), + codec.Buf('tail', len=2), + ) + + def __init__(self, *args, **kw): + codec.Envelope.__init__(self, *args, **kw) + self.STRUCT[-3].get_val = lambda v: len(v['data']) + self.STRUCT[-2].get_len = lambda v, _: v['len'] + self.STRUCT[-1].get_pres_dec = lambda v, _: bool(v['flag']) + self.STRUCT[-1].get_pres_enc = lambda v: bool(v['flag']) + +class Envelope(unittest.TestCase): + def test_rest_octets(self): + pdu = TestPDU(check_len=False) + pdu.from_bytes(b'\x00' * 64) + + with self.assertRaises(codec.DecodeError): + pdu = TestPDU(check_len=True) + pdu.from_bytes(b'\x00' * 64) # 'len' : 0 + + def test_field_raises(self): + pdu = TestPDU() + with self.assertRaises(codec.EncodeError): + pdu.content = { 'ver' : 0, 'flag' : 1, 'data' : b'\xff' * 16 } + pdu.to_bytes() # KeyError: 'tail' not found + + def test_to_bytes(self): + pdu = TestPDU() + + # No content in the new instances + self.assertEqual(pdu.content, { }) + + pdu.content = { 'ver' : 0, 'flag' : 1, 'data' : b'', 'tail' : b'\xde\xbe' } + self.assertEqual(pdu.to_bytes(), b'\x08\x00\x00\x00' + b'\xde\xbe') + + pdu.content = { 'ver' : 1, 'flag' : 0, 'data' : b'\xff' * 15 } + self.assertEqual(pdu.to_bytes(), b'\x10\x00\x00\x0f' + b'\xff' * 15) + + pdu.content = { 'ver' : 2, 'flag' : 1, 'data' : b'\xf0', 'tail' : b'\xbe\xed' } + self.assertEqual(pdu.to_bytes(), b'\x28\x00\x00\x01\xf0\xbe\xed') + + def test_from_bytes(self): + pdu = TestPDU() + + # No content in the new instances + self.assertEqual(pdu.content, { }) + + content = { 'ver' : 0, 'flag' : 1, 'len' : 0, 'data' : b'', 'tail' : b'\xde\xbe' } + pdu.from_bytes(b'\x08\x00\x00\x00' + b'\xde\xbe') + self.assertEqual(pdu.content, content) + + content = { 'ver' : 1, 'flag' : 0, 'len' : 15, 'data' : b'\xff' * 15 } + pdu.from_bytes(b'\x10\x00\x00\x0f' + b'\xff' * 15) + self.assertEqual(pdu.content, content) + + content = { 'ver' : 2, 'flag' : 1, 'len' : 1, 'data' : b'\xf0', 'tail' : b'\xbe\xed' } + pdu.from_bytes(b'\x28\x00\x00\x01\xf0\xbe\xed') + self.assertEqual(pdu.content, content) + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7ff46b278c59af3720ee7f3950ea5a8b2f1313e1 Gerrit-Change-Number: 23135 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:21 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/codec.py: implement check() API for Envelope References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23136 ) Change subject: trx_toolkit/codec.py: implement check() API for Envelope ...................................................................... trx_toolkit/codec.py: implement check() API for Envelope Change-Id: I8258504493cf85c401677866fe8474de2e49786b Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/codec.py M src/target/trx_toolkit/test_codec.py 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/23136/1 diff --git a/src/target/trx_toolkit/codec.py b/src/target/trx_toolkit/codec.py index e3cd600..cc3b5ed 100644 --- a/src/target/trx_toolkit/codec.py +++ b/src/target/trx_toolkit/codec.py @@ -271,6 +271,15 @@ def __delitem__(self, key: str) -> None: del self.content[key] + def check(self) -> None: + ''' Check the content before encoding and after decoding. + Raise exceptions (e.g. ValueError) if something is wrong. + + Do not assert for every possible error (e.g. a negative value + for a Uint field) if an exception will be thrown by the field's + to_bytes() method anyway. Only additional constraints here. + ''' + def from_bytes(self, data: bytes, offset: int = 0) -> int: self.content = { } # forget the old content try: # Fields throw exceptions @@ -282,6 +291,7 @@ if self.check_len and len(data) != offset: raise DecodeError(self, 'Unhandled tail octets: %s' % data[offset:].hex()) + self.check() # Check the content after decoding (raises exceptions) return offset def to_bytes(self) -> bytes: @@ -291,4 +301,5 @@ except Exception as e: # Add contextual info raise EncodeError(self, f) from e + self.check() # Check the content before encoding (raises exceptions) return b''.join([proc(f) for f in self.STRUCT]) diff --git a/src/target/trx_toolkit/test_codec.py b/src/target/trx_toolkit/test_codec.py index 0499f3a..287be92 100644 --- a/src/target/trx_toolkit/test_codec.py +++ b/src/target/trx_toolkit/test_codec.py @@ -419,6 +419,10 @@ self.STRUCT[-1].get_pres_dec = lambda v, _: bool(v['flag']) self.STRUCT[-1].get_pres_enc = lambda v: bool(v['flag']) + def check(self) -> None: + if not self['ver'] in (0, 1, 2): + raise ValueError('Unknown version %d' % self['ver']) + class Envelope(unittest.TestCase): def test_rest_octets(self): pdu = TestPDU(check_len=False) @@ -467,5 +471,18 @@ pdu.from_bytes(b'\x28\x00\x00\x01\xf0\xbe\xed') self.assertEqual(pdu.content, content) + def test_to_bytes_check(self): + pdu = TestPDU() + + pdu.content = { 'ver' : 8, 'flag' : 1, 'data' : b'', 'tail' : b'\xde\xbe' } + with self.assertRaises(ValueError): + pdu.to_bytes() + + def test_from_bytes_check(self): + pdu = TestPDU() + + with self.assertRaises(ValueError): + pdu.from_bytes(b'\xf0\x00\x00\x00') + if __name__ == '__main__': unittest.main() -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8258504493cf85c401677866fe8474de2e49786b Gerrit-Change-Number: 23136 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Feb 26 21:28:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 26 Feb 2021 21:28:22 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: define TRXD PDUs using declarative codec References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23137 ) Change subject: trx_toolkit: define TRXD PDUs using declarative codec ...................................................................... trx_toolkit: define TRXD PDUs using declarative codec Change-Id: I739ae5da22c603fb2cf1e84d3a79fb1a6e7343b6 Related: OS#4006, SYS#4895 --- A src/target/trx_toolkit/trxd_proto.py 1 file changed, 101 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/23137/1 diff --git a/src/target/trx_toolkit/trxd_proto.py b/src/target/trx_toolkit/trxd_proto.py new file mode 100644 index 0000000..60b8d28 --- /dev/null +++ b/src/target/trx_toolkit/trxd_proto.py @@ -0,0 +1,101 @@ +# -*- coding: utf-8 -*- + +''' +TRXD PDU definitions based on declarative codec. +''' + +# TRX Toolkit +# +# (C) 2021 by sysmocom - s.f.m.c. GmbH +# Author: Vadim Yanitskiy +# +# All Rights Reserved +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import codec + +class Header(codec.BitFieldSet): + ''' Common header for all TRXD PDUs. ''' + + DEF_LEN = 1 + STRUCT = ( + codec.BitField('ver', bl=4), + codec.BitField('rfu', bl=1), + codec.BitField('tn', bl=3), + ) + + +class PDUv0Rx(codec.Envelope): + STRUCT = ( + Header(), + codec.Uint32BE('fn'), + codec.Uint('rssi', mult=-1), + codec.Int16BE('toa256'), + codec.Buf('soft-bits'), + codec.Buf('pad', len=2), + ) + + def __init__(self, *args, **kw) -> None: + codec.Envelope.__init__(self, *args, **kw) + + # Field 'soft-bits' is either 148 (GMSK) or 444 (8-PSK) octets long + self.STRUCT[-2].get_len = lambda _, data: 444 if len(data) > 148 else 148 + # Field 'pad' may optionally be present during decoding + self.STRUCT[-1].get_pres_dec = lambda _, data: len(data) > 0 + # ... or may intentionally be appended during encoding + self.STRUCT[-1].get_pres_enc = lambda vals: 'pad' in vals + +class PDUv0Tx(codec.Envelope): + STRUCT = ( + Header(), + codec.Uint32BE('fn'), + codec.Uint('red'), + codec.Buf('hard-bits'), + ) + + +class MTS(codec.BitFieldSet): + ''' Modulation and Training Sequence. ''' + + DEF_LEN = 1 + STRUCT = ( + codec.BitField('nope', bl=1), + codec.BitField('mod', bl=4), + codec.BitField('tsc', bl=3), + ) + +class PDUv1Rx(codec.Envelope): + STRUCT = ( + Header(), + codec.Uint32BE('fn'), + codec.Uint('rssi', mult=-1), + codec.Int16BE('toa256'), + MTS(), + codec.Int16BE('cir'), + codec.Buf('soft-bits'), + ) + + def __init__(self, *args, **kw) -> None: + codec.Envelope.__init__(self, *args, **kw) + + # Field 'soft-bits' has a variable length that depends on moduletion type + self.STRUCT[-1].get_len = lambda _, data: 444 if len(data) > 148 else 148 + # Field 'soft-bits' is not present in NOPE / IDLE indications + self.STRUCT[-1].get_pres = lambda v, _: not v['nope'] + + +class PDUv1Tx(PDUv0Tx): + pass -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I739ae5da22c603fb2cf1e84d3a79fb1a6e7343b6 Gerrit-Change-Number: 23137 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Feb 26 22:22:01 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 22:22:01 +0000 Subject: Build failure of network:osmocom:nightly/ulfius in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <6039748f17420_6772ac5bdd365f0787291@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/ulfius failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly ulfius Last lines of build log: [ 66s] libnsl2-1.3.0-1.5 ######################################## [ 66s] yder-devel-1.4.12-4.7 ######################################## [ 66s] libmicrohttpd-devel-0.9.70-1.6 ######################################## [ 66s] gcc-c++-10-3.2 ######################################## [ 66s] gcc-PIE-10-3.2 ######################################## [ 66s] zlib-devel-1.2.11-18.2 ######################################## [ 66s] libjansson-devel-2.13.1-1.5 ######################################## [ 66s] cmake-3.19.5-1.1 ######################################## [ 66s] post-build-checks-84.87+git20210215.ed######################################## [ 66s] brp-check-suse-84.87+git20201203.5008e######################################## [ 66s] hostname-3.23-2.2 ######################################## [ 66s] attr-2.4.48-3.12 ######################################## [ 66s] build-mkbaselibs-20210120-1.2 ######################################## [ 67s] kernel-obs-build-5.10.16-1.1 ######################################## [ 71s] now finalizing build dir... [ 71s] ... running 01-add_abuild_user_to_trusted_group [ 71s] ... running 02-set_timezone_to_utc [ 71s] ... running 11-hack_uname_version_to_kernel_version [ 72s] RTNETLINK answers: File exists [ 72s] RTNETLINK answers: File exists [ 72s] su: cannot open session: Module is unknown [ 72s] Error: TOPDIR empty [ 72s] ### VM INTERACTION START ### [ 75s] [ 48.681351] sysrq: Power Off [ 75s] [ 48.702794] reboot: Power down [ 76s] ### VM INTERACTION END ### [ 76s] [ 76s] obs-arm-6 failed "build ulfius.spec" at Fri Feb 26 22:21:46 UTC 2021. [ 76s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Feb 26 22:25:09 2021 From: admin at opensuse.org (OBS Notification) Date: Fri, 26 Feb 2021 22:25:09 +0000 Subject: Build failure of network:osmocom:nightly/sofia-sip in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <60397561de459_6772ac5bdd365f0788191@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/sofia-sip/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/sofia-sip failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly sofia-sip Last lines of build log: [ 53s] build-compare-20200727T175347.d95eb35-######################################## [ 53s] libnsl2-1.3.0-1.5 ######################################## [ 53s] libopenssl-devel-1.1.1h-1.2 ######################################## [ 53s] glib2-devel-2.66.7-2.1 ######################################## [ 53s] No schema files found: doing nothing. [ 53s] gcc-c++-10-3.2 ######################################## [ 53s] gcc-PIE-10-3.2 ######################################## [ 53s] post-build-checks-84.87+git20210215.ed######################################## [ 53s] brp-check-suse-84.87+git20201203.5008e######################################## [ 53s] hostname-3.23-2.2 ######################################## [ 54s] attr-2.4.48-3.12 ######################################## [ 54s] build-mkbaselibs-20210120-1.2 ######################################## [ 54s] fdupes-2.1.2-1.4 ######################################## [ 54s] kernel-obs-build-5.10.16-1.1 ######################################## [ 55s] now finalizing build dir... [ 55s] ... running 01-add_abuild_user_to_trusted_group [ 56s] ... running 02-set_timezone_to_utc [ 56s] ... running 11-hack_uname_version_to_kernel_version [ 56s] RTNETLINK answers: File exists [ 56s] RTNETLINK answers: File exists [ 56s] su: cannot open session: Module is unknown [ 56s] Error: TOPDIR empty [ 56s] ### VM INTERACTION START ### [ 59s] [ 36.402721] sysrq: Power Off [ 59s] [ 36.417068] reboot: Power down [ 60s] ### VM INTERACTION END ### [ 60s] [ 60s] obs-arm-6 failed "build sofia-sip.spec" at Fri Feb 26 22:24:53 UTC 2021. [ 60s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 27 01:47:09 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 27 Feb 2021 01:47:09 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <6039a4b465af7_6772ac5bdd365f0822320@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 409s] [COMPILING apps/dfu/main.c] [ 410s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 410s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 410s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 410s] Memory region Used Size Region Size %age Used [ 410s] rom: 16580 B 16 KB 101.20% [ 410s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 410s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 410s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 410s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 410s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 410s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 410s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 410s] collect2: error: ld returned 1 exit status [ 410s] % [ 410s] make[2]: *** [Makefile:234: flash] Error 1 [ 410s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 410s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 410s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 410s] dh_auto_build: error: make -j1 returned exit code 2 [ 410s] make: *** [debian/rules:16: build] Error 25 [ 410s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 410s] ### VM INTERACTION START ### [ 414s] [ 361.842878] sysrq: Power Off [ 414s] [ 361.898192] reboot: Power down [ 414s] ### VM INTERACTION END ### [ 414s] [ 414s] lamb55 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 27 01:47:01 UTC 2021. [ 414s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Feb 27 01:49:09 2021 From: admin at opensuse.org (OBS Notification) Date: Sat, 27 Feb 2021 01:49:09 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <6039a52f1b4eb_6772ac5bdd365f082244f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 489s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 490s] [COMPILING libboard/qmod/source/card_pres.c] [ 490s] [COMPILING libboard/qmod/source/wwan_led.c] [ 490s] [COMPILING libboard/qmod/source/i2c.c] [ 490s] [COMPILING libboard/qmod/source/board_qmod.c] [ 491s] [COMPILING apps/dfu/main.c] [ 491s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 491s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 491s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 492s] Memory region Used Size Region Size %age Used [ 492s] rom: 16588 B 16 KB 101.25% [ 492s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 492s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 492s] collect2: error: ld returned 1 exit status [ 492s] % [ 492s] make[2]: *** [Makefile:234: flash] Error 1 [ 492s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 492s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 492s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 492s] dh_auto_build: error: make -j1 returned exit code 2 [ 492s] make: *** [debian/rules:16: build] Error 25 [ 492s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 492s] ### VM INTERACTION START ### [ 495s] [ 437.945013] sysrq: Power Off [ 495s] [ 437.975358] reboot: Power down [ 495s] ### VM INTERACTION END ### [ 495s] [ 495s] lamb28 failed "build simtrace2_0.7.0.70.657c.dsc" at Sat Feb 27 01:48:59 UTC 2021. [ 495s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Feb 27 16:22:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 27 Feb 2021 16:22:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 ) Change subject: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh ...................................................................... bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh Some modules from library depend on these native functions. Without them the compilation fails during linkage: Native_Functions.so: undefined reference to `Native__Functions::f__str__tolower(CHARSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__inet__hntoa(OCTETSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__inet__haddr(CHARSTRING const&)' BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet6__addr(CHARSTRING const&)' BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet__addr(CHARSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__str__toupper(CHARSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__inet__ntoa(OCTETSTRING const&)' collect2: error: ld returned 1 exit status make[1]: *** [BSCNAT_Tests] Error 1 Change-Id: I81227db58850375f0ce48e5c6e013381291a5904 --- M bsc-nat/regen_makefile.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/23138/1 diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index c9d744e..ad31551 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -2,7 +2,7 @@ MAIN=BSCNAT_Tests.ttcn -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc" export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 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: I81227db58850375f0ce48e5c6e013381291a5904 Gerrit-Change-Number: 23138 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 27 16:23:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 27 Feb 2021 16:23:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh In-Reply-To: References: Message-ID: fixeria has removed Jenkins Builder from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 ) Change subject: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh ...................................................................... Removed reviewer Jenkins Builder with the following votes: * Verified+1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 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: I81227db58850375f0ce48e5c6e013381291a5904 Gerrit-Change-Number: 23138 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteReviewer -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 27 16:24:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 27 Feb 2021 16:24:05 +0000 Subject: Change in docker-playground[master]: ttcn3-cbc-test: fix: osmo-stp.cfg does not exist nor needed References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23139 ) Change subject: ttcn3-cbc-test: fix: osmo-stp.cfg does not exist nor needed ...................................................................... ttcn3-cbc-test: fix: osmo-stp.cfg does not exist nor needed Change-Id: I6aad8c083fc816012c73bc41990dd76cc97f73e6 --- M ttcn3-cbc-test/jenkins.sh 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/23139/1 diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 5c2bf5d..347623f 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -12,9 +12,6 @@ mkdir $VOL_BASE_DIR/cbc-tester cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ -mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ - mkdir $VOL_BASE_DIR/cbc cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6aad8c083fc816012c73bc41990dd76cc97f73e6 Gerrit-Change-Number: 23139 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Feb 27 18:45:36 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 27 Feb 2021 18:45:36 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/23014 ) Change subject: gprs_bssgp_pcu: ensure only known BVCI can be resetted by the SGSN ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/23014/4/src/gprs_bssgp_pcu.c File src/gprs_bssgp_pcu.c: https://gerrit.osmocom.org/c/osmo-pcu/+/23014/4/src/gprs_bssgp_pcu.c at 460 PS4, Line 460: !TLVP_PRESENT(&tp, BSSGP_IE_BVCI) > I think we do have a BSSGP parser that knows which IEs are mandatory and which are not. [?] I agree, we should add it in another commit. As well we should look if the PCU code can use the new BSSGP fsm. (I don't know the new BSSGP code). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/23014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04e36ce4a29e51d85e67a0d3a81aa0e1eb9e9c08 Gerrit-Change-Number: 23014 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 27 Feb 2021 18:45:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Feb 28 01:36:17 2021 From: admin at opensuse.org (OBS Notification) Date: Sun, 28 Feb 2021 01:36:17 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64 In-Reply-To: References: Message-ID: <603af3a238c02_6772ac5bdd365f01040519@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 161s] [COMPILING apps/dfu/main.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 161s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 161s] Memory region Used Size Region Size %age Used [ 161s] rom: 16580 B 16 KB 101.20% [ 161s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 161s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 161s] collect2: error: ld returned 1 exit status [ 161s] % [ 161s] make[2]: *** [Makefile:234: flash] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 161s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: error: make -j1 returned exit code 2 [ 161s] make: *** [debian/rules:16: build] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 165s] [ 146.151933] sysrq: Power Off [ 165s] [ 146.155826] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] cloud127 failed "build simtrace2_0.7.0.70.657c.dsc" at Sun Feb 28 01:36:13 UTC 2021. [ 165s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Feb 28 01:38:00 2021 From: admin at opensuse.org (OBS Notification) Date: Sun, 28 Feb 2021 01:38:00 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64 In-Reply-To: References: Message-ID: <603af3fb80c53_6772ac5bdd365f010406c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 158s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 158s] [COMPILING libboard/qmod/source/card_pres.c] [ 158s] [COMPILING libboard/qmod/source/wwan_led.c] [ 158s] [COMPILING libboard/qmod/source/i2c.c] [ 158s] [COMPILING libboard/qmod/source/board_qmod.c] [ 158s] [COMPILING apps/dfu/main.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 159s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 159s] Memory region Used Size Region Size %age Used [ 159s] rom: 16588 B 16 KB 101.25% [ 159s] ram: 11672 B 48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 159s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 159s] collect2: error: ld returned 1 exit status [ 159s] % [ 159s] make[2]: *** [Makefile:234: flash] Error 1 [ 159s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 159s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 159s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 159s] dh_auto_build: error: make -j1 returned exit code 2 [ 159s] make: *** [debian/rules:16: build] Error 25 [ 159s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 159s] ### VM INTERACTION START ### [ 162s] [ 150.565535] sysrq: Power Off [ 162s] [ 150.572046] reboot: Power down [ 162s] ### VM INTERACTION END ### [ 162s] [ 162s] lamb17 failed "build simtrace2_0.7.0.70.657c.dsc" at Sun Feb 28 01:37:58 UTC 2021. [ 162s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:05:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:05:29 +0000 Subject: Change in osmo-trx[master]: mark uhddev_ipc.cpp as BUILT_SOURCES References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/23140 ) Change subject: mark uhddev_ipc.cpp as BUILT_SOURCES ...................................................................... mark uhddev_ipc.cpp as BUILT_SOURCES fixes "make dist-bzip2" on a clean checkout Closes: OS#5052 Change-Id: Ieb4cefb16c8f43e708a96353c13342fe40ffdb54 --- M Transceiver52M/device/ipc/Makefile.am 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/40/23140/1 diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am index 4fe0090..1c75088 100644 --- a/Transceiver52M/device/ipc/Makefile.am +++ b/Transceiver52M/device/ipc/Makefile.am @@ -17,14 +17,15 @@ libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC -if DEVICE_UHD - #work around distclean issue on older autotools vers: #a direct build of ../uhd/UHDDevice.cpp tries to clean #../uhd/.dep/UHDDevice.Plo twice and fails uhddev_ipc.cpp: echo "#include \"../uhd/UHDDevice.cpp\"" >$@ CLEANFILES= uhddev_ipc.cpp +BUILT_SOURCES = uhddev_ipc.cpp + +if DEVICE_UHD bin_PROGRAMS = ipc-driver-test #ipc_driver_test_SHORTNAME = drvt -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieb4cefb16c8f43e708a96353c13342fe40ffdb54 Gerrit-Change-Number: 23140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:16:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:16:05 +0000 Subject: Change in docker-playground[master]: ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23141 ) Change subject: ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg ...................................................................... ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg Change-Id: I1517238e997605cbcf265b97526694d17137f00e --- M ttcn3-cbc-test/jenkins.sh 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/23141/1 diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 5c2bf5d..347623f 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -12,9 +12,6 @@ mkdir $VOL_BASE_DIR/cbc-tester cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ -mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ - mkdir $VOL_BASE_DIR/cbc cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1517238e997605cbcf265b97526694d17137f00e Gerrit-Change-Number: 23141 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:16:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:16:45 +0000 Subject: Change in docker-playground[master]: ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23141 ) Change subject: ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1517238e997605cbcf265b97526694d17137f00e Gerrit-Change-Number: 23141 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 28 Feb 2021 10:16:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:16:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:16:48 +0000 Subject: Change in docker-playground[master]: ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23141 ) Change subject: ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg ...................................................................... ttcn3-cbc-test: fix copy+paste error regarding osmo-stp.cfg Change-Id: I1517238e997605cbcf265b97526694d17137f00e --- M ttcn3-cbc-test/jenkins.sh 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 5c2bf5d..347623f 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -12,9 +12,6 @@ mkdir $VOL_BASE_DIR/cbc-tester cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ -mkdir $VOL_BASE_DIR/stp -cp osmo-stp.cfg $VOL_BASE_DIR/stp/ - mkdir $VOL_BASE_DIR/cbc cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1517238e997605cbcf265b97526694d17137f00e Gerrit-Change-Number: 23141 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:31:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:31:13 +0000 Subject: Change in osmo-trx[master]: mark uhddev_ipc.cpp as BUILT_SOURCES In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23140 ) Change subject: mark uhddev_ipc.cpp as BUILT_SOURCES ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieb4cefb16c8f43e708a96353c13342fe40ffdb54 Gerrit-Change-Number: 23140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 28 Feb 2021 10:31:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:31:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:31:16 +0000 Subject: Change in osmo-trx[master]: mark uhddev_ipc.cpp as BUILT_SOURCES In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23140 ) Change subject: mark uhddev_ipc.cpp as BUILT_SOURCES ...................................................................... mark uhddev_ipc.cpp as BUILT_SOURCES fixes "make dist-bzip2" on a clean checkout Closes: OS#5052 Change-Id: Ieb4cefb16c8f43e708a96353c13342fe40ffdb54 --- M Transceiver52M/device/ipc/Makefile.am 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am index 4fe0090..1c75088 100644 --- a/Transceiver52M/device/ipc/Makefile.am +++ b/Transceiver52M/device/ipc/Makefile.am @@ -17,14 +17,15 @@ libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC -if DEVICE_UHD - #work around distclean issue on older autotools vers: #a direct build of ../uhd/UHDDevice.cpp tries to clean #../uhd/.dep/UHDDevice.Plo twice and fails uhddev_ipc.cpp: echo "#include \"../uhd/UHDDevice.cpp\"" >$@ CLEANFILES= uhddev_ipc.cpp +BUILT_SOURCES = uhddev_ipc.cpp + +if DEVICE_UHD bin_PROGRAMS = ipc-driver-test #ipc_driver_test_SHORTNAME = drvt -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieb4cefb16c8f43e708a96353c13342fe40ffdb54 Gerrit-Change-Number: 23140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:33:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:33:22 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E1-e2404_=E2=86=92_1=2E3=2E1?= References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/23142 ) Change subject: Bump version: 1.3.0.1-e2404 ? 1.3.1 ...................................................................... Bump version: 1.3.0.1-e2404 ? 1.3.1 Change-Id: I559b8d8608b3e492ae1ba0d5a54e226ab424b23b --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/42/23142/1 diff --git a/debian/changelog b/debian/changelog index f69b2d3..019fdf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-trx (1.3.1) unstable; urgency=medium + + * mark uhddev_ipc.cpp as BUILT_SOURCES + + -- Harald Welte Sun, 28 Feb 2021 11:32:11 +0100 + osmo-trx (1.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I559b8d8608b3e492ae1ba0d5a54e226ab424b23b Gerrit-Change-Number: 23142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:34:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:34:45 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23111 ) Change subject: Correct configuration written from vty ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 28 Feb 2021 10:34:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:34:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:34:47 +0000 Subject: Change in osmo-hlr[master]: Correct configuration written from vty In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/23111 ) Change subject: Correct configuration written from vty ...................................................................... Correct configuration written from vty osmo-hlr would not read back written configuration due to bad indentation in the mslookup->server->service section. Also ipa-name was missing. Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb --- M src/dgsm_vty.c M src/hlr_vty.c M tests/test_nodes.vty 3 files changed, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/dgsm_vty.c b/src/dgsm_vty.c index 6f29d3b..00a60ea 100644 --- a/src/dgsm_vty.c +++ b/src/dgsm_vty.c @@ -442,7 +442,7 @@ msc = mslookup_server_msc_get(&mslookup_server_msc_wildcard, false); if (msc) - config_write_msc_services(vty, " ", msc); + config_write_msc_services(vty, " ", msc); llist_for_each_entry(msc, &g_hlr->mslookup.server.local_site_services, entry) { if (!osmo_ipa_name_cmp(&mslookup_server_msc_wildcard, &msc->name)) diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 4b91aa9..df2270b 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -102,6 +102,8 @@ vty_out(vty, " gsup%s", VTY_NEWLINE); if (g_hlr->gsup_bind_addr) vty_out(vty, " bind ip %s%s", g_hlr->gsup_bind_addr, VTY_NEWLINE); + if (g_hlr->gsup_unit_name.serno) + vty_out(vty, " ipa-name %s%s", g_hlr->gsup_unit_name.serno, VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 5848fe1..cce5703 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -107,6 +107,7 @@ database hlr_vty_test.db gsup bind ip 127.0.0.1 + ipa-name unnamed-HLR ussd route prefix *#100# internal own-msisdn ussd route prefix *#101# internal own-imsi end @@ -345,9 +346,9 @@ mslookup server mdns bind 239.192.23.42 4266 - service foo.bar at 123.45.67.89 1011 - service baz.bar at 121.31.41.5 1617 - service baz.bar at a:b:c::d 1819 + service foo.bar at 123.45.67.89 1011 + service baz.bar at 121.31.41.5 1617 + service baz.bar at a:b:c::d 1819 msc MSC-1 msc msc-901-70-23 service foo.bar at 76.54.32.10 1234 @@ -401,8 +402,8 @@ mslookup server mdns bind 239.192.23.42 4266 - service foo.bar at 123.45.67.89 1011 - service baz.bar at 121.31.41.5 1617 + service foo.bar at 123.45.67.89 1011 + service baz.bar at 121.31.41.5 1617 msc MSC-1 msc msc-901-70-23 service foo.bar at 76.54.32.10 1234 @@ -433,9 +434,9 @@ mslookup server mdns bind 239.192.23.42 4266 - service foo.bar at 123.45.67.89 1011 - service baz.bar at 121.31.41.5 1617 - service gsup.hlr at 23.42.17.11 4223 + service foo.bar at 123.45.67.89 1011 + service baz.bar at 121.31.41.5 1617 + service gsup.hlr at 23.42.17.11 4223 msc MSC-1 msc msc-901-70-23 service foo.bar at 76.54.32.10 1234 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/23111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ied4b9504f06a51c3895054a8b9d07a67eda3aeeb Gerrit-Change-Number: 23111 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:35:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:35:23 +0000 Subject: Change in osmo-bsc[master]: remove obsolete dependency on libosmo-sccp In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23068 ) Change subject: remove obsolete dependency on libosmo-sccp ...................................................................... remove obsolete dependency on libosmo-sccp We only use libosmo-sigtran these days, so we can remove the depdency to the old libosmo-sccp from osmo-bsc. We don't use LIBOSMO_SCCP_* variables in any Makefile.am, nor do we #include anywhere [anymore]. Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Related: OS#2601 --- M configure.ac M contrib/osmo-bsc.spec.in M debian/control 3 files changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 762b814..195acfe 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,6 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.4.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.8.0) dnl checks for header files diff --git a/contrib/osmo-bsc.spec.in b/contrib/osmo-bsc.spec.in index 6f3b2bd..9f7ef48 100644 --- a/contrib/osmo-bsc.spec.in +++ b/contrib/osmo-bsc.spec.in @@ -33,7 +33,6 @@ BuildRequires: pkgconfig(libcrypto) >= 0.9.5 BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.8.0 BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 -BuildRequires: pkgconfig(libosmo-sccp) >= 1.4.0 BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 BuildRequires: pkgconfig(libosmocore) >= 1.5.0 diff --git a/debian/control b/debian/control index 09dcd04..a135119 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ libcdk5-dev, libtalloc-dev, libosmocore-dev (>= 1.5.0), - libosmo-sccp-dev (>= 1.4.0), libosmo-sigtran-dev (>= 1.4.0), libosmo-abis-dev (>= 1.1.0), libosmo-netif-dev (>= 1.1.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie478016ffb6e767ba10968c1ee2ab98db15a45a3 Gerrit-Change-Number: 23068 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:36:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:36:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 ) Change subject: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 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: I81227db58850375f0ce48e5c6e013381291a5904 Gerrit-Change-Number: 23138 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 28 Feb 2021 10:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:36:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:36:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 ) Change subject: bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh ...................................................................... bsc-nat: add 'Native_FunctionDefs.cc' to regen_makefile.sh Some modules from library depend on these native functions. Without them the compilation fails during linkage: Native_Functions.so: undefined reference to `Native__Functions::f__str__tolower(CHARSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__inet__hntoa(OCTETSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__inet__haddr(CHARSTRING const&)' BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet6__addr(CHARSTRING const&)' BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet__addr(CHARSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__str__toupper(CHARSTRING const&)' Native_Functions.so: undefined reference to `Native__Functions::f__inet__ntoa(OCTETSTRING const&)' collect2: error: ld returned 1 exit status make[1]: *** [BSCNAT_Tests] Error 1 Change-Id: I81227db58850375f0ce48e5c6e013381291a5904 --- M bsc-nat/regen_makefile.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index c9d744e..ad31551 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -2,7 +2,7 @@ MAIN=BSCNAT_Tests.ttcn -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc" export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23138 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: I81227db58850375f0ce48e5c6e013381291a5904 Gerrit-Change-Number: 23138 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:37:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:37:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 ) Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 28 Feb 2021 10:37:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 10:37:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 10:37:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: add TC_sns_so_bvc_reset_unknown_bvci In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 ) Change subject: pcu: add TC_sns_so_bvc_reset_unknown_bvci ...................................................................... pcu: add TC_sns_so_bvc_reset_unknown_bvci Do an SGSN originated reset of signalling BVCI, then do a SGSN originated reset of an unknown BVCI. PCU -X SGSN: BVCI 0 BSSGP-RESET (ignores reset) PCU <- SGSN: BVCI 0 BSSGP-RESET PCU -> SGSN: BVCI 0 BSSGP-RESET-ACK (with cell information) PCU -X SGSN: BVCI 23 BSSGP-RESET (ignores reset, 23 is configured on PCU, 24 is not configured) PCU <- SGSN: BVCI 24 BSSGP-RESET (unconfigured BVCI) PCU -> SGSN: BVCI 24 BSSGP-STATUS Unknown BVCI Related: OS#3879 Change-Id: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 42 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index c4f6b6e..34aec72 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -17,6 +17,7 @@ import from NS_Emulation all; import from NS_Types all; import from RAW_NS all; +import from BSSGP_Types all; /********************************************************************************** * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS) @@ -246,6 +247,46 @@ f_clean_ns_codec(); } +/* Do an SGSN originated BSSGP-Reset of a not-configured BVCI. + * + * PCU -X SGSN: BVCI 0 BSSGP-RESET (ignores reset) + * PCU <- SGSN: BVCI 0 BSSGP-RESET + * PCU -> SGSN: BVCI 0 BSSGP-RESET-ACK (with cell information) + * PCU -X SGSN: BVCI 23 BSSGP-RESET (ignores reset, 23 is configured on PCU, 24 is not configured) + * PCU <- SGSN: BVCI 24 BSSGP-RESET (unconfigured BVCI) + * PCU -> SGSN: BVCI 24 BSSGP-STATUS Unknown BVCI + */ +testcase TC_sns_so_bvc_reset_unknown_bvci() runs on RAW_Test_CT { + f_init_ns_codec(mp_nsconfig); + f_init_pcuif(); + f_incoming_sns_size(); + f_incoming_sns_config(); + f_outgoing_sns_config(); + + /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ + as_rx_alive_tx_ack(oneshot := true); + activate(as_rx_alive_tx_ack()); + + /* Expect BVC-RESET, but ignore it to prevent a race condition of BVC RESETs */ + var template PDU_NS pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, 0, omit)); + f_ns_exp(pdu, idx := 0); + /* SGSN originated BVC-RESET on an uninitialized sign BVC */ + f_tx_bvc_reset_rx_ack(0, omit, omit, idx := 0); + + /* Expect BVC-RESET PTP BVC, but ignore it to prevent a race condition of BVC RESETs */ + pdu := tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BVC_RESET(?, mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id)); + f_ns_exp(pdu); + + /* Send a BVC-RESET on the wrong BVC */ + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, mp_gb_cfg.bvc[0].bvci + 1, + omit)); + NSCP[0].send(ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))); + NSCP[0].receive(tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch tr_BSSGP_STATUS(mp_gb_cfg.bvc[0].bvci + 1, BSSGP_CAUSE_BVCI_UNKNOWN, *))); + setverdict(pass); + + f_clean_ns_codec(); +} + /* Test adding new IP endpoints at runtime */ testcase TC_sns_add() runs on RAW_Test_CT { f_sns_bringup_1c1u(); @@ -328,6 +369,7 @@ execute( TC_sns_1c1u_separate() ); execute( TC_sns_1c1u_so_bvc_reset() ); execute( TC_sns_1c1u_so_bvc_reset_too_early() ); + execute( TC_sns_so_bvc_reset_unknown_bvci() ); execute( TC_sns_add() ); execute( TC_sns_add_nack() ); execute( TC_sns_del() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23016 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: Iea5519b453dd544c5a78b3b16ddb5132d20cf67c Gerrit-Change-Number: 23016 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 11:32:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 11:32:01 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E1-e2404_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23142 ) Change subject: Bump version: 1.3.0.1-e2404 ? 1.3.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I559b8d8608b3e492ae1ba0d5a54e226ab424b23b Gerrit-Change-Number: 23142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 28 Feb 2021 11:32:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 11:32:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 11:32:04 +0000 Subject: =?UTF-8?Q?Change_in_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_1=2E3=2E0=2E1-e2404_=E2=86=92_1=2E3=2E1?= In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23142 ) Change subject: Bump version: 1.3.0.1-e2404 ? 1.3.1 ...................................................................... Bump version: 1.3.0.1-e2404 ? 1.3.1 Change-Id: I559b8d8608b3e492ae1ba0d5a54e226ab424b23b --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index f69b2d3..019fdf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-trx (1.3.1) unstable; urgency=medium + + * mark uhddev_ipc.cpp as BUILT_SOURCES + + -- Harald Welte Sun, 28 Feb 2021 11:32:11 +0100 + osmo-trx (1.3.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I559b8d8608b3e492ae1ba0d5a54e226ab424b23b Gerrit-Change-Number: 23142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 11:38:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 11:38:01 +0000 Subject: Change in osmo-ci[master]: ignore osmo-trx 1.3.0 as it doesn't do "make dist" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/23143 ) Change subject: ignore osmo-trx 1.3.0 as it doesn't do "make dist" ...................................................................... ignore osmo-trx 1.3.0 as it doesn't do "make dist" Change-Id: I47fcd280de158a318f85149eb93b8201ac326e17 Closes: OS#5052 --- M scripts/osmocom-release-tarballs.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/23143/1 diff --git a/scripts/osmocom-release-tarballs.sh b/scripts/osmocom-release-tarballs.sh index 3f8b920..9894a47 100755 --- a/scripts/osmocom-release-tarballs.sh +++ b/scripts/osmocom-release-tarballs.sh @@ -72,6 +72,7 @@ # cp: cannot stat './/home/user/code/osmo-dev/src/osmo-ci/_temp/repos/osmo-trx/configure' echo "0.2.0" echo "0.3.0" + echo "1.3.0" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47fcd280de158a318f85149eb93b8201ac326e17 Gerrit-Change-Number: 23143 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 11:39:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 11:39:43 +0000 Subject: Change in osmo-ci[master]: ignore osmo-trx 1.3.0 as it doesn't do "make dist" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23143 ) Change subject: ignore osmo-trx 1.3.0 as it doesn't do "make dist" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47fcd280de158a318f85149eb93b8201ac326e17 Gerrit-Change-Number: 23143 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 28 Feb 2021 11:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 11:39:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 28 Feb 2021 11:39:46 +0000 Subject: Change in osmo-ci[master]: ignore osmo-trx 1.3.0 as it doesn't do "make dist" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23143 ) Change subject: ignore osmo-trx 1.3.0 as it doesn't do "make dist" ...................................................................... ignore osmo-trx 1.3.0 as it doesn't do "make dist" Change-Id: I47fcd280de158a318f85149eb93b8201ac326e17 Closes: OS#5052 --- M scripts/osmocom-release-tarballs.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/scripts/osmocom-release-tarballs.sh b/scripts/osmocom-release-tarballs.sh index 3f8b920..9894a47 100755 --- a/scripts/osmocom-release-tarballs.sh +++ b/scripts/osmocom-release-tarballs.sh @@ -72,6 +72,7 @@ # cp: cannot stat './/home/user/code/osmo-dev/src/osmo-ci/_temp/repos/osmo-trx/configure' echo "0.2.0" echo "0.3.0" + echo "1.3.0" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I47fcd280de158a318f85149eb93b8201ac326e17 Gerrit-Change-Number: 23143 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 15:15:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 15:15:06 +0000 Subject: Change in docker-playground[master]: ttcn3-cbc-test: fix: osmo-stp.cfg does not exist nor needed In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23139 ) Change subject: ttcn3-cbc-test: fix: osmo-stp.cfg does not exist nor needed ...................................................................... Abandoned Fixed in I1517238e997605cbcf265b97526694d17137f00e by Harald. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6aad8c083fc816012c73bc41990dd76cc97f73e6 Gerrit-Change-Number: 23139 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 15:27:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 15:27:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: fix coding style in TC_bssgp_rim_single_report References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23144 ) Change subject: SGSN_Tests: fix coding style in TC_bssgp_rim_single_report ...................................................................... SGSN_Tests: fix coding style in TC_bssgp_rim_single_report Change-Id: I667c1e8a94393e2b5afc6e2e3f7503b73198822c --- M sgsn/SGSN_Tests.ttcn 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/23144/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index b79aae4..efd92a0 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3195,13 +3195,13 @@ RIM[0].send(bssgp_rim_pdu); T.start; alt { - [] RIM[1].receive(bssgp_rim_pdu_expect) { } - [] RIM[1].receive { - setverdict(fail, "Unexpected BSSGP RIM PDU received"); + [] RIM[1].receive(bssgp_rim_pdu_expect) { } + [] RIM[1].receive { + setverdict(fail, "Unexpected BSSGP RIM PDU received"); } - [] T.timeout { - setverdict(fail, "No BSSGP RIM PDU received"); - mtc.stop; + [] T.timeout { + setverdict(fail, "No BSSGP RIM PDU received"); + mtc.stop; } } @@ -3227,13 +3227,13 @@ RIM[1].send(bssgp_rim_pdu); T.start; alt { - [] RIM[0].receive(bssgp_rim_pdu_expect) { } - [] RIM[0].receive { - setverdict(fail, "Unexpected BSSGP RIM PDU received"); + [] RIM[0].receive(bssgp_rim_pdu_expect) { } + [] RIM[0].receive { + setverdict(fail, "Unexpected BSSGP RIM PDU received"); } - [] T.timeout { - setverdict(fail, "No BSSGP RIM PDU received"); - mtc.stop; + [] T.timeout { + setverdict(fail, "No BSSGP RIM PDU received"); + mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23144 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: I667c1e8a94393e2b5afc6e2e3f7503b73198822c Gerrit-Change-Number: 23144 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 15:27:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 15:27:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN_Tests: add setverdict(pass) to TC_bssgp_rim_single_report() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23145 ) Change subject: SGSN_Tests: add setverdict(pass) to TC_bssgp_rim_single_report() ...................................................................... SGSN_Tests: add setverdict(pass) to TC_bssgp_rim_single_report() Change-Id: If5295cc8eccda2d1b3baae7d2169fac5da2a085c --- M sgsn/SGSN_Tests.ttcn 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/23145/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index efd92a0..79e7434 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3195,7 +3195,9 @@ RIM[0].send(bssgp_rim_pdu); T.start; alt { - [] RIM[1].receive(bssgp_rim_pdu_expect) { } + [] RIM[1].receive(bssgp_rim_pdu_expect) { + setverdict(pass); + } [] RIM[1].receive { setverdict(fail, "Unexpected BSSGP RIM PDU received"); } @@ -3227,7 +3229,9 @@ RIM[1].send(bssgp_rim_pdu); T.start; alt { - [] RIM[0].receive(bssgp_rim_pdu_expect) { } + [] RIM[0].receive(bssgp_rim_pdu_expect) { + setverdict(pass); + } [] RIM[0].receive { setverdict(fail, "Unexpected BSSGP RIM PDU received"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23145 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: If5295cc8eccda2d1b3baae7d2169fac5da2a085c Gerrit-Change-Number: 23145 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 16:13:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 16:13:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: TC_connect_and_nothing() runs on test_CT References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23146 ) Change subject: remsim: TC_connect_and_nothing() runs on test_CT ...................................................................... remsim: TC_connect_and_nothing() runs on test_CT Change-Id: Ie94bf52e57a964b9f280c7626f354c5feee5c165 --- M remsim/RemsimServer_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/23146/1 diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index fd7a1a4..d5af530 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -75,7 +75,7 @@ }; -testcase TC_connect_and_nothing() runs on rspro_client_CT { +testcase TC_connect_and_nothing() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimClient, "foobar")); timer T := 20.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23146 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: Ie94bf52e57a964b9f280c7626f354c5feee5c165 Gerrit-Change-Number: 23146 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 16:13:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 16:13:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: remsim: add the guard timeout to all test cases References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23147 ) Change subject: remsim: add the guard timeout to all test cases ...................................................................... remsim: add the guard timeout to all test cases As can be seen [1], it happens quite often that a test case gets stuck and runs forever. Most of the existing test suites have the guard timeout to prevent this. Let's make use of it here too. [1] https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-remsim-test-latest/190/ Build has been executing for 1 day 23 hr! Change-Id: I3897efd2a97c3e0d487057aa7bdc2967f3424dd8 --- M remsim/RemsimBankd_Tests.ttcn M remsim/RemsimClient_Tests.ttcn M remsim/RemsimServer_Tests.ttcn 3 files changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/23147/1 diff --git a/remsim/RemsimBankd_Tests.ttcn b/remsim/RemsimBankd_Tests.ttcn index 47beedd..a2686d3 100644 --- a/remsim/RemsimBankd_Tests.ttcn +++ b/remsim/RemsimBankd_Tests.ttcn @@ -35,11 +35,23 @@ /* We implement a RSPRO server to simulate the remsim-server and a RSPRO client to simulate a remsim-client connecting to bankd */ type component bankd_test_CT extends rspro_server_CT, rspro_client_CT, VPCD_Adapter_CT { + timer g_T_guard := 60.0; +} + +private altstep as_Tguard() runs on bankd_test_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } } private function f_init(boolean start_client := false) runs on bankd_test_CT { var ComponentIdentity srv_comp_id := valueof(ts_CompId(remsimServer, "ttcn-server")); + /* Start the guard timer */ + g_T_guard.start; + activate(as_Tguard()); + f_rspro_srv_init(0, mp_server_ip, mp_server_port, srv_comp_id); if (start_client) { diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn index 499fd3e..d7d6bc7 100644 --- a/remsim/RemsimClient_Tests.ttcn +++ b/remsim/RemsimClient_Tests.ttcn @@ -15,6 +15,7 @@ import from Native_Functions all; import from Osmocom_Types all; import from IPA_Emulation all; +import from Misc_Helpers all; /* the PIPEasp port allows us to interact with osmo-remsim-client-shell via stdin/stdout */ import from PIPEasp_PortType all; @@ -33,12 +34,24 @@ type component client_test_CT extends rspro_server_CT { port PIPEasp_PT PIPE; var ComponentIdentity g_srv_comp_id, g_bankd_comp_id; + timer g_T_guard := 60.0; }; +private altstep as_Tguard() runs on client_test_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } +} + private function f_init() runs on client_test_CT { g_srv_comp_id := valueof(ts_CompId(remsimServer, "ttcn-server")); g_bankd_comp_id := valueof(ts_CompId(remsimBankd, "ttcn-bankd")); + /* Start the guard timer */ + g_T_guard.start; + activate(as_Tguard()); + f_rspro_srv_init(0, mp_server_ip, mp_server_port, g_srv_comp_id); f_rspro_srv_init(1, mp_bankd_ip, mp_bankd_port, g_bankd_comp_id, exp_connect := false); } diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index d5af530..135ce15 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -20,6 +20,7 @@ import from RSPRO_Types all; import from REMSIM_Tests all; +import from Misc_Helpers all; import from IPA_Emulation all; import from HTTPmsg_Types all; @@ -72,13 +73,28 @@ } type component test_CT extends rspro_client_CT, http_CT { + timer g_T_guard := 60.0; }; +private altstep as_Tguard() runs on test_CT { + [] g_T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } +} + +private function f_init() runs on test_CT { + /* Start the guard timer */ + g_T_guard.start; + activate(as_Tguard()); +} + testcase TC_connect_and_nothing() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimClient, "foobar")); timer T := 20.0; + f_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); T.start; /* expect that we're disconnected if we never send a ConnectClientReq */ @@ -97,6 +113,7 @@ var ComponentIdentity rspro_id := valueof(ts_CompId(remsimClient, "foobar")); var JsRoot js; + f_init(); f_rsres_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); rspro[0].rspro_client_slot := valueof(ts_ClientSlot(3,4)); @@ -120,6 +137,7 @@ var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, "foobar")); var JsRoot js; + f_init(); f_rsres_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); rspro[0].rspro_bank_id := 1; @@ -170,6 +188,7 @@ /* test adding a single slotmap */ testcase TC_slotmap_add() runs on test_CT { + f_init(); f_rsres_init(); var JsSlotmap sm := valueof(ts_JsSlotmap(ts_BankSlot(1,2), ts_ClientSlot(3,4))); @@ -181,6 +200,7 @@ /* test adding a single slotmap with out-of-range values */ testcase TC_slotmap_add_out_of_range() runs on test_CT { + f_init(); f_rsres_init(); var HTTPMessage http_resp; @@ -206,6 +226,8 @@ /* test adding a slotmap and then connecting a client + bankd */ testcase TC_slotmap_add_conn_cl_b() runs on test_CT { + f_init(); + /* Simulate one client */ var ComponentIdentity rspro_id := valueof(ts_CompId(remsimClient, testcasename())); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); @@ -249,6 +271,8 @@ /* test connecting a client and later adding a slotmap for it */ testcase TC_conn_cl_b_slotmap_add() runs on test_CT { + f_init(); + /* Simulate one client */ var ComponentIdentity rspro_id := valueof(ts_CompId(remsimClient, testcasename())); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); @@ -292,6 +316,7 @@ /* simple delete of a 'NEW' slotmap */ testcase TC_slotmap_del_new() runs on test_CT { + f_init(); f_rsres_init(); var JsSlotmap sm := valueof(ts_JsSlotmap(ts_BankSlot(1,2), ts_ClientSlot(3,4))); @@ -303,6 +328,7 @@ /* simple delete of a non-existant slotmap */ testcase TC_slotmap_del_nonexistant() runs on test_CT { + f_init(); f_rsres_init(); var JsSlotmap sm := valueof(ts_JsSlotmap(ts_BankSlot(11,12), ts_ClientSlot(13,14))); @@ -314,6 +340,8 @@ /* simple delete of a 'UNACKNOWLEDGED' slotmap */ testcase TC_slotmap_del_unack() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, testcasename())); + + f_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); rspro[0].rspro_bank_id := 1; rspro[0].rspro_bank_nslots := 8; @@ -347,6 +375,8 @@ /* simple delete of a 'ACTIVE' slotmap from server + bankd */ testcase TC_slotmap_del_active() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, testcasename())); + + f_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); rspro[0].rspro_bank_id := 1; rspro[0].rspro_bank_nslots := 8; @@ -386,6 +416,8 @@ /* simple delete of a 'ACTIVE' slotmap from client */ testcase TC_slotmap_del_active_client() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, testcasename())); + + f_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); rspro[0].rspro_bank_id := 1; rspro[0].rspro_bank_nslots := 8; @@ -438,6 +470,8 @@ /* Add a slotmap to a currently active bank */ testcase TC_slotmap_add_active_bank() runs on test_CT { var ComponentIdentity rspro_id := valueof(ts_CompId(remsimBankd, testcasename())); + + f_init(); f_rspro_init(rspro[0], mp_server_ip, mp_server_port, rspro_id, 0); rspro[0].rspro_bank_id := 1; rspro[0].rspro_bank_nslots := 8; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23147 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: I3897efd2a97c3e0d487057aa7bdc2967f3424dd8 Gerrit-Change-Number: 23147 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 18:26:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 18:26:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: convert comments into docstrings In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/23132 to look at the new patch set (#2). Change subject: trx_toolkit/data_msg.py: convert comments into docstrings ...................................................................... trx_toolkit/data_msg.py: convert comments into docstrings Change-Id: I856b54fd1baca4ae0edd2aa59be6a76372cef667 Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 75 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/23132/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I856b54fd1baca4ae0edd2aa59be6a76372cef667 Gerrit-Change-Number: 23132 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 18:26:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 18:26:56 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: decorate abstract methods as such In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/23131 to look at the new patch set (#2). Change subject: trx_toolkit/data_msg.py: decorate abstract methods as such ...................................................................... trx_toolkit/data_msg.py: decorate abstract methods as such Change-Id: I27fdcfdabc2b5318ab3e958d2e5446e670fe9035 Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/data_msg.py 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/23131/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I27fdcfdabc2b5318ab3e958d2e5446e670fe9035 Gerrit-Change-Number: 23131 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Feb 28 18:26:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 28 Feb 2021 18:26:57 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: do not instantiate abstract class DATAMSG References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23148 ) Change subject: trx_toolkit/data_msg.py: do not instantiate abstract class DATAMSG ...................................................................... trx_toolkit/data_msg.py: do not instantiate abstract class DATAMSG Change-Id: I811f67ae030ccd93e1c6a421097cec36ca01cbf9 Related: OS#4006, SYS#4895 --- M src/target/trx_toolkit/test_data_msg.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/23148/1 diff --git a/src/target/trx_toolkit/test_data_msg.py b/src/target/trx_toolkit/test_data_msg.py index 6254203..8735b0c 100644 --- a/src/target/trx_toolkit/test_data_msg.py +++ b/src/target/trx_toolkit/test_data_msg.py @@ -62,23 +62,23 @@ def test_validate(self): # Unknown version with self.assertRaises(ValueError): - msg = DATAMSG(fn = 0, tn = 0, ver = 100) + msg = DATAMSG_TRX2L1(fn = 0, tn = 0, ver = 100) msg.validate() # Uninitialized field with self.assertRaises(ValueError): - msg = DATAMSG() + msg = DATAMSG_TRX2L1() msg.validate() with self.assertRaises(ValueError): - msg = DATAMSG(fn = None, tn = 0) + msg = DATAMSG_TRX2L1(fn = None, tn = 0) msg.validate() # Out-of-range value(s) with self.assertRaises(ValueError): - msg = DATAMSG(fn = -1, tn = 0) + msg = DATAMSG_TRX2L1(fn = -1, tn = 0) msg.validate() with self.assertRaises(ValueError): - msg = DATAMSG(fn = 0, tn = 10) + msg = DATAMSG_TRX2L1(fn = 0, tn = 10) msg.validate() # Validate header and burst randomization -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I811f67ae030ccd93e1c6a421097cec36ca01cbf9 Gerrit-Change-Number: 23148 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: