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

[S] Change in osmo-trx[master]: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/31892 ) Change subject: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 --- M Transceiver52M/Transceiver.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/device/ipc/ipc_sock.c 3 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/31892/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 Gerrit-Change-Number: 31892 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-trx[master]: ipc_sock.c: Call osmo_fd_unregister() before closing and changing bfd...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/31892 ) Change subject: ipc_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... ipc_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 --- M Transceiver52M/device/ipc/ipc_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/31892/1 diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c index ca8e1b0..9e8ab82 100644 --- a/Transceiver52M/device/ipc/ipc_sock.c +++ b/Transceiver52M/device/ipc/ipc_sock.c @@ -97,9 +97,9 @@ ipc_exit_requested = 1; + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ osmo_fd_read_enable(&state->listen_bfd); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 Gerrit-Change-Number: 31892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/31891 ) Change subject: pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I692bbb5b7c06b5528a36c09a99a7580cbafa3cc0 --- M src/common/pcu_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/31891/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 849f3c3..145942b 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -999,9 +999,9 @@ bts->pcu_version[0] = '\0'; + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* patch SI3 to remove GPRS indicator */ regenerate_si3_restoctets(bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I692bbb5b7c06b5528a36c09a99a7580cbafa3cc0 Gerrit-Change-Number: 31891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in openbsc[master]: pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/31890 ) Change subject: pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I462eea5c44cbffa7fa47121c85fb6ef55394953d --- M openbsc/src/libbsc/pcu_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/90/31890/1 diff --git a/openbsc/src/libbsc/pcu_sock.c b/openbsc/src/libbsc/pcu_sock.c index 4411df8..aa794de 100644 --- a/openbsc/src/libbsc/pcu_sock.c +++ b/openbsc/src/libbsc/pcu_sock.c @@ -502,9 +502,9 @@ LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ state->listen_bfd.when |= OSMO_FD_READ; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/31890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I462eea5c44cbffa7fa47121c85fb6ef55394953d Gerrit-Change-Number: 31890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31889 ) Change subject: pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... pcu_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I4f72f4fa80249ed2caafc87b9fdf9926e0f31976 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/31889/1 diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 7160210..b6e626d 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -759,9 +759,9 @@ LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ osmo_fd_read_enable(&state->listen_bfd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4f72f4fa80249ed2caafc87b9fdf9926e0f31976 Gerrit-Change-Number: 31889 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: osmo_bts_sock.c: Call osmo_fd_unregister() before closing and changin...
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31887 ) Change subject: osmo_bts_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... osmo_bts_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Iec0faba781bcb2bc6de8710392655785790b9af4 --- M src/osmobts_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/87/31887/1 diff --git a/src/osmobts_sock.c b/src/osmobts_sock.c index 282e33f..6d46a84 100644 --- a/src/osmobts_sock.c +++ b/src/osmobts_sock.c @@ -96,9 +96,9 @@ LOGP(DL1IF, LOGL_NOTICE, "PCU socket has %s connection\n", (lost) ? "LOST" : "closed"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* flush the queue */ while (!llist_empty(&pcu_sock_state.upqueue)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec0faba781bcb2bc6de8710392655785790b9af4 Gerrit-Change-Number: 31887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: Update libosmogsm deprecated include
by pespin 14 Mar '23

14 Mar '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31888 ) Change subject: Update libosmogsm deprecated include ...................................................................... Update libosmogsm deprecated include The previous gprs/protocol/gsm_04_60.h header from libosmogsm was misleading because it was placed in the subdirectory used by libosmogb, and hence was recently deprecated in favour of gsm/protocol/gsm_04_60.h. Let's follow the pragma message advising to move to the new header file. Depends: libosmocore 0158b05337a825352d9fd7f074170b686e9fd1e5 Change-Id: I027abbf3ed4c71331000565af1ef4f08f10cfafc --- M TODO-RELEASE M tests/edge/EdgeTest.cpp M tests/tbf/TbfTest.cpp 3 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/31888/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index cbfda24..6952029 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +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 +libosmocore > 1.8.0 osmocom/gsm/protocol/gsm_44_060.h \ No newline at end of file diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 4cc7960..edce20f 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -38,7 +38,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/vty/vty.h> -#include <osmocom/gprs/protocol/gsm_04_60.h> +#include <osmocom/gsm/protocol/gsm_44_060.h> } #include <errno.h> diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0b2e868..cc62bc2 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -43,7 +43,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/vty/vty.h> -#include <osmocom/gprs/protocol/gsm_04_60.h> +#include <osmocom/gsm/protocol/gsm_44_060.h> #include <osmocom/gsm/l1sap.h> #include <osmocom/core/fsm.h> } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I027abbf3ed4c71331000565af1ef4f08f10cfafc Gerrit-Change-Number: 31888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: bsc_subscriber: Optimize lookup of bsub by TMSI
by pespin 14 Mar '23

14 Mar '23

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31875 ) Change subject: bsc_subscriber: Optimize lookup of bsub by TMSI ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I'm curious about your thoughts of rbtree vs. hash table. […] I really have no hard thoughts regarding one or another here, I could have used a hashtable too. Each has its pros and cons. Since hashtable means allocating more memory and we may want to add more lookup data structures for other MI types in the future (IMSI string, etc.) I thought rbtree was the easiest to replicate. Also because I already had code around from previous patches. I think simply rbtree is good enough (TM). It's not like we are moving millions of objects so the difference shouldn't be that much, and the time the analysis that would require is probably not worth it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If27429e715ef4b327177e427249e68321a6e83cc Gerrit-Change-Number: 31875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 14 Mar 2023 10:01:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: rsl_rx_ipac_XXcx: parse csd_fmt_d/ir
by osmith 14 Mar '23

14 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31795 ) Change subject: rsl_rx_ipac_XXcx: parse csd_fmt_d/ir ...................................................................... rsl_rx_ipac_XXcx: parse csd_fmt_d/ir Parse the RTP CSD Format and reply with NACK if the mode is not RSL_IPAC_RTP_CSD_TRAU_BTS, which is the only one we plan to implement for now. Related: OS#4393 Change-Id: Ibfc7811387df5224682d7e6a313d38648d3d8c48 --- M src/common/rsl.c 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 64ffcb8..2e6e512 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2703,12 +2703,14 @@ struct tlv_parsed tp; struct gsm_lchan *lchan = msg->lchan; struct gsm_bts *bts = lchan->ts->trx->bts; - const uint8_t *payload_type, *speech_mode, *payload_type2, *osmux_cid; + const uint8_t *payload_type, *speech_mode, *payload_type2, *osmux_cid, *csd_fmt; uint32_t connect_ip = 0; uint16_t connect_port = 0; int rc, inc_ip_port = 0; char *name; struct in_addr ia; + enum rsl_ipac_rtp_csd_format_d csd_fmt_d; + enum rsl_ipac_rtp_csd_format_ir csd_fmt_ir; if (dch->c.msg_type == RSL_MT_IPAC_CRCX) name = "CRCX"; @@ -2766,6 +2768,17 @@ inc_ip_port, dch->c.msg_type); } + if ((csd_fmt = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_CSD_FMT))) { + csd_fmt_d = *csd_fmt & 0xf; + csd_fmt_ir = *csd_fmt >> 4; + LOGPC(DRSL, LOGL_DEBUG, "csd_fmt_d=%d csd_fmt_ir=%d ", csd_fmt_d, csd_fmt_ir); + if (csd_fmt_d != RSL_IPAC_RTP_CSD_TRAU_BTS) { + LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Rx RSL IPAC %s, csd_fmt_d=%d is not supported\n", + name, csd_fmt_d); + return tx_ipac_XXcx_nack(lchan, RSL_ERR_SERV_OPT_UNIMPL, inc_ip_port, dch->c.msg_type); + } + } + if (!osmux_cid) { /* Regular RTP */ if (bts->osmux.use == OSMUX_USAGE_ONLY) { LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Rx RSL IPAC XXcx without Osmux CID" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibfc7811387df5224682d7e6a313d38648d3d8c48 Gerrit-Change-Number: 31795 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bts[master]: doc: rsl: add RSL_IE_IPAC_RTP_CSD_FORMAT
by osmith 14 Mar '23

14 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31794 ) Change subject: doc: rsl: add RSL_IE_IPAC_RTP_CSD_FORMAT ...................................................................... doc: rsl: add RSL_IE_IPAC_RTP_CSD_FORMAT Add documentation for rsl_ipac_rtp_csd_format_d/_ir from libosmocore.git, include/osmocom/gsm/protocol/gsm_08_58.h and wireshark.git, epan/dissectors/packet-rsl.c. Related: OS#4393 Change-Id: Ic8f40076698f2b341cc0096fd96ba2051a41f077 --- M doc/manuals/abis/rsl.adoc 1 file changed, 50 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc index 081bf98..e627f5c 100644 --- a/doc/manuals/abis/rsl.adoc +++ b/doc/manuals/abis/rsl.adoc @@ -517,6 +517,7 @@ | Destination IP Port | <<RSL_IE_IPAC_REMOTE_PORT>> | O | TV | 3 | IP Speech Mode | <<RSL_IE_IPAC_SPEECH_MODE>> | O | TV | 2 | RTP Payload Type 2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> | O | TV | 2 +| RTP CSD Format | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | O | TV | 2 |=== [[rsl_crcx_msg_ack]] @@ -577,6 +578,7 @@ | Destination IP Port | <<RSL_IE_IPAC_REMOTE_PORT>> | O | TV | 3 | IP Speech Mode | <<RSL_IE_IPAC_SPEECH_MODE>> | O | TV | 2 | RTP Payload Type 2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> | O | TV | 2 +| RTP CSD Format | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | O | TV | 2 |=== [[rsl_mdcx_msg_ack]] @@ -872,6 +874,7 @@ | 0xf5 | RSL_IE_IPAC_LOCAL_IP | <<RSL_IE_IPAC_LOCAL_IP>> | 0xf6 | RSL_IE_IPAC_CONN_STAT | <<RSL_IE_IPAC_CONN_STAT>> | 0xf8 | RSL_IE_IPAC_CONN_ID | <<RSL_IE_IPAC_CONN_ID>> +| 0xf9 | RSL_IE_IPAC_RTP_CSD_FORMAT | <<RSL_IE_IPAC_RTP_CSD_FORMAT>> | 0xfc | RSL_IE_IPAC_RTP_PAYLOAD2 | <<RSL_IE_IPAC_RTP_PAYLOAD2>> |=== @@ -1086,6 +1089,39 @@ | 8..255 | reserved values |=== +[[RSL_IE_IPAC_RTP_CSD_FORMAT]] +==== RSL_IE_IPAC_RTP_CSD_FORMAT + +This information element contains the RTP Circuit Switched Data format. + +.A-bis/IP RTP CSD Format +[options="header",width="60%",cols="15%,15%,70%"] +|=== +| Offset | Size | Description +| 0 | 4 | RTP CSD Format D +| 4 | 4 | RTP CSD Format IR +|=== + +.A-bis/IP RTP CSD Format D Values +[options="header",width="40%",cols="20%,80%"] +|=== +| Value | Description +| 0 | External TRAU format +| 1 | Non-TRAU Packed format +| 2 | TRAU within the BTS +| 3 | IWF-Free BTS-BTS Data +|=== + +.A-bis/IP RTP CSD Format IR Values +[options="header",width="40%",cols="20%,80%"] +|=== +| Value | Description +| 0 | 8 kb/s +| 1 | 16 kb/s +| 2 | 32 kb/s +| 3 | 48 kb/s +|=== + === A-bis RSL Initialization / BTS bring-up Upon receiving the 'IPA RSL CONNECT' OML message by the respective -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8f40076698f2b341cc0096fd96ba2051a41f077 Gerrit-Change-Number: 31794 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0