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

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by laforge

Attention is currently required from: pespin, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34244/comment/bec61ceb_779de522 PS2, Line 2424: 0-65535 > Hmm, I don't really think it's useful and could be mistaken for a "no limit" special value. […] I also think 0 is dangerous and should be disallowed -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 17:01:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... meas_feed: Refactor fd/wqueue lifecycle The previous checks had several rough edges which may end up in unexpected behaviors, specially with fd=0 vs fd=-1. The new code is much more robust. Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f --- M src/osmo-bsc/meas_feed.c 1 file changed, 47 insertions(+), 31 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/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index afd96e1..fbfd553 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -29,7 +29,9 @@ uint16_t dst_port; }; -static struct meas_feed_state g_mfs = {}; +static struct meas_feed_state g_mfs = { + .wqueue.bfd.fd = -1, +}; static int process_meas_rep(struct gsm_meas_rep *mr) { @@ -37,6 +39,8 @@ struct meas_feed_meas *mfm; struct bsc_subscr *bsub; + OSMO_ASSERT(g_mfs.wqueue.bfd.fd != -1); + /* ignore measurements as long as we don't know who it is */ if (!mr->lchan) { LOGP(DMEAS, LOGL_DEBUG, "meas_feed: no lchan, not sending report\n"); @@ -49,7 +53,7 @@ bsub = mr->lchan->conn->bsub; - msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); + msg = msgb_alloc(sizeof(struct meas_feed_meas), "meas_feed_msg"); if (!msg) return 0; @@ -125,48 +129,47 @@ return rc; } +static void meas_feed_close(void) +{ + if (g_mfs.wqueue.bfd.fd == -1) + return; + osmo_signal_unregister_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + osmo_wqueue_clear(&g_mfs.wqueue); + osmo_fd_unregister(&g_mfs.wqueue.bfd); + close(g_mfs.wqueue.bfd.fd); + g_mfs.wqueue.bfd.fd = -1; +} + int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port) { int rc; - int already_initialized = 0; - if (g_mfs.wqueue.bfd.fd) - already_initialized = 1; - - - if (already_initialized && - !strcmp(dst_host, g_mfs.dst_host) && - dst_port == g_mfs.dst_port) - return 0; - - if (!already_initialized) { - osmo_wqueue_init(&g_mfs.wqueue, 10); - g_mfs.wqueue.write_cb = feed_write_cb; - g_mfs.wqueue.read_cb = feed_read_cb; - osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); - LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); + /* Already initialized */ + if (g_mfs.wqueue.bfd.fd > 0) { + /* No change needed, do nothing */ + if (!strcmp(dst_host, g_mfs.dst_host) && dst_port == g_mfs.dst_port) + return 0; + meas_feed_close(); } - if (already_initialized) { - osmo_wqueue_clear(&g_mfs.wqueue); - osmo_fd_unregister(&g_mfs.wqueue.bfd); - close(g_mfs.wqueue.bfd.fd); - /* don't set to zero, as that would mean 'not yet initialized' */ - g_mfs.wqueue.bfd.fd = -1; - } + osmo_wqueue_init(&g_mfs.wqueue, 10); + g_mfs.wqueue.write_cb = feed_write_cb; + g_mfs.wqueue.read_cb = feed_read_cb; + rc = osmo_sock_init_ofd(&g_mfs.wqueue.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, dst_host, dst_port, OSMO_SOCK_F_CONNECT); - if (rc < 0) + if (rc < 0) { + g_mfs.wqueue.bfd.fd = -1; return rc; + } osmo_fd_read_disable(&g_mfs.wqueue.bfd); - - if (g_mfs.dst_host) - talloc_free(g_mfs.dst_host); - g_mfs.dst_host = talloc_strdup(NULL, dst_host); + osmo_talloc_replace_string(NULL, &g_mfs.dst_host, dst_host); g_mfs.dst_port = dst_port; - + osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: started %s\n", + osmo_sock_get_name2(g_mfs.wqueue.bfd.fd)); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 16:59:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by daniel

Attention is currently required from: pespin, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: I changed the patch to update existing binds as well -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 16:10:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by daniel

Attention is currently required from: pespin, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 3: (1 comment) File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/34245/comment/ab4964bf_3cafd217 PS2, Line 1714: "txqueue-max-length <1-4096>", > indentation Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 16:09:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by daniel

Attention is currently required from: pespin, lynxis lazus. Hello Jenkins Builder, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34245 to look at the new patch set (#3). Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... ns2: Add VTY option to change the max write queue size for UDP Ensure that existing binds are updated as well. In some cases the default max length of the osmo_io txqueue could be too small. Set it to 128 by default and add a VTY option to change it for an NSI (program-wide). Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Related: SYS#6550 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c 4 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/34245/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 to look at the new patch set (#5). Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. One new feature of PCU_IF_SAPI_AGCH_2 is that the PCU may ask to send a confirmation when the MAC block is sent. CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c --- M include/osmocom/bsc/pcu_if.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 58 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34060/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 5: (4 comments) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/0f8af513_5a38409b PS4, Line 1013: msgb_put_u32(msg, msg_id); > Just curious, did you check if Ericsson expects this ERIC_MOBILE_ID to actually be the TLLI? Or it's […] I have checked this back, when I get everything right, then it is just an identifier that is loosely connected to a specific MS. To be 100% sure that it is really just a number and not required to be the TLLI i did an experimet with osmo_swab32() in abis.rsl. It still works the same. File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/d4e2763f_b09aaf9b PS4, Line 557: } else { > > else is not generally useful after a break or return […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/61005bb8_5db563e9 PS4, Line 558: if (pcu_rx_rr_paging_pch(bts, pag_grp, pch)) > > code indent should use tabs where possible […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/1cb18da4_508905ad PS4, Line 561: return pcu_tx_pch_confirm(bts, pch->msg_id); > why are you confirming it here? You should be confirming it when scheduling it / sending it to the B […] When pcu_rx_rr_paging_pch() returns, the message is sent out via RSL (in theory, in practice everything should happen in the next mainloop cycle). The BTS however, may have of course a paging queue which may introduce a delay, so it is not as accurate as in osmo-bts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 16:06:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 to look at the new patch set (#5). Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... pcuif_proto: check confirm flag in struct gsm_pcu_if_pch Since osmo-bsc uses RSL (with a propritary Ericsson RBS specific extension) to send a confirmed IMMEDIATE ASSIGNMENT messages via PCH, we can not just forward the MAC blocks into the paging queue without determining whether the MAC block is a PAGING message or an IMMEDIATE ASSIGNMENT message. the reason for this is that RSL uses two different message types (IMMEDIATE ASSIGNMENT COMMAND and PAGING COMMAND) to process IMMEDIATE ASSIGNMENT and PAGING messages. This means we have to look into the MAC block to make sure whether the message is a PAGING message or an IMMEDIATE ASSIGNMENT message. We also need to make sure that the confirm flag is properly executed. In the case of the IMMEDIATE ASSIGNMENT this means we have to include (confirm=true) or not include (confirm=false) the RSL_IE_ERIC_MOBILE_ID into the IMMEDIATE ASSIGNMENT COMMAND message. In the case of PAGING we directly echo a confirmation after sending the PAGING COMMAND via RSL when a confirmation is requested. Related: OS#5927 Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04 Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 50 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/34192/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 4: (1 comment) File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/e68f48d7_27fcee20 PS3, Line 1143: /* During GMM ATTACH REQUEST, the IMSI is not yet known to the PCU or SGSN. (It is requested > very long lines over > 120 characters Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 16:03:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by dexter

Attention is currently required from: osmith. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 to look at the new patch set (#4). Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 When an downlink IMMEDIATE ASSIGNMENT message is sent through the PCH, an IMSI is always required in order to be able to calculate the paging group. However, when the downlink IMMEDIATE ASSIGNMENT has to be sent before the MS has completed the GMM ATTACH REQUEST, the IMSI is still unknown. In this case we may assume that the MS is still in non-DRX mode, which means it listens on all CCCH blocks (PCH and AGCH). This means we may send the IMMEDIATE ASSIGNMENT through the AGCH in this situation. This will also have the advantage that the scheduling through the AGCH will have less latency than the paging queue. Unfortunately the SAPI PCU_IF_SAPI_AGCH only supports sending whole MAC blocks, so it won't be possible to attach a TLLI that can be used for confirmation. To fix this, let's add a new SAPI_PCUI_IF_AGCH_2, that works similar as SAPI PCU_IF_SAPI_PCH_2 and use it to send the IMMEDIATE ASSIGNMENT through the AGCH. CAUTION: This patch breaks compatibility with current master osmo-bts and osmo-bsc (see "Depends") Related: OS#5927 Depends: osmo-bts.git I29858fa20ad8bd0aefe81a5c40ad77a2559a8c10 Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/pcu_l1_if.cpp M src/pcu_l1_if.h 4 files changed, 98 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/34058/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34244/comment/8a54289b_4ee79968 PS2, Line 2424: 0-65535 > as a quick way to disable transmitting further messages while still keeping the socket open, yes :D Hmm, I don't really think it's useful and could be mistaken for a "no limit" special value. Not going to fight this. though. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:49:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo-bsc/meas_feed.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34243/comment/12741dcd_d1574131 PS2, Line 158: LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); > I also took the change to print a more meaningful log line Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:48:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-cbc[master]: Catch and forbid configuring peers before configuring main protocol node

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34246 ) Change subject: Catch and forbid configuring peers before configuring main protocol node ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2 Gerrit-Change-Number: 34246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:47:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by pespin

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Patchset: PS2: Fix the idnentation, +1 File src/gb/gprs_ns2_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/34245/comment/6249c663_9b34980e PS2, Line 1714: "txqueue-max-length <1-4096>", indentation -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:42:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/meas_feed.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34243/comment/c30482a7_70b0de4b PS2, Line 158: LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); > ah yes indeed! I also took the change to print a more meaningful log line -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:41:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by pespin

Attention is currently required from: daniel. Hello Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 to look at the new patch set (#3). Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... meas_feed: Refactor fd/wqueue lifecycle The previous checks had several rough edges which may end up in unexpected behaviors, specially with fd=0 vs fd=-1. The new code is much more robust. Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f --- M src/osmo-bsc/meas_feed.c 1 file changed, 47 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34243/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34244/comment/29f7c0d0_c7757f27 PS2, Line 2424: 0-65535 > Is 0 really useful here? as a quick way to disable transmitting further messages while still keeping the socket open, yes :D -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:33:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/meas_feed.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34243/comment/b1f60b16_fe3396f2 PS2, Line 158: LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); > Move this down to osmo_signal_register_handler() ah yes indeed! -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:32:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-cbc[master]: Catch and forbid configuring peers before configuring main protocol node

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34246 ) Change subject: Catch and forbid configuring peers before configuring main protocol node ...................................................................... Catch and forbid configuring peers before configuring main protocol node When the user enters each "peer" node, the related object is created if not yet existing, and its updated config is applied (connect()) upon exiting the node (cbc_peer_apply_cfg_chg()). When connect happens, it needs to obtain the local IP address from the main protocol node (cbsp|sbcap)", which means it must be configured beforehand, otherwise the peers connect using the default values. Hence, it makes no sense to configure peers if the main protocol information has not yet been configured. The usual example configs as well as the write-config VTY commands provide correct order of things. Catch and forbid the user providing a config file where the peers are configured before the main protocol nodes. Related: OS#6154 Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2 --- M include/osmocom/cbc/cbc_data.h M src/cbc_main.c M src/cbc_vty.c 3 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/46/34246/1 diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index 6d64f04..d5e5cde 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -57,11 +57,13 @@ struct { char *local_host; int local_port; + bool configured; } cbsp; struct { char *local_host[CBC_MAX_LOC_ADDRS]; unsigned int num_local_host; int local_port; + bool configured; } sbcap; struct { char *local_host; diff --git a/src/cbc_main.c b/src/cbc_main.c index e75b328..c777ef6 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -108,12 +108,16 @@ static int cbc_vty_go_parent(struct vty *vty) { switch (vty->node) { + case CBSP_NODE: + g_cbc->config.cbsp.configured = true; + break; case SBcAP_NODE: /* If no local addr set, add a default one: */ if (g_cbc->config.sbcap.num_local_host == 0) { g_cbc->config.sbcap.local_host[0] = talloc_strdup(g_cbc, "127.0.0.1"); g_cbc->config.sbcap.num_local_host = 1; } + g_cbc->config.sbcap.configured = true; vty->node = CONFIG_NODE; vty->index = NULL; break; diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 631ef96..12b7d7b 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -576,6 +576,26 @@ enum cbc_peer_protocol proto; proto = get_string_value(cbc_peer_proto_name_vty, argv[0]); + switch (proto) { + case CBC_PEER_PROTO_CBSP: + if (!g_cbc->config.cbsp.configured) { + vty_out(vty, "%% Node '%s' must be configured before configuring node 'peer'!%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + break; + case CBC_PEER_PROTO_SBcAP: + if (!g_cbc->config.sbcap.configured) { + vty_out(vty, "%% Node '%s' must be configured before configuring node 'peer'!%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + break; + case CBC_PEER_PROTO_SABP: + default: + return CMD_WARNING; + } + peer = cbc_peer_by_name(argv[1]); if (!peer) peer = cbc_peer_create(argv[1], proto); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2 Gerrit-Change-Number: 34246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34244/comment/2cdcba1e_29b90abd PS2, Line 2424: 0-65535 Is 0 really useful here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:22:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bsc/meas_feed.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34243/comment/26a64550_3767a5f1 PS2, Line 158: LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); Move this down to osmo_signal_register_handler() -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 15:18:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: ns2: Add VTY option to change the max write queue size for UDP

by daniel

Attention is currently required from: daniel. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34245 to look at the new patch set (#2). Change subject: ns2: Add VTY option to change the max write queue size for UDP ...................................................................... ns2: Add VTY option to change the max write queue size for UDP In some cases the default max length of the osmo_io txqueue could be too small. Set it to 128 by default and add a VTY option to change it for an NSI (program-wide). Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Related: SYS#6550 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c 4 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/34245/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: ns2: Add VTY option to change the UDP write queue

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the UDP write queue ...................................................................... Patch Set 1: (1 comment) File src/gb/gprs_ns2_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10743): https://gerrit.osmocom.org/c/libosmocore/+/34245/comment/f1a3f890_a5fe6afa PS1, Line 598: if (vty_nsi->txqueue_max_length != NS_DEFAULT_TXQUEUE_MAX_LENGTH) suspect code indent for conditional statements (8, 8) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 29 Aug 2023 15:07:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: ns2: Add VTY option to change the UDP write queue

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34245 ) Change subject: ns2: Add VTY option to change the UDP write queue ...................................................................... ns2: Add VTY option to change the UDP write queue In some cases the default max length of the osmo_io txqueue is too small (32). Set it to 128 by default and add a VTY option to change it for for an NSI (program-wide). Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Related: SYS#6550 --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_udp.c M src/gb/gprs_ns2_vty.c 4 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/34245/1 diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 02d2266..4e496c1 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1451,6 +1451,8 @@ nsi->timeout[NS_TOUT_TSNS_CONFIG_RETRIES] = 3; nsi->timeout[NS_TOUT_TSNS_PROCEDURES_RETRIES] = 3; + nsi->txqueue_max_length = NS_DEFAULT_TXQUEUE_MAX_LENGTH; + return nsi; } diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 37b142e..b4ec077 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -80,6 +80,8 @@ #define NS_ALLOC_SIZE 3072 #define NS_ALLOC_HEADROOM 20 +#define NS_DEFAULT_TXQUEUE_MAX_LENGTH 128 + enum ns2_timeout { NS_TOUT_TNS_BLOCK, NS_TOUT_TNS_BLOCK_RETRIES, @@ -164,6 +166,8 @@ /*! workaround for rate counter until rate counter accepts char str as index */ uint32_t nsvc_rate_ctr_idx; uint32_t bind_rate_ctr_idx; + + uint32_t txqueue_max_length; }; diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index f24eae6..d8a2d87 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -336,6 +336,7 @@ priv->iofd = osmo_iofd_setup(bind, rc, "NS bind", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &ioops, bind); osmo_iofd_register(priv->iofd, rc); osmo_iofd_set_alloc_info(priv->iofd, 4096, 128); + osmo_iofd_set_txqueue_max_length(priv->iofd, nsi->txqueue_max_length); /* IPv4: max fragmented payload can be (13 bit) * 8 byte => 65535. * IPv6: max payload can be 65535 (RFC 2460). diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 3046fff..566423f 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -595,6 +595,9 @@ get_value_string(gprs_ns_timer_strs, i), vty_nsi->timeout[i], VTY_NEWLINE); + if (vty_nsi->txqueue_max_length != NS_DEFAULT_TXQUEUE_MAX_LENGTH) + vty_out(vty, " txqueue max-length %u%s", vty_nsi->txqueue_max_length, VTY_NEWLINE); + ret = config_write_ns_bind(vty); if (ret) return ret; @@ -1707,6 +1710,17 @@ return CMD_WARNING; } +DEFUN(cfg_ns_txqueue_max_length, cfg_ns_txqueue_max_length_cmd, + "txqueue max-length <1-4096>", + "UDP txqueue options\n" + "Set the maximum length of the txqueue\n" + "Maximum length of the txqueue\n") +{ + uint32_t max_length = atoi(argv[0]); + vty_nsi->txqueue_max_length = max_length; + 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" @@ -2292,6 +2306,8 @@ install_lib_element(L_NS_NODE, &cfg_ns_ip_sns_default_bind_cmd); install_lib_element(L_NS_NODE, &cfg_no_ns_ip_sns_default_bind_cmd); + install_lib_element(L_NS_NODE, &cfg_ns_txqueue_max_length_cmd); + install_node(&ns_bind_node, NULL); install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_listen_cmd); install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I993b87fd6b83b3981f5e293f70b931075afec715 Gerrit-Change-Number: 34245 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 4: Code-Review-1 (5 comments) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/cab4eb38_28761dbf PS4, Line 1013: msgb_put_u32(msg, msg_id); Just curious, did you check if Ericsson expects this ERIC_MOBILE_ID to actually be the TLLI? Or it's really just some random ID liek our new msg_id? File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/4dbd088b_52997fbc PS2, Line 559: if (!pch->confirm) > In the current implementation we always include RSL_IE_ERIC_MOBILE_ID when sending the IMMEDIATE ASS […] Cool :) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/621407d6_9b09fbb0 PS4, Line 557: } else { > else is not generally useful after a break or return Please fix. https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/86289ac6_513128a0 PS4, Line 558: if (pcu_rx_rr_paging_pch(bts, pag_grp, pch)) > code indent should use tabs where possible Please fix. https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/aa579f7d_cbf0409b PS4, Line 561: return pcu_tx_pch_confirm(bts, pch->msg_id); why are you confirming it here? You should be confirming it when scheduling it / sending it to the BTS. That may be a while in the future due to the BTS paging queue being full. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:56:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:51:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 to look at the new patch set (#2). Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... meas_feed: Refactor fd/wqueue lifecycle The previous checks had several rough edges which may end up in unexpected behaviors, specially with fd=0 vs fd=-1. The new code is much more robust. Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f --- M src/osmo-bsc/meas_feed.c 1 file changed, 46 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34243/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by Jenkins Builder

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 4: (2 comments) File src/osmo-bsc/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10740): https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/468f03f6_169eeea6 PS4, Line 557: } else { else is not generally useful after a break or return Robot Comment from checkpatch (run ID jenkins-gerrit-lint-10740): https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/754d1c9b_f1d5107a PS4, Line 558: if (pcu_rx_rr_paging_pch(bts, pag_grp, pch)) code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:46:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 4: (2 comments) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/129ec082_9e79a90b PS2, Line 559: if (!pch->confirm) > I'm not really following. […] In the current implementation we always include RSL_IE_ERIC_MOBILE_ID when sending the IMMEDIATE ASSIGNMENT COMMAND. I have checked some of my notes again and as far as I understand this is indeed an optional field. So if we want a confirmation from the BTS we include this field. If we don't want a confirmation, we just leave it away. I quickly changed the implementation of abis_rsl:rsl_ericsson_imm_assign_cmd() so that we can select if we want a confirmation or not. This also means that we now have the same behavior as we have in osmo-bts. https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/fc9dbcc5_ba227a61 PS2, Line 566: if (pch->confirm) > Just send the confirmation when you transmit the related block over RSL. […] Ok, I added this. So in that regard the behavior is now (almost) exactly like the one of osmo-bts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:45:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 to look at the new patch set (#4). Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... pcuif_proto: check confirm flag in struct gsm_pcu_if_pch Since osmo-bsc uses RSL (with a propritary Ericsson RBS specific extension) to send a confirmed IMMEDIATE ASSIGNMENT messages via PCH, we can not just forward the MAC blocks into the paging queue without determining whether the MAC block is a PAGING message or an IMMEDIATE ASSIGNMENT message. the reason for this is that RSL uses two different message types (IMMEDIATE ASSIGNMENT COMMAND and PAGING COMMAND) to process IMMEDIATE ASSIGNMENT and PAGING messages. This means we have to look into the MAC block to make sure whether the message is a PAGING message or an IMMEDIATE ASSIGNMENT message. We also need to make sure that the confirm flag is properly executed. In the case of the IMMEDIATE ASSIGNMENT this means we have to include (confirm=true) or not include (confirm=false) the RSL_IE_ERIC_MOBILE_ID into the IMMEDIATE ASSIGNMENT COMMAND message. In the case of PAGING we directly echo a confirmation after sending the PAGING COMMAND via RSL when a confirmation is requested. Related: OS#5927 Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04 Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 51 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/34192/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 to look at the new patch set (#4). Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. One new feature of PCU_IF_SAPI_AGCH_2 is that the PCU may ask to send a confirmation when the MAC block is sent. CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c --- M include/osmocom/bsc/pcu_if.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 57 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34060/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... meas_feed: Refactor fd/wqueue lifecycle The previous checks had several rough edges which may end up in unexpected behaviors, specially with fd=0 vs fd=-1. The new code is much more robust. Furthermore, we are not longer enqueueing measurements in the queue if it has not yet been enabled/initialized. Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f --- M src/osmo-bsc/meas_feed.c 1 file changed, 51 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34243/1 diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index afd96e1..41df4ea 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -29,7 +29,9 @@ uint16_t dst_port; }; -static struct meas_feed_state g_mfs = {}; +static struct meas_feed_state g_mfs = { + .wqueue.bfd.fd = -1, +}; static int process_meas_rep(struct gsm_meas_rep *mr) { @@ -37,6 +39,10 @@ struct meas_feed_meas *mfm; struct bsc_subscr *bsub; + /* meas-feed not enabled/initialized, do nothing */ + if (g_mfs.wqueue.bfd.fd == -1) + return 0; + /* ignore measurements as long as we don't know who it is */ if (!mr->lchan) { LOGP(DMEAS, LOGL_DEBUG, "meas_feed: no lchan, not sending report\n"); @@ -49,7 +55,7 @@ bsub = mr->lchan->conn->bsub; - msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); + msg = msgb_alloc(sizeof(struct meas_feed_meas), "meas_feed_msg"); if (!msg) return 0; @@ -125,46 +131,45 @@ return rc; } +static void meas_feed_close(void) +{ + if (g_mfs.wqueue.bfd.fd == -1) + return; + osmo_wqueue_clear(&g_mfs.wqueue); + osmo_fd_unregister(&g_mfs.wqueue.bfd); + close(g_mfs.wqueue.bfd.fd); + g_mfs.wqueue.bfd.fd = -1; +} + int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port) { int rc; - int already_initialized = 0; - if (g_mfs.wqueue.bfd.fd) - already_initialized = 1; - - - if (already_initialized && - !strcmp(dst_host, g_mfs.dst_host) && - dst_port == g_mfs.dst_port) - return 0; - - if (!already_initialized) { - osmo_wqueue_init(&g_mfs.wqueue, 10); - g_mfs.wqueue.write_cb = feed_write_cb; - g_mfs.wqueue.read_cb = feed_read_cb; - osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); - LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); + /* Already initialized */ + if (g_mfs.wqueue.bfd.fd > 0) { + /* No change needed, do nothing */ + if (!strcmp(dst_host, g_mfs.dst_host) && dst_port == g_mfs.dst_port) + return 0; + osmo_signal_unregister_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + meas_feed_close(); } - if (already_initialized) { - osmo_wqueue_clear(&g_mfs.wqueue); - osmo_fd_unregister(&g_mfs.wqueue.bfd); - close(g_mfs.wqueue.bfd.fd); - /* don't set to zero, as that would mean 'not yet initialized' */ - g_mfs.wqueue.bfd.fd = -1; - } + osmo_wqueue_init(&g_mfs.wqueue, 10); + g_mfs.wqueue.write_cb = feed_write_cb; + g_mfs.wqueue.read_cb = feed_read_cb; + osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); + rc = osmo_sock_init_ofd(&g_mfs.wqueue.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, dst_host, dst_port, OSMO_SOCK_F_CONNECT); - if (rc < 0) + if (rc < 0) { + g_mfs.wqueue.bfd.fd = -1; return rc; + } osmo_fd_read_disable(&g_mfs.wqueue.bfd); - - if (g_mfs.dst_host) - talloc_free(g_mfs.dst_host); - g_mfs.dst_host = talloc_strdup(NULL, dst_host); + osmo_talloc_replace_string(NULL, &g_mfs.dst_host, dst_host); g_mfs.dst_port = dst_port; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... meas_feed: Increase wqueue max_len to 100 and make it vty-configurable The previous amount of 10 messages may be small if the BSC is processing lots of measurements from lots of BTS connected to it. Increase it to 100 by default, and allow changing the write_queue length through the VTY. Related: SYS#6550 Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 --- M include/osmocom/bsc/meas_feed.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/meas_feed.c 3 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/34244/1 diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h index 353278e..f2bd4ba 100644 --- a/include/osmocom/bsc/meas_feed.h +++ b/include/osmocom/bsc/meas_feed.h @@ -35,9 +35,12 @@ }; #define MEAS_FEED_VERSION 1 +#define MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT 100 int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port); void meas_feed_scenario_set(const char *name); +void meas_feed_wqueue_max_length_set(unsigned int max_length); void meas_feed_cfg_get(char **host, uint16_t *port); const char *meas_feed_scenario_get(void); +unsigned int meas_feed_wqueue_max_length_get(void); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 7918d81..5c8debc 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -385,6 +385,7 @@ uint16_t meas_port; char *meas_host; const char *meas_scenario; + unsigned int max_len = meas_feed_wqueue_max_length_get(); meas_feed_cfg_get(&meas_host, &meas_port); meas_scenario = meas_feed_scenario_get(); @@ -395,6 +396,9 @@ if (strlen(meas_scenario) > 0) vty_out(vty, " meas-feed scenario %s%s", meas_scenario, VTY_NEWLINE); + if (max_len != MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT) + vty_out(vty, " meas-feed write-queue-max-length %u%s", + max_len, VTY_NEWLINE); } if (gsmnet->allow_unusable_timeslots) @@ -2416,6 +2420,16 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_net_meas_feed_wqueue_max_len, cfg_net_meas_feed_wqueue_max_len_cmd, + "meas-feed write-queue-max-length <0-65535>", + MEAS_FEED_STR "Set the maximum length of the message write queue towards the UDP socket\n" + "Maximum number of messages to be queued waiting for transmission\n", + CMD_ATTR_IMMEDIATE) +{ + meas_feed_wqueue_max_length_set(atoi(argv[0])); + return CMD_SUCCESS; +} + static void legacy_timers(struct vty *vty, const char **T_arg) { if (!strcmp((*T_arg), "T993111") || !strcmp((*T_arg), "t993111")) { @@ -3580,6 +3594,7 @@ install_element(GSMNET_NODE, &cfg_net_dyn_ts_allow_tch_f_cmd); install_element(GSMNET_NODE, &cfg_net_meas_feed_dest_cmd); install_element(GSMNET_NODE, &cfg_net_meas_feed_scenario_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_wqueue_max_len_cmd); install_element(GSMNET_NODE, &cfg_net_timer_cmd); install_element(GSMNET_NODE, &cfg_net_allow_unusable_timeslots_cmd); install_element(GSMNET_NODE, &cfg_net_pcu_sock_cmd); diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index 41df4ea..4bf5a41 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -24,6 +24,7 @@ struct meas_feed_state { struct osmo_wqueue wqueue; + unsigned int wqueue_max_len; char scenario[31+1]; char *dst_host; uint16_t dst_port; @@ -31,6 +32,7 @@ static struct meas_feed_state g_mfs = { .wqueue.bfd.fd = -1, + .wqueue_max_len = MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT, }; static int process_meas_rep(struct gsm_meas_rep *mr) @@ -154,7 +156,7 @@ meas_feed_close(); } - osmo_wqueue_init(&g_mfs.wqueue, 10); + osmo_wqueue_init(&g_mfs.wqueue, g_mfs.wqueue_max_len); g_mfs.wqueue.write_cb = feed_write_cb; g_mfs.wqueue.read_cb = feed_read_cb; osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); @@ -181,6 +183,18 @@ *host = g_mfs.dst_host; } +void meas_feed_wqueue_max_length_set(unsigned int max_length) +{ + g_mfs.wqueue_max_len = max_length; + if (g_mfs.wqueue.bfd.fd) + g_mfs.wqueue.max_length = max_length; +} + +unsigned int meas_feed_wqueue_max_length_get(void) +{ + return g_mfs.wqueue_max_len; +} + void meas_feed_scenario_set(const char *name) { osmo_strlcpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/7e235ade_d30b1afe PS3, Line 1143: /* During GMM ATTACH REQUEST, the IMSI is not yet known to the PCU or SGSN. (It is requested very long lines over > 120 characters -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:28:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: contrib/libosmocore.spec: centos7: disable uring

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34241 ) Change subject: contrib/libosmocore.spec: centos7: disable uring ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2399754952d460499c9355706be37f792988bac Gerrit-Change-Number: 34241 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: write_queue: Introduce API osmo_wqueue_set_max_length()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34242 ) Change subject: write_queue: Introduce API osmo_wqueue_set_max_length() ...................................................................... write_queue: Introduce API osmo_wqueue_set_max_length() Change-Id: Ia1b138ed622f5efaa761bd9fa062b25b598f356f --- M TODO-RELEASE M include/osmocom/core/write_queue.h M src/core/libosmocore.map M src/core/write_queue.c 4 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/34242/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index f78104e..70664ff 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,4 +17,5 @@ libosmogsm MODIFY osmo_auth_impl callback function signature change. No known external users libosmogsm ADD osmo_auth_c2 libosmogsm ADD OSMO_AUTH_ALG_TUAK -libosmogsm ADD new API msgb_tv32_push() \ No newline at end of file +libosmogsm ADD new API msgb_tv32_push() +libosmocore ADD osmo_wqueue_set_max_length() \ No newline at end of file diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 6cb0a6b..d66a3c9 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -48,6 +48,7 @@ void osmo_wqueue_init(struct osmo_wqueue *queue, int max_length); void osmo_wqueue_clear(struct osmo_wqueue *queue); +void osmo_wqueue_set_max_length(struct osmo_wqueue *queue, unsigned int max_length); int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 99be86c..9630ded 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -565,6 +565,7 @@ osmo_wqueue_enqueue; osmo_wqueue_enqueue_quiet; osmo_wqueue_init; +osmo_wqueue_set_max_length; rate_ctr_add; rate_ctr_difference; rate_ctr_for_each_counter; diff --git a/src/core/write_queue.c b/src/core/write_queue.c index 884cebd..f8df124 100644 --- a/src/core/write_queue.c +++ b/src/core/write_queue.c @@ -99,6 +99,15 @@ INIT_LLIST_HEAD(&queue->msg_queue); } +/*! Set maximum length of write queue + * \param[in] queue Write queue to operate on + * \param[in] max_length Maximum length of write queue + */ +void osmo_wqueue_set_max_length(struct osmo_wqueue *queue, unsigned int max_length) +{ + queue->max_length = max_length; +} + /*! Enqueue a new \ref msgb into a write queue (without logging full queue events) * \param[in] queue Write queue to be used * \param[in] data to-be-enqueued message buffer -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia1b138ed622f5efaa761bd9fa062b25b598f356f Gerrit-Change-Number: 34242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: contrib/libosmocore.spec: centos7: disable uring

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34241 ) Change subject: contrib/libosmocore.spec: centos7: disable uring ...................................................................... contrib/libosmocore.spec: centos7: disable uring liburing is not available in CentOS 7, so disable it there. I've verified that this works as expected in our OBS with CentOS 7, 8 and openSUSE Tumbleweed. Related: OS#5751 Change-Id: Ie2399754952d460499c9355706be37f792988bac --- M contrib/libosmocore.spec.in 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/34241/1 diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 3fde143..ebd1938 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -32,7 +32,9 @@ BuildRequires: pkgconfig(talloc) >= 2.1.0 BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libsystemd) +%if 0%{?centos_ver} != 7 BuildRequires: pkgconfig(liburing) +%endif %description libosmocore is a package with various utility functions that were @@ -339,8 +341,18 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static --enable-systemd-logging \ + +CONFIGURE_FLAGS=" + --enable-shared \ + --disable-static \ + --enable-systemd-logging \ --includedir="%_includedir/%name" +" +%if 0%{?centos_ver} == 7 + CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring" +%endif + +%configure $CONFIGURE_FLAGS make %{?_smp_mflags} V=1 %install -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2399754952d460499c9355706be37f792988bac Gerrit-Change-Number: 34241 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add simtrace

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34237 ) Change subject: jobs/master-builds: add simtrace ...................................................................... jobs/master-builds: add simtrace Replace the legacy SIMtrace job (not done with jenkins-job-builder) with a new master-simtrace job that works just like the other master jobs: - build in docker - have build commands in contrib/jenkins.sh Set the same notification mails as for simtrace2. Depends: https://gitea.osmocom.org/sim-card/simtrace/pulls/1 Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb --- M jobs/master-builds.yml 1 file changed, 22 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/jobs/master-builds.yml b/jobs/master-builds.yml index 6a2926c..2e54b63 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -173,7 +173,7 @@ # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb - # master-osmocom-bb, SIMtrace, master-xgoldmon + # master-osmocom-bb, master-simtrace, master-xgoldmon # Optimized: # libosmocore # -> master-libosmo-abis @@ -211,7 +211,7 @@ master-osmo-tetra, master-osmo-trx, master-osmocom-bb, - SIMtrace, + master-simtrace, master-xgoldmon - libsmpp34: @@ -447,6 +447,9 @@ ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org + - simtrace: + git_base_url: https://gitea.osmocom.org/sim-card + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - simtrace2: cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb Gerrit-Change-Number: 34237 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/master-builds: add xgoldmon

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34236 ) Change subject: jobs/master-builds: add xgoldmon ...................................................................... jobs/master-builds: add xgoldmon Replace the legacy xgoldmon job (not done with jenkins-job-builder) with a new master-xgoldmon job that works more similar to other master jobs: - build in docker - have build commands in a jenkins.sh script Put the jenkins.sh script into osmo-ci, as the upstream repository is outside of Osmocom infrastructure. The motivation for this change is, that the current xgoldmon job is failing since libosmocore depends on liburing by default. This uncovered that the job is still running outside of docker, where the dependency has already been added. The following patches will modernize other jobs which have the same problem. Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6 --- M jobs/master-builds.yml A scripts/xgoldmon-jenkins.sh 2 files changed, 54 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/jobs/master-builds.yml b/jobs/master-builds.yml index 6837d78..6a2926c 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -173,7 +173,7 @@ # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb - # master-osmocom-bb, SIMtrace, xgoldmon + # master-osmocom-bb, SIMtrace, master-xgoldmon # Optimized: # libosmocore # -> master-libosmo-abis @@ -212,7 +212,7 @@ master-osmo-trx, master-osmocom-bb, SIMtrace, - xgoldmon + master-xgoldmon - libsmpp34: trigger: master-osmo-msc, master-openbsc @@ -519,6 +519,12 @@ - dahdi-tools + - xgoldmon: + git_base_url: https://github.com/2b-as + cmd: | + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master + {docker_run_ccache} {docker_img} {timeout_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh + jobs: - 'master-{repos}' diff --git a/scripts/xgoldmon-jenkins.sh b/scripts/xgoldmon-jenkins.sh new file mode 100755 index 0000000..0635db4 --- /dev/null +++ b/scripts/xgoldmon-jenkins.sh @@ -0,0 +1,23 @@ +#!/bin/sh -ex +# Used by jobs/master-builds.yml for xgoldmon +TOPDIR=/build + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: missing scripts from osmo-ci.git in PATH!" + exit 2 +fi + +set -x + +osmo-clean-workspace.sh + +export deps="$TOPDIR/deps" +export inst="$deps/install" +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +mkdir -p deps +osmo-build-dep.sh libosmocore "" '--disable-doxygen' + +cd "$TOPDIR" +$MAKE -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6 Gerrit-Change-Number: 34236 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: print SAPI and msg_id when sending confirmation

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34240 ) Change subject: pcu_sock: print SAPI and msg_id when sending confirmation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602 Gerrit-Change-Number: 34240 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:44:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic, put a dot between "v" and version number

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34239 ) Change subject: osmobts_sock: cosmetic, put a dot between "v" and version number ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: why putting a dot there? To me v11 is totally fine :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f Gerrit-Change-Number: 34239 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:43:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-hlr[master]: Add VTY support for TUAK algorithm

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/33099 ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Add VTY support for TUAK algorithm ...................................................................... Add VTY support for TUAK algorithm Change-Id: If2611658f7cb990b484d7429ab2f944f56fd2eb6 Depends: libosmocore.git Ib905b8d8bdf248e8299bf50666ee1bca8298433d --- M TODO-RELEASE M src/hlr_vty_subscr.c M tests/test_subscriber.vty 3 files changed, 29 insertions(+), 9 deletions(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 4c445eb..042d1a7 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,4 @@ # 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 UPDATE_DEP_VER update libosmogsm version dependency after Ie775fedba4a3fa12314c0f7c8a369662ef6a40df is released +libosmogsm UPDATE_DEP_VER update libosmogsm version dependency after Ib905b8d8bdf248e8299bf50666ee1bca8298433d is released diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 28cc5b3..59a27c1 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -468,9 +468,10 @@ "Use COMP128v3 algorithm\n" \ "Use XOR-2G algorithm\n" -#define AUTH_ALG_TYPES_3G "milenage" +#define AUTH_ALG_TYPES_3G "(milenage|tuak)" #define AUTH_ALG_TYPES_3G_HELP \ - "Use Milenage algorithm\n" + "Use Milenage algorithm\n" \ + "Use TUAK algorithm\n" bool auth_algo_parse(const char *alg_str, enum osmo_auth_algo *algo, int *minlen, int *maxlen, int *minlen_opc, int *maxlen_opc) @@ -507,6 +508,14 @@ *minlen_opc = MILENAGE_KEY_LEN; if (maxlen_opc) *maxlen_opc = MILENAGE_KEY_LEN; + } else if (!strcasecmp(alg_str, "tuak")) { + *algo = OSMO_AUTH_ALG_TUAK; + *minlen = 16; + *maxlen = 32; + if (minlen_opc) + *minlen_opc = 32; + if (maxlen_opc) + *maxlen_opc = 32; } else return false; return true; @@ -631,11 +640,11 @@ int rc; const char *id_type = argv[0]; const char *id = argv[1]; - const char *alg_type = AUTH_ALG_TYPES_3G; - const char *k = argv[2]; - bool opc_is_op = (strcasecmp("op", argv[3]) == 0); - const char *op_opc = argv[4]; - int ind_bitlen = argc > 6? atoi(argv[6]) : 5; + const char *alg_type = argv[2]; + const char *k = argv[3]; + bool opc_is_op = (strcasecmp("op", argv[4]) == 0); + const char *op_opc = argv[5]; + int ind_bitlen = argc > 7 ? atoi(argv[7]) : 5; struct sub_auth_data_str aud3g = { .type = OSMO_AUTH_TYPE_UMTS, .u.umts = { diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index 9036fb8..5f223dc 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -10,7 +10,7 @@ subscriber (imsi|msisdn|id|imei) IDENT update aud2g none subscriber (imsi|msisdn|id|imei) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor-2g) ki KI subscriber (imsi|msisdn|id|imei) IDENT update aud3g none - subscriber (imsi|msisdn|id|imei) IDENT update aud3g milenage k K (op|opc) OP_C [ind-bitlen] [<0-28>] + subscriber (imsi|msisdn|id|imei) IDENT update aud3g (milenage|tuak) k K (op|opc) OP_C [ind-bitlen] [<0-28>] subscriber (imsi|msisdn|id|imei) IDENT update aud3g xor-3g k K [ind-bitlen] [<0-28>] subscriber (imsi|msisdn|id|imei) IDENT update imei (none|IMEI) subscriber (imsi|msisdn|id|imei) IDENT update network-access-mode (none|cs|ps|cs+ps) @@ -269,6 +269,7 @@ OsmoHLR# subscriber imsi 123456789023000 update aud3g ? none Delete 3G authentication data milenage Use Milenage algorithm + tuak Use TUAK algorithm xor-3g Use XOR-3G algorithm OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/33099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: If2611658f7cb990b484d7429ab2f944f56fd2eb6 Gerrit-Change-Number: 33099 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-hlr[master]: db: extend database schema to support 256bit K and/or OP[c] values

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/33098 ) Change subject: db: extend database schema to support 256bit K and/or OP[c] values ...................................................................... db: extend database schema to support 256bit K and/or OP[c] values Other UMTS AKA algorithms than MILENAGE (notably TUAK) support K sizes of up to 256bit, or mandate a OP/OPc size of 256 bit. Let's extend our database schema to accommodate such larger sizes. Change-Id: Ibbde68484c904507a15c35cbfdf88cd47d0c7039 --- M sql/hlr.sql M src/ctrl.c M src/db.c M src/db_hlr.c M src/hlr_vty_subscr.c M tests/db_upgrade/db_upgrade_test.ok M tests/test_subscriber.vty 7 files changed, 96 insertions(+), 31 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/sql/hlr.sql b/sql/hlr.sql index e855a6c..4c87f43 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -71,9 +71,9 @@ CREATE TABLE auc_3g ( subscriber_id INTEGER PRIMARY KEY, -- subscriber.id algo_id_3g INTEGER NOT NULL, -- enum osmo_auth_algo value - k VARCHAR(32) NOT NULL, -- hex string: subscriber's secret key (128bit) - op VARCHAR(32), -- hex string: operator's secret key (128bit) - opc VARCHAR(32), -- hex string: derived from OP and K (128bit) + k VARCHAR(64) NOT NULL, -- hex string: subscriber's secret key (128/256bit) + op VARCHAR(64), -- hex string: operator's secret key (128/256bit) + opc VARCHAR(64), -- hex string: derived from OP and K (128/256bit) sqn INTEGER NOT NULL DEFAULT 0, -- sequence number of key usage -- nr of index bits at lower SQN end ind_bitlen INTEGER NOT NULL DEFAULT 5 @@ -91,4 +91,4 @@ -- Set HLR database schema version number -- Note: This constant is currently duplicated in src/db.c and must be kept in sync! -PRAGMA user_version = 6; +PRAGMA user_version = 7; diff --git a/src/ctrl.c b/src/ctrl.c index f0f2ee6..e04195d 100644 --- a/src/ctrl.c +++ b/src/ctrl.c @@ -39,7 +39,7 @@ #define SEL_BY_ID SEL_BY "id-" extern bool auth_algo_parse(const char *alg_str, enum osmo_auth_algo *algo, - int *minlen, int *maxlen); + int *minlen, int *maxlen, int *minlen_opc, int *maxlen_opc); #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf)) @@ -550,7 +550,7 @@ } if (strcmp(tok, "none") == 0) { aud2g.algo = OSMO_AUTH_ALG_NONE; - } else if (!auth_algo_parse(tok, &aud2g.algo, &minlen, &maxlen)) { + } else if (!auth_algo_parse(tok, &aud2g.algo, &minlen, &maxlen, NULL, NULL)) { cmd->reply = "Unknown auth algorithm."; return CTRL_CMD_ERROR; } @@ -630,8 +630,8 @@ struct hlr *hlr = data; const char *by_selector = cmd->node; char *tmp = NULL, *tok, *saveptr; - int minlen = 0; - int maxlen = 0; + int minlen = 0, minlen_opc = 0; + int maxlen = 0, maxlen_opc = 0; struct sub_auth_data_str aud3g = { .type = OSMO_AUTH_TYPE_UMTS, .u.umts = { @@ -657,7 +657,7 @@ } if (strcmp(tok, "none") == 0) { aud3g.algo = OSMO_AUTH_ALG_NONE; - } else if (!auth_algo_parse(tok, &aud3g.algo, &minlen, &maxlen)) { + } else if (!auth_algo_parse(tok, &aud3g.algo, &minlen, &maxlen, &minlen_opc, &maxlen_opc)) { cmd->reply = "Unknown auth algorithm."; return CTRL_CMD_ERROR; } @@ -699,7 +699,7 @@ } aud3g.u.umts.opc = tok; - if (!osmo_is_hexstr(aud3g.u.umts.opc, MILENAGE_KEY_LEN * 2, MILENAGE_KEY_LEN * 2, true)) { + if (!osmo_is_hexstr(aud3g.u.umts.opc, minlen_opc * 2, maxlen_opc * 2, true)) { cmd->reply = talloc_asprintf(cmd, "Invalid OP/OPC."); return CTRL_CMD_ERROR; } diff --git a/src/db.c b/src/db.c index cfe34c3..7b8a415 100644 --- a/src/db.c +++ b/src/db.c @@ -1,4 +1,4 @@ -/* (C) 2015 by Harald Welte <laforge(a)gnumonks.org> +/* (C) 2015-2023 by Harald Welte <laforge(a)gnumonks.org> * * All Rights Reserved * @@ -28,7 +28,7 @@ #include "db_bootstrap.h" /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */ -#define CURRENT_SCHEMA_VERSION 6 +#define CURRENT_SCHEMA_VERSION 7 #define SEL_COLUMNS \ "id," \ @@ -513,6 +513,46 @@ return rc; } +static int db_upgrade_v7(struct db_context *dbc) +{ + int rc; + /* SQLite doesn't allow us to change the column type in-place, so we + * first rename the old table, create a new table and then copy + * the data over before deleting the old table */ +#define CREATE_AUC_3G_V7 \ +"CREATE TABLE auc_3g (\n" \ +" subscriber_id INTEGER PRIMARY KEY, -- subscriber.id\n" \ +" algo_id_3g INTEGER NOT NULL, -- enum osmo_auth_algo value\n" \ +" k VARCHAR(64) NOT NULL, -- hex string: subscriber's secret key (128/256bit)\n" \ +" op VARCHAR(64), -- hex string: operator's secret key (128/256bit)\n" \ +" opc VARCHAR(64), -- hex string: derived from OP and K (128/256bit)\n" \ +" sqn INTEGER NOT NULL DEFAULT 0, -- sequence number of key usage\n" \ +" -- nr of index bits at lower SQN end\n" \ +" ind_bitlen INTEGER NOT NULL DEFAULT 5\n" \ +");" + const char * const statements[] = { + "BEGIN TRANSACTION", + /* rename old table */ + "ALTER TABLE auc_3g RENAME TO old_auc_3g", + /* create new table */ + CREATE_AUC_3G_V7, + /* copy over old data */ + "INSERT INTO auc_3g SELECT subscriber_id, algo_id_3g, k, op, opc,sqn, ind_bitlen FROM old_auc_3g", + /* delete old table */ + "DROP TABLE old_auc_3g", + /* update user_version */ + "PRAGMA user_version = 7", + "COMMIT", + }; + + rc = db_run_statements(dbc, statements, ARRAY_SIZE(statements)); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version 7\n"); + return rc; + } + return rc; +} + typedef int (*db_upgrade_func_t)(struct db_context *dbc); static db_upgrade_func_t db_upgrade_path[] = { db_upgrade_v1, @@ -521,6 +561,7 @@ db_upgrade_v4, db_upgrade_v5, db_upgrade_v6, + db_upgrade_v7, }; static int db_get_user_version(struct db_context *dbc) diff --git a/src/db_hlr.c b/src/db_hlr.c index 8dfbb15..aa2e365 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -1,4 +1,4 @@ -/* (C) 2015 by Harald Welte <laforge(a)gnumonks.org> +/* (C) 2015-2023 by Harald Welte <laforge(a)gnumonks.org> * * All Rights Reserved * @@ -286,12 +286,12 @@ if (aud->algo == OSMO_AUTH_ALG_NONE) break; - if (!osmo_is_hexstr(aud->u.umts.k, 32, 32, true)) { + if (!osmo_is_hexstr(aud->u.umts.k, 32, 64, true)) { LOGP(DAUC, LOGL_ERROR, "Cannot update auth tokens:" " Invalid K: '%s'\n", aud->u.umts.k); return -EINVAL; } - if (!osmo_is_hexstr(aud->u.umts.opc, 32, 32, true)) { + if (!osmo_is_hexstr(aud->u.umts.opc, 32, 64, true)) { LOGP(DAUC, LOGL_ERROR, "Cannot update auth tokens:" " Invalid OP/OPC: '%s'\n", aud->u.umts.opc); return -EINVAL; diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 191a87d..28cc5b3 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -473,8 +473,14 @@ "Use Milenage algorithm\n" bool auth_algo_parse(const char *alg_str, enum osmo_auth_algo *algo, - int *minlen, int *maxlen) + int *minlen, int *maxlen, int *minlen_opc, int *maxlen_opc) { + /* Default: no OP[c]. True for all 2G algorithms, and 3G-XOR. Overridden below for real 3G AKA algorithms. */ + if (minlen_opc) + *minlen_opc = 0; + if (maxlen_opc) + *maxlen_opc = 0; + if (!strcasecmp(alg_str, "none")) { *algo = OSMO_AUTH_ALG_NONE; *minlen = *maxlen = 0; @@ -497,6 +503,10 @@ } else if (!strcasecmp(alg_str, "milenage")) { *algo = OSMO_AUTH_ALG_MILENAGE; *minlen = *maxlen = MILENAGE_KEY_LEN; + if (minlen_opc) + *minlen_opc = MILENAGE_KEY_LEN; + if (maxlen_opc) + *maxlen_opc = MILENAGE_KEY_LEN; } else return false; return true; @@ -552,7 +562,7 @@ .u.gsm.ki = ki, }; - if (!auth_algo_parse(alg_type, &aud2g.algo, &minlen, &maxlen)) { + if (!auth_algo_parse(alg_type, &aud2g.algo, &minlen, &maxlen, NULL, NULL)) { vty_out(vty, "%% Unknown auth algorithm: '%s'%s", alg_type, VTY_NEWLINE); return CMD_WARNING; } @@ -611,13 +621,13 @@ SUBSCR_UPDATE_HELP "Set UMTS authentication data (3G, and 2G with UMTS AKA)\n" AUTH_ALG_TYPES_3G_HELP - "Set Encryption Key K\n" "K as 32 hexadecimal characters\n" - "Set OP key\n" "Set OPC key\n" "OP or OPC as 32 hexadecimal characters\n" + "Set Encryption Key K\n" "K as 32/64 hexadecimal characters\n" + "Set OP key\n" "Set OPC key\n" "OP or OPC as 32/64 hexadecimal characters\n" "Set IND bit length\n" "IND bit length value (default: 5)\n") { struct hlr_subscriber subscr; - int minlen = 0; - int maxlen = 0; + int minlen = 0, minlen_opc = 0; + int maxlen = 0, maxlen_opc = 0; int rc; const char *id_type = argv[0]; const char *id = argv[1]; @@ -636,7 +646,7 @@ }, }; - if (!auth_algo_parse(alg_type, &aud3g.algo, &minlen, &maxlen)) { + if (!auth_algo_parse(alg_type, &aud3g.algo, &minlen, &maxlen, &minlen_opc, &maxlen_opc)) { vty_out(vty, "%% Unknown auth algorithm: '%s'%s", alg_type, VTY_NEWLINE); return CMD_WARNING; } @@ -644,8 +654,7 @@ if (!is_hexkey_valid(vty, "K", aud3g.u.umts.k, minlen, maxlen)) return CMD_WARNING; - if (!is_hexkey_valid(vty, opc_is_op ? "OP" : "OPC", aud3g.u.umts.opc, - MILENAGE_KEY_LEN, MILENAGE_KEY_LEN)) + if (!is_hexkey_valid(vty, opc_is_op ? "OP" : "OPC", aud3g.u.umts.opc, minlen_opc, maxlen_opc)) return CMD_WARNING; if (get_subscr_by_argv(vty, id_type, id, &subscr)) @@ -689,7 +698,7 @@ }, }; - if (!auth_algo_parse("xor-3g", &aud3g.algo, &minlen, &maxlen)) { + if (!auth_algo_parse("xor-3g", &aud3g.algo, &minlen, &maxlen, NULL, NULL)) { vty_out(vty, "%% Unknown auth algorithm: '%s'%s", "xor-3g", VTY_NEWLINE); return CMD_WARNING; } diff --git a/tests/db_upgrade/db_upgrade_test.ok b/tests/db_upgrade/db_upgrade_test.ok index ce5b17c..c719498 100644 --- a/tests/db_upgrade/db_upgrade_test.ok +++ b/tests/db_upgrade/db_upgrade_test.ok @@ -86,6 +86,7 @@ DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 4 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 5 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 6 +DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 7 DMAIN Cmdline option --db-check: Database was opened successfully, quitting. Resulting db: @@ -106,9 +107,9 @@ name|type|notnull|dflt_value|pk algo_id_3g|INTEGER|1||0 ind_bitlen|INTEGER|1|5|0 -k|VARCHAR(32)|1||0 -op|VARCHAR(32)|0||0 -opc|VARCHAR(32)|0||0 +k|VARCHAR(64)|1||0 +op|VARCHAR(64)|0||0 +opc|VARCHAR(64)|0||0 sqn|INTEGER|1|0|0 subscriber_id|INTEGER|0||1 @@ -179,5 +180,5 @@ rc = 0 DMAIN hlr starting DDB using database: <PATH>test.db -DDB Database <PATH>test.db' has HLR DB schema version 6 +DDB Database <PATH>test.db' has HLR DB schema version 7 DMAIN Cmdline option --db-check: Database was opened successfully, quitting. diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index dbe9327..9036fb8 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -275,14 +275,14 @@ k Set Encryption Key K OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k ? - K K as 32 hexadecimal characters + K K as 32/64 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d ? op Set OP key opc Set OPC key OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc ? - OP_C OP or OPC as 32 hexadecimal characters + OP_C OP or OPC as 32/64 hexadecimal characters OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage k Deaf0ff1ceD0d0DabbedD1ced1ceF00d opc CededEffacedAceFacedBadFadedBeef ? [ind-bitlen] Set IND bit length -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/33098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibbde68484c904507a15c35cbfdf88cd47d0c7039 Gerrit-Change-Number: 33098 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-hlr[master]: db: extend database schema to support 256bit K and/or OP[c] values

by laforge

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/33098 ) Change subject: db: extend database schema to support 256bit K and/or OP[c] values ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/33098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ibbde68484c904507a15c35cbfdf88cd47d0c7039 Gerrit-Change-Number: 33098 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:42:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: print SAPI and msg_id when sending confirmation

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34240 ) Change subject: pcu_sock: print SAPI and msg_id when sending confirmation ...................................................................... pcu_sock: print SAPI and msg_id when sending confirmation At the moment we do not print the SAPI, nor the msg_id when we send a confirmation back to the PCU Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602 elated: OS#5927 --- M src/common/pcu_sock.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/34240/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index e100464..1566178 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -628,7 +628,8 @@ /* FIXME: allow multiple BTS */ bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); - LOGP(DPCU, LOGL_DEBUG, "Sending PCH confirm\n"); + LOGP(DPCU, LOGL_DEBUG, "Sending confirmation: sapi=%s msg_id=%08x\n", + sapi_string[sapi], msg_id); msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602 Gerrit-Change-Number: 34240 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 ) Change subject: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch ...................................................................... BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch The testcase TC_pcu_data_req_agch uses SAPI PCU_IF_SAPI_AGCH. Since we now have a function f_PCUIF_tx_mac_block_agch() to send MAC blocks over the AGCH using the recently introduced SAPI PCU_IF_SAPI_AGCH_2, lets use this function instead. Related: OS#5927 Change-Id: I341bbd01e8132fab913d307bfb4b2fb873cdde3c --- M bts/BTS_Tests.ttcn 1 file changed, 17 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/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6109159..317ed70 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5792,7 +5792,8 @@ f_l1_tune(L1CTL); f_TC_pcu_act_req(0, 0, 7, true); - f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_AGCH, c_PCU_DATA); + f_PCUIF_tx_mac_block_agch(PCU, g_pcu_conn_id, c_PCU_DATA, confirm := false, + wait_for_cnf := false, msg_id := 'ffffffff'O); T.start; alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I341bbd01e8132fab913d307bfb4b2fb873cdde3c Gerrit-Change-Number: 34209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_2

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 ) Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_2 ...................................................................... PCUIF: Add support for PCU_IF_SAPI_AGCH_2 In PCUIF v.11 it will be possible to get confirmations for IMMEDIATE ASSIGNMENT messages sent through the AGCH. Related: OS#5927 Change-Id: I40e05a2e68cca77d3c2f41df9af8d35762488abf --- M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn 2 files changed, 76 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/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index d180f17..b49c513 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -196,6 +196,51 @@ } } +/* This function can be used to transmit arbitrary GSM MAC blocks via the AGCH. The BTS will only confirm those MAC + * blocks that contain actually a valid immediate assignment message. Otherweise no confirmation is sent back */ +function f_PCUIF_tx_mac_block_agch(PCUIF_CODEC_PT pt, integer conn_id, octetstring mac_block, boolean confirm := true, + uint8_t bts_nr := 0, boolean wait_for_cnf := true, OCT4 msg_id := '01020304'O) { + var PCUIF_send_data sd; + timer T := 3.0; + + if (mp_pcuif_version < 11) { + if (wait_for_cnf == true) { + setverdict(fail, "confirmation for AGCH not supported in PCUIF v.10 or earlier"); + } + pt.send(t_SD_PCUIF(conn_id, + ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_AGCH, mac_block))); + } else { + var PCUIF_agch agch; + agch.msg_id := msg_id; + agch.data := mac_block; + agch.confirm := confirm; + pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_AGCH_2, enc_PCUIF_agch(agch)))); + } + + /* Exit early when the caller is not interested in the confirmation message */ + if (wait_for_cnf == false) { + return; + } + + T.start; + alt { + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_2(bts_nr, PCU_IF_SAPI_AGCH_2))) -> value sd { + if (mp_pcuif_version < 11) { + setverdict(fail, "got tr_PCUIF_DATA_CNF_DT, but AGCH confirmation is not supported in PCUIF v.10 or earlier"); + mtc.stop; + } else { + log("IMM.ASS was sent on AGCH"); + return; + } + } + [] pt.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for PCU DATA.cnf (AGCH)"); + mtc.stop; + } + } + return; +} diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 509c93c..b8bd6e9 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -54,7 +54,8 @@ PCU_IF_SAPI_PDTCH ('05'O), PCU_IF_SAPI_PRACH ('06'O), PCU_IF_SAPI_PTCCH ('07'O), - PCU_IF_SAPI_PCH_2 ('08'O) + PCU_IF_SAPI_PCH_2 ('08'O), + PCU_IF_SAPI_AGCH_2 ('09'O) } with { variant "FIELDLENGTH(8)" }; type record PCUIF_Flags { @@ -321,6 +322,22 @@ external function dec_PCUIF_pch(in octetstring stream) return PCUIF_pch with { extension "prototype(convert) decode(RAW)" }; +/* Record to send a (confirmed) IMMEDIATE ASSIGNMENT message via AGCH. The record is sent by the PCU to the BTS as a + * data request (data_req) under SAPI PCU_IF_SAPI_AGCH_2. */ +type record PCUIF_agch { + OCT4 msg_id, + octetstring data length(23), + boolean confirm +} with { + variant (msg_id) "BYTEORDER(last)" + variant (data) "FIELDLENGTH(23)" +}; + +external function enc_PCUIF_agch(in PCUIF_agch pdu) return octetstring + with { extension "prototype(convert) encode(RAW)" }; +external function dec_PCUIF_agch(in octetstring stream) return PCUIF_agch + with { extension "prototype(convert) decode(RAW)" }; + type union PCUIF_MsgUnion { PCUIF_data data_req, PCUIF_data data_cnf, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: use confirm flag in struct gsm_pcu_if_pch

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 ) Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch ...................................................................... PCUIF: use confirm flag in struct gsm_pcu_if_pch In the recent PCUIF change of osmo-pcu (see Depends) a confirm flag is added to struct gsm_pcu_if_pch. This flag tells the receiving end (OsmoBSC or OsmoBTS) that the sending of the received MAC block has to be confirmed towards the PCU. OsmoBTS and OsmoPCU now rely on the conformation flag. Let's update the BTS_and PCU testsuites accordingly. Related: OS#5927 Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04 Change-Id: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 30 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d39bb77..6109159 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5823,6 +5823,7 @@ pch.msg_id := '01020304'O; pch.imsi := "00101000000000123"; pch.data := c_PCU_DATA; + pch.confirm := false; f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)); } diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index e56303e..d180f17 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -159,6 +159,7 @@ pch.msg_id := msg_id; pch.imsi := hex2str(imsi); pch.data := imm_ass; + pch.confirm := true; pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)))); } diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8583504..509c93c 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -308,7 +308,8 @@ type record PCUIF_pch { OCT4 msg_id, charstring imsi length(17), - octetstring data length(23) + octetstring data length(23), + boolean confirm } with { variant (msg_id) "BYTEORDER(last)" variant (imsi) "FIELDLENGTH(17)" diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index d7e2ed5..5868625 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -142,7 +142,8 @@ PCUIF_data raw, OCT4 msg_id optional, charstring imsi optional, - GsmRrMessage rr_msg + GsmRrMessage rr_msg, + boolean confirm }; template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr, template PCUIF_data raw, @@ -162,12 +163,14 @@ template PCUIF_data raw, template GsmRrMessage rr_msg := ?, template OCT4 msg_id := *, - template charstring imsi := *) := { + template charstring imsi := *, + template boolean confirm := *) := { bts_nr := bts_nr, raw := raw, msg_id := msg_id, imsi := imsi, - rr_msg := rr_msg + rr_msg := rr_msg, + confirm := confirm }; /* Generic port for messages and events */ @@ -553,6 +556,7 @@ pcu_msg_rr.msg_id := pch.msg_id; pcu_msg_rr.imsi := pch.imsi; pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch.data); + pcu_msg_rr.confirm := pch.confirm; } else { pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac Gerrit-Change-Number: 34194 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 ) Change subject: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch ...................................................................... BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch In PCUIF v.11 we support getting confirmations for IMMEDIATE ASSIGNMENT messages that are sent through the AGCH. Related: OS#5927 Change-Id: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 --- M bts/BTS_Tests.ttcn 1 file changed, 38 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/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 317ed70..1b43797 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5866,6 +5866,30 @@ } } +/* Send IMM.ASS from PCU for AGCH; check it appears on Um side */ +testcase TC_pcu_data_req_imm_ass_agch() runs on test_CT { + var octetstring req_ref := f_rnd_octstring(3); + var octetstring tlli := f_rnd_octstring(4); + var octetstring imm_ass := '2d063f300fc364'O & req_ref & '0000dc'O & tlli & '00232b2b2b2b'O; + f_init_with_pcuif(); + f_init_l1ctl(); + f_l1_tune(L1CTL); + + f_PCUIF_tx_mac_block_agch(PCU, g_pcu_conn_id, imm_ass); + + timer T := 0.5; + T.start; + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?, imm_ass)) { + setverdict(pass); + } + [] L1CTL.receive { repeat; } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCU-originated AGCH block on Um"); + } + } +} + /* Send RACH from Um side, expect it to show up on PCU socket */ testcase TC_pcu_rach_content() runs on test_CT { f_init_with_pcuif(); @@ -9076,6 +9100,7 @@ execute( TC_pcu_data_req_agch() ); execute( TC_pcu_data_req_pch() ); execute( TC_pcu_data_req_imm_ass_pch() ); + execute( TC_pcu_data_req_imm_ass_agch() ); execute( TC_pcu_rach_content() ); execute( TC_pcu_ext_rach_content() ); execute( TC_pcu_data_ind_lqual_cb() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Gerrit-Change-Number: 34067 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log August 2023