[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit
Attention is currently required from: dexter, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email ) Change subject: mgw: TC_conn_timeout Fix timeout left set upon test exit .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9447fa6c6b3103e05fa3ee756ee572ddecb69006 Gerrit-Change-Number: 34549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 28 Sep 2023 08:22:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: mgw: Factor out helper func to test data flows over endp with 2 conns
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email ) Change subject: mgw: Factor out helper func to test data flows over endp with 2 conns .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic4f3c5bb687373bdae6942e1952797e76bfa3ffb Gerrit-Change-Number: 34546 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 28 Sep 2023 08:24:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email ) Change subject: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I34d47d0cdde855900798e4cb3efd26af22f5b049 Gerrit-Change-Number: 34547 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 28 Sep 2023 08:29:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log number of error packets
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email ) Change subject: RTP_Emulation: Log number of error packets .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I685fb43ea30c83a975edd32cc24994da15940100 Gerrit-Change-Number: 34551 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 28 Sep 2023 08:30:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log the different failure verdicts before stopping
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email ) Change subject: RTP_Emulation: Log the different failure verdicts before stopping .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I177b2f4e56ac89fcab20ba6235bf968ac1873046 Gerrit-Change-Number: 34552 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 28 Sep 2023 08:30:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup
Attention is currently required from: neels, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 28 Sep 2023 08:32:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-resul...
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email ) Change subject: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 Gerrit-Change-Number: 34553 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 28 Sep 2023 08:33:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS
Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS .. ASCI: Add support flags to mobile (and VTY) for VGCS/VBS These support flags can be enabled or disabled and are sent in the class mark IE. Also they allow or disallow making VGCS/VBS calls. Related: OS#5364 Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/support.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/83/34483/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202 Gerrit-Change-Number: 34483 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Increase channel request history to 5 entries
Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34485?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Increase channel request history to 5 entries .. ASCI: Increase channel request history to 5 entries 3 entries are enough for random access on CCCH. 5 are required for uplink request on VGCS channel. The history is used to remember when the random access bursts were send. The RR layer can check if the IMMEDIATE ASSIGNMENT or VGCS UPLINK GRANT message has matching frame number and random value of up to 5 random access bursts previously sent. Related: OS#5364 Change-Id: I62f18685bf05663f3ee6e94f6884ffb9a6b07ea4 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 31 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/85/34485/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I62f18685bf05663f3ee6e94f6884ffb9a6b07ea4 Gerrit-Change-Number: 34485 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix request reference value in gsm48_match_ra()
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34486?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Fix request reference value in gsm48_match_ra() .. Fix request reference value in gsm48_match_ra() Do not overwrite the given request reference pointer with the history buffer's reference. This makes no sense. Without this fix only the response to the first access burst could be matched correctly. Change-Id: Iec636d368e20030beac2861bff61b1a06e7b4821 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/34486/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iec636d368e20030beac2861bff61b1a06e7b4821 Gerrit-Change-Number: 34486 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add channel notification event to MM events
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34488?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add channel notification event to MM events .. ASCI: Add channel notification event to MM events This is required to notify MM layer about new and ceased group and broadcast calls. Related: OS#5364 Change-Id: Ifee286ba4628356cc19b5dc75f1843287c5d2342 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/src/mobile/gsm48_mm.c 2 files changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/34488/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34488?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifee286ba4628356cc19b5dc75f1843287c5d2342 Gerrit-Change-Number: 34488 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: Refactoring encoding of mobile identity at mobile application
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34484?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Refactoring encoding of mobile identity at mobile application .. Refactoring encoding of mobile identity at mobile application Deprecated functions gsm48_generate_mid_from_*() are replaced by osmo_mobile_identity_encode_msgb(). Clean up code. Change-Id: I9ff429bd50d718530fdad64a276053a35c8928f2 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c 3 files changed, 80 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/84/34484/9 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34484?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9ff429bd50d718530fdad64a276053a35c8928f2 Gerrit-Change-Number: 34484 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add uplink free/busy event to MM events
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34489?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add uplink free/busy event to MM events .. ASCI: Add uplink free/busy event to MM events Related: OS#5364 Change-Id: I3f8d97a0359ea9560d6d6bfd8238ddc6492c56e8 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/34489/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34489?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3f8d97a0359ea9560d6d6bfd8238ddc6492c56e8 Gerrit-Change-Number: 34489 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add interface for group receive/transmit mode support to RR layer
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34528?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add interface for group receive/transmit mode support to RR layer .. ASCI: Add interface for group receive/transmit mode support to RR layer This patch includes new messages and description. The are used to bring RR layer into group receive mode and from there in group transmit mode and back. Related: OS#5364 Change-Id: I1abd56c63d15af1cff8bde7589a571cb5bb5506f --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/34528/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34528?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1abd56c63d15af1cff8bde7589a571cb5bb5506f Gerrit-Change-Number: 34528 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix unset sapi in gsm48_rr_data_ind()
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34487?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Fix unset sapi in gsm48_rr_data_ind() .. Fix unset sapi in gsm48_rr_data_ind() The gsm48_rr_hdr is pushed into the message before sending data to MM layer. SAPI was not set in this header. Change-Id: I8345a562050d52d491f3b7192c979d455a63931c --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/87/34487/10 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34487?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8345a562050d52d491f3b7192c979d455a63931c Gerrit-Change-Number: 34487 Gerrit-PatchSet: 10 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Show NCH position in VTY together with system information
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Show NCH position in VTY together with system information .. ASCI: Show NCH position in VTY together with system information Related: OS#5364 Change-Id: I5e0a9d469eb70608502dca881808621fa153b666 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/34496/12 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5e0a9d469eb70608502dca881808621fa153b666 Gerrit-Change-Number: 34496 Gerrit-PatchSet: 12 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. ASCI: Add VTY commands to control voice group/broadcast calls Related: OS#5364 Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 --- M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 248 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/34495/12 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 12 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add protocol type to trans_find_by_callref() function
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add protocol type to trans_find_by_callref() function .. ASCI: Add protocol type to trans_find_by_callref() function This is required, because different protocols may share the same callref, but use different protocols. E.g. a voice group call can share the same callref with a voice broadcast call, but these calls are different transactions. Related: OS#5364 Change-Id: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 --- M src/host/layer23/include/osmocom/bb/mobile/transaction.h M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/transaction.c 5 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/34493/11 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 Gerrit-Change-Number: 34493 Gerrit-PatchSet: 11 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Add UIC support to random access burst
Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34482?usp=email ) Change subject: ASCI: Add UIC support to random access burst .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4039734676949aefa5be4b5298764b8ba7e1b8ed Gerrit-Change-Number: 34482 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 28 Sep 2023 08:54:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: ASCI: Add UIC support to random access burst
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34482?usp=email )
Change subject: ASCI: Add UIC support to random access burst
..
ASCI: Add UIC support to random access burst
A different identity code can be used on uplink access bursts on voice
group channel. This is optional for the network, but mandatory for the
MS side. If the network does not define a UIC, the BSIC is used instead.
BSIC is used for RACH channel and handover.
Related: OS#5364
Change-Id: I4039734676949aefa5be4b5298764b8ba7e1b8ed
---
M include/l1ctl_proto.h
M src/host/layer23/include/osmocom/bb/common/l1ctl.h
M src/host/layer23/src/common/l1ctl.c
M src/host/layer23/src/common/l1ctl_lapdm_glue.c
M src/host/layer23/src/modem/grr.c
M src/target/firmware/include/layer1/prim.h
M src/target/firmware/include/layer1/sync.h
M src/target/firmware/layer1/l23_api.c
M src/target/firmware/layer1/prim_rach.c
9 files changed, 35 insertions(+), 12 deletions(-)
Approvals:
jolly: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h
index 2bdb560..941a947 100644
--- a/include/l1ctl_proto.h
+++ b/include/l1ctl_proto.h
@@ -230,6 +230,7 @@
uint8_t ra;
uint8_t combined;
uint16_t offset;
+ uint8_t uic;
} __attribute__((packed));
diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index d49e16d..a74c9c3 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -23,7 +23,7 @@
/* Transmit L1CTL_RACH_REQ */
int l1ctl_tx_rach_req(struct osmocom_ms *ms,
uint8_t chan_nr, uint8_t link_id,
- uint8_t ra, uint16_t offset, uint8_t combined);
+ uint8_t ra, uint16_t offset, uint8_t combined, uint8_t
uic);
/* Transmit L1CTL_DM_EST_REQ */
int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn, uint8_t
chan_nr, uint8_t tsc,
diff --git a/src/host/layer23/src/common/l1ctl.c
b/src/host/layer23/src/common/l1ctl.c
index e950c85..589af09 100644
--- a/src/host/layer23/src/common/l1ctl.c
+++ b/src/host/layer23/src/common/l1ctl.c
@@ -514,7 +514,7 @@
/* Transmit L1CTL_RACH_REQ */
int l1ctl_tx_rach_req(struct osmocom_ms *ms,
uint8_t chan_nr, uint8_t link_id,
- uint8_t ra, uint16_t offset, uint8_t combined)
+ uint8_t ra, uint16_t offset, uint8_t combined, uint8_t
uic)
{
struct msgb *msg;
struct l1ctl_info_ul *ul;
@@ -524,7 +524,7 @@
if (!msg)
return -1;
- DEBUGP(DL1C, "RACH Req. offset=%d combined=%d\n", offset, combined);
+ DEBUGP(DL1C, "RACH Req. offset=%d combined=%d uic=0x%02x\n", offset,
combined, uic);
ul = (struct l1ctl_info_ul *) msgb_put(msg, sizeof(*ul));
ul->chan_nr = chan_nr;
ul->link_id = link_id;
@@ -532,6 +532,7 @@
req->ra = ra;
req->offset = htons(offset);
req->combined = combined;
+ req->uic = uic;
return osmo_send_l1(ms, msg);
}
diff --git a/src/host/layer23/src/common/l1ctl_lapdm_glue.c
b/src/host/layer23/src/common/l1ctl_lapdm_glue.c
index 601bed6..458cc81 100644
--- a/src/host/layer23/src/common/l1ctl_lapdm_glue.c
+++ b/src/host/layer23/src/common/l1ctl_lapdm_glue.c
@@ -52,7 +52,8 @@
RSL_CHAN_RACH, 0x00,
pp->u.rach_req.ra,
pp->u.rach_req.offset,
- pp->u.rach_req.is_combined_ccch);
+ pp->u.rach_req.is_combined_ccch,
+ 0xff);
break;
default:
rc = -EINVAL;
diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c
index b1912ea..1bb172e 100644
--- a/src/host/layer23/src/modem/grr.c
+++ b/src/host/layer23/src/modem/grr.c
@@ -653,7 +653,7 @@
rr->cr_ra, rr->n_chan_req);
l1ctl_tx_rach_req(ms, RSL_CHAN_RACH, 0x00, rr->cr_ra, 0,
- ms->cellsel.ccch_mode == CCCH_MODE_COMBINED);
+ ms->cellsel.ccch_mode == CCCH_MODE_COMBINED, 0xff);
}
static void grr_st_packet_access_action(struct osmo_fsm_inst *fi,
diff --git a/src/target/firmware/include/layer1/prim.h
b/src/target/firmware/include/layer1/prim.h
index 30c51ae..4e34bb2 100644
--- a/src/target/firmware/include/layer1/prim.h
+++ b/src/target/firmware/include/layer1/prim.h
@@ -20,7 +20,7 @@
void l1s_fbsb_req(uint8_t base_fn, struct l1ctl_fbsb_req *req);
void l1a_freq_req(uint32_t fn_sched);
-void l1a_rach_req(uint16_t offset, uint8_t combined, uint8_t ra);
+void l1a_rach_req(uint16_t offset, uint8_t combined, uint8_t ra,
[S] Change in osmocom-bb[master]: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS
jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Add support flags to mobile (and VTY) for VGCS/VBS .. ASCI: Add support flags to mobile (and VTY) for VGCS/VBS These support flags can be enabled or disabled and are sent in the class mark IE. Also they allow or disallow making VGCS/VBS calls. Related: OS#5364 Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/support.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 34 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 56475e3..c5469c1 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -161,6 +161,10 @@ uint8_t ch_cap; /* channel capability */ int8_t min_rxlev_dbm; /* min dBm to access */ + /* support for ASCI */ + boolvgcs; /* support of VGCS */ + boolvbs; /* support of VBS */ + /* radio */ uint16_tdsc_max; uint8_t force_rekey; diff --git a/src/host/layer23/src/common/support.c b/src/host/layer23/src/common/support.c index e82d49f..2f93016 100644 --- a/src/host/layer23/src/common/support.c +++ b/src/host/layer23/src/common/support.c @@ -34,9 +34,9 @@ /* revision level */ sup->rev_lev = 1; /* phase 2 mobile station */ /* support of VGCS */ - sup->vgcs = 0; /* no */ + sup->vgcs = true; /* yes */ /* support of VBS */ - sup->vbs = 0; /* no */ + sup->vbs = true; /* yes */ /* support of SMS */ sup->sms_ptp = 1; /* no */ /* screening indicator */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 9b9ba95..feb5f84 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1075,6 +1075,8 @@ if (!l23_vty_hide_default || set->any_timeout != MOB_C7_DEFLT_ANY_TIMEOUT) vty_out(vty, " c7-any-timeout %d%s", set->any_timeout, VTY_NEWLINE); + SUP_WRITE(vgcs, "vgcs"); + SUP_WRITE(vbs, "vbs"); vty_out(vty, " audio%s", VTY_NEWLINE); vty_out(vty, " io-handler %s%s", @@ -2052,6 +2054,15 @@ return CMD_SUCCESS; } +SUP_EN(cfg_ms_sup_vbs, cfg_ms_sup_vbs_cmd, vbs, "vbs", + "Voice Broadcast Service (VBS)", 0); +SUP_DI(cfg_ms_sup_no_vbs, cfg_ms_sup_no_vbs_cmd, vbs, + "vbs", "Voice Broadcast Service (VBS)", 0); +SUP_EN(cfg_ms_sup_vgcs, cfg_ms_sup_vgcs_cmd, vgcs, "vgcs", + "Voice Group Call Service (VGCS)", 0); +SUP_DI(cfg_ms_sup_no_vgcs, cfg_ms_sup_no_vgcs_cmd, vgcs, + "vgcs", "Voice Group Call Service (VBS)", 0); + /* per audio config */ DEFUN(cfg_ms_audio, cfg_ms_audio_cmd, "audio", "Configure audio settings") @@ -2380,6 +2391,10 @@ install_element(SUPPORT_NODE, &cfg_ms_sup_dsc_max_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_skip_max_per_band_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_no_skip_max_per_band_cmd); + install_element(SUPPORT_NODE, &cfg_ms_sup_vbs_cmd); + install_element(SUPPORT_NODE, &cfg_ms_sup_no_vbs_cmd); + install_element(SUPPORT_NODE, &cfg_ms_sup_vgcs_cmd); + install_element(SUPPORT_NODE, &cfg_ms_sup_no_vgcs_cmd); install_element(MS_NODE, &cfg_ms_script_load_run_cmd); install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia23eb190e533660cce4ba4c856a83b5f3d534202 Gerrit-Change-Number: 34483 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: ASCI: Increase channel request history to 5 entries
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34485?usp=email )
(
8 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Increase channel request history to 5 entries
..
ASCI: Increase channel request history to 5 entries
3 entries are enough for random access on CCCH. 5 are required for
uplink request on VGCS channel.
The history is used to remember when the random access bursts were send.
The RR layer can check if the IMMEDIATE ASSIGNMENT or VGCS UPLINK GRANT
message has matching frame number and random value of up to 5 random
access bursts previously sent.
Related: OS#5364
Change-Id: I62f18685bf05663f3ee6e94f6884ffb9a6b07ea4
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/src/mobile/gsm48_rr.c
2 files changed, 31 insertions(+), 15 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index 299b6e5..fb07cc9 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -159,7 +159,7 @@
/* cr_hist */
uint8_t cr_ra; /* stores requested ra until confirmed */
- struct gsm48_cr_histcr_hist[3];
+ struct gsm48_cr_histcr_hist[5];
/* V(SD) sequence numbers */
uint16_tv_sd; /* 16 PD 1-bit sequence numbers packed */
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index 835e48c..817c886 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -84,6 +84,9 @@
#include
+/* Check response for the last 3 channel requests only. See TS 44.018
§3.3.1.1.3.1 and §3.3.1.1.3.2. */
+#define IMM_ASS_HISTORY3
+
static void start_rr_t_meas(struct gsm48_rrlayer *rr, int sec, int micro);
static void stop_rr_t_starting(struct gsm48_rrlayer *rr);
static void stop_rr_t3124(struct gsm48_rrlayer *rr);
@@ -1489,12 +1492,10 @@
return -EINVAL;
}
- /* store value, mask and history */
+ /* store value, mask and clear history */
rr->chan_req_val = chan_req_val;
rr->chan_req_mask = chan_req_mask;
- rr->cr_hist[2].valid = 0;
- rr->cr_hist[1].valid = 0;
- rr->cr_hist[0].valid = 0;
+ memset(rr->cr_hist, 0, sizeof(rr->cr_hist));
/* store establishment cause, so 'choose cell' selects the last cell
* after location updating */
@@ -1545,10 +1546,7 @@
}
/* shift history and store */
- memcpy(&(rr->cr_hist[2]), &(rr->cr_hist[1]),
- sizeof(struct gsm48_cr_hist));
- memcpy(&(rr->cr_hist[1]), &(rr->cr_hist[0]),
- sizeof(struct gsm48_cr_hist));
+ memmove(rr->cr_hist + 1, rr->cr_hist, sizeof(rr->cr_hist) -
sizeof(rr->cr_hist[0]));
rr->cr_hist[0].valid = 1;
rr->cr_hist[0].ref.ra = rr->cr_ra;
rr->cr_hist[0].ref.t1 = ref->t1;
@@ -2364,14 +2362,14 @@
*/
/* match request reference against request history */
-static int gsm48_match_ra(struct osmocom_ms *ms, struct gsm48_req_ref *ref)
+static int gsm48_match_ra(struct osmocom_ms *ms, struct gsm48_req_ref *ref,
uint8_t hist_num)
{
struct gsm48_rrlayer *rr = &ms->rrlayer;
int i;
uint8_t ia_t1, ia_t2, ia_t3;
uint8_t cr_t1, cr_t2, cr_t3;
- for (i = 0; i < 3; i++) {
+ for (i = 0; i < hist_num; i++) {
/* filter confirmed RACH requests only */
if (rr->cr_hist[i].valid && ref->ra == rr->cr_hist[i].ref.ra) {
ia_t1 = ref->t1;
@@ -2492,7 +2490,7 @@
}
/* request ref */
- if (gsm48_match_ra(ms, &ia->req_ref)) {
+ if (gsm48_match_ra(ms, &ia->req_ref, IMM_ASS_HISTORY)) {
/* channel description */
memcpy(&rr->cd_now, &cd, sizeof(rr->cd_now));
/* timing advance */
@@ -2640,7 +2638,7 @@
}
/* request ref 1 */
- if (gsm48_match_ra(ms, &ia->req_ref1)) {
+ if (gsm48_match_ra(ms, &ia->req_ref1, IMM_ASS_HISTORY)) {
/* channel description */
memcpy(&rr->cd_now, &cd1, sizeof(rr->cd_now));
/* timing advance */
@@ -2656,7 +2654,7 @@
return gsm48_rr_dl_est(ms);
}
/* request ref 2 */
- if (gsm48_match_ra(ms, &ia->req_ref2)) {
+ if (gsm48_match_ra(ms, &ia->req_ref2, IMM_ASS_HISTORY)) {
/* channel description */
memcpy(&rr->cd_now, &cd2, sizeof(rr->cd_now))
[S] Change in osmocom-bb[master]: Fix request reference value in gsm48_match_ra()
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34486?usp=email )
(
8 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: Fix request reference value in gsm48_match_ra()
..
Fix request reference value in gsm48_match_ra()
Do not overwrite the given request reference pointer with the history
buffer's reference. This makes no sense.
Without this fix only the response to the first access burst could be
matched correctly.
Change-Id: Iec636d368e20030beac2861bff61b1a06e7b4821
---
M src/host/layer23/src/mobile/gsm48_rr.c
1 file changed, 21 insertions(+), 7 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index 817c886..0815777 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -2372,13 +2372,12 @@
for (i = 0; i < hist_num; i++) {
/* filter confirmed RACH requests only */
if (rr->cr_hist[i].valid && ref->ra == rr->cr_hist[i].ref.ra) {
- ia_t1 = ref->t1;
- ia_t2 = ref->t2;
- ia_t3 = (ref->t3_high << 3) | ref->t3_low;
- ref = &rr->cr_hist[i].ref;
- cr_t1 = ref->t1;
- cr_t2 = ref->t2;
- cr_t3 = (ref->t3_high << 3) | ref->t3_low;
+ ia_t1 = ref->t1;
+ ia_t2 = ref->t2;
+ ia_t3 = (ref->t3_high << 3) | ref->t3_low;
+ cr_t1 = rr->cr_hist[i].ref.t1;
+ cr_t2 = rr->cr_hist[i].ref.t2;
+ cr_t3 = (rr->cr_hist[i].ref.t3_high << 3) |
rr->cr_hist[i].ref.t3_low;
if (ia_t1 == cr_t1 && ia_t2 == cr_t2
&& ia_t3 == cr_t3) {
LOGP(DRR, LOGL_INFO, "request %02x matches "
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34486?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Iec636d368e20030beac2861bff61b1a06e7b4821
Gerrit-Change-Number: 34486
Gerrit-PatchSet: 10
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmocom-bb[master]: Refactoring encoding of mobile identity at mobile application
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34484?usp=email )
(
7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: Refactoring encoding of mobile identity at mobile application
..
Refactoring encoding of mobile identity at mobile application
Deprecated functions gsm48_generate_mid_from_*() are replaced by
osmo_mobile_identity_encode_msgb(). Clean up code.
Change-Id: I9ff429bd50d718530fdad64a276053a35c8928f2
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/src/mobile/gsm48_mm.c
M src/host/layer23/src/mobile/gsm48_rr.c
3 files changed, 80 insertions(+), 61 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index 3ece82e..8ec1b7a 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -240,6 +240,8 @@
int state;
};
+int gsm48_encode_mi_lv(struct osmocom_ms *ms, struct msgb *msg, uint8_t
mi_type, bool emergency_imsi);
+int gsm48_encode_mi_tlv(struct osmocom_ms *ms, struct msgb *msg, uint8_t
mi_type, bool emergency_imsi);
uint8_t gsm48_current_pwr_lev(struct gsm_settings *set, uint16_t arfcn);
int gsm48_mm_init(struct osmocom_ms *ms);
int gsm48_mm_exit(struct osmocom_ms *ms);
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index ed8cdf8..488416d 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -272,46 +272,68 @@
return length;
}
-/* encode 'mobile identity' */
-int gsm48_encode_mi(uint8_t *buf, struct msgb *msg, struct osmocom_ms *ms,
- uint8_t mi_type)
+/* Encode and append 'mobile identity' of given type to message, based on
current settings. */
+int gsm48_encode_mi_lv(struct osmocom_ms *ms, struct msgb *msg, uint8_t
mi_type, bool emergency_imsi)
{
struct gsm_subscriber *subscr = &ms->subscr;
struct gsm_settings *set = &ms->settings;
- uint8_t *ie;
+ struct osmo_mobile_identity mi = { };
+ int rc;
+ uint8_t *l;
- switch(mi_type) {
+ /* Copy MI values according to their types. */
+ switch (mi_type) {
case GSM_MI_TYPE_TMSI:
- gsm48_generate_mid_from_tmsi(buf, subscr->tmsi);
+ mi.tmsi = subscr->tmsi;
break;
case GSM_MI_TYPE_IMSI:
- gsm48_generate_mid_from_imsi(buf, subscr->imsi);
+ if (emergency_imsi)
+ OSMO_STRLCPY_ARRAY(mi.imsi, set->emergency_imsi);
+ else
+ OSMO_STRLCPY_ARRAY(mi.imsi, subscr->imsi);
break;
case GSM_MI_TYPE_IMEI:
- gsm48_generate_mid_from_imsi(buf, set->imei);
+ OSMO_STRLCPY_ARRAY(mi.imei, set->imei);
break;
case GSM_MI_TYPE_IMEISV:
- gsm48_generate_mid_from_imsi(buf, set->imeisv);
+ OSMO_STRLCPY_ARRAY(mi.imeisv, set->imeisv);
+ break;
+ }
+
+ /* Generate MI or 'NONE', if not available. */
+ switch (mi_type) {
+ case GSM_MI_TYPE_TMSI:
+ case GSM_MI_TYPE_IMSI:
+ case GSM_MI_TYPE_IMEI:
+ case GSM_MI_TYPE_IMEISV:
+ mi.type = mi_type;
+ l = msgb_put(msg, 1);
+ rc = osmo_mobile_identity_encode_msgb(msg, &mi, true);
+ if (rc < 0) {
+ LOGP(DMM, LOGL_ERROR, "Failed to encode mobile identity
type %d. Please fix!\n", mi_type);
+ *l = 1;
+ msgb_put_u8(msg, 0xf0 | GSM_MI_TYPE_NONE);
+ break;
+ }
+ *l = rc;
break;
case GSM_MI_TYPE_NONE:
default:
- buf[0] = GSM48_IE_MOBILE_ID;
- buf[1] = 1;
- buf[2] = 0xf0;
- break;
- }
- /* alter MI type */
- buf[2] = (buf[2] & ~GSM_MI_TYPE_MASK) | mi_type;
-
- if (msg) {
- /* MI as LV */
- ie = msgb_put(msg, 1 + buf[1]);
- memcpy(ie, buf + 1, 1 + buf[1]);
+ msgb_put_u8(msg, 1);
+ msgb_put_u8(msg, 0xf0 | mi_type);
}
return 0;
}
+int gsm48_encode_mi_tlv(struct osmocom_ms *ms, struct msgb *msg, uint8_t
mi_type, bool emergency_imsi)
+{
+ /* Append IE type. */
+ msgb_put_u8(msg, GSM48_IE_MOBILE_ID);
+
+ return gsm48_encode_mi_lv(ms, msg, mi_type, emergency_imsi);
+}
+
/* encode 'classmark 1' */
int gsm48_encod
[S] Change in osmocom-bb[master]: Fix unset sapi in gsm48_rr_data_ind()
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34487?usp=email )
(
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: Fix unset sapi in gsm48_rr_data_ind()
..
Fix unset sapi in gsm48_rr_data_ind()
The gsm48_rr_hdr is pushed into the message before sending data to
MM layer. SAPI was not set in this header.
Change-Id: I8345a562050d52d491f3b7192c979d455a63931c
---
M src/host/layer23/src/mobile/gsm48_rr.c
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index 0815777..df762d8 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -4727,6 +4727,8 @@
/* 3.4.2 data from layer 2 to RR and upper layer*/
static int gsm48_rr_data_ind(struct osmocom_ms *ms, struct msgb *msg)
{
+ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg);
+ uint8_t sapi = rllh->link_id & 7;
struct gsm48_hdr *gh = msgb_l3(msg);
struct gsm48_rr_hdr *rrh;
uint8_t pdisc = gh->proto_discr & 0x0f;
@@ -4792,6 +4794,7 @@
msgb_push(msg, sizeof(struct gsm48_rr_hdr));
rrh = (struct gsm48_rr_hdr *)msg->data;
rrh->msg_type = GSM48_RR_DATA_IND;
+ rrh->sapi = sapi;
return gsm48_rr_upmsg(ms, msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34487?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I8345a562050d52d491f3b7192c979d455a63931c
Gerrit-Change-Number: 34487
Gerrit-PatchSet: 10
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: ASCI: Add channel notification event to MM events
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34488?usp=email )
(
8 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Add channel notification event to MM events
..
ASCI: Add channel notification event to MM events
This is required to notify MM layer about new and ceased group and
broadcast calls.
Related: OS#5364
Change-Id: Ifee286ba4628356cc19b5dc75f1843287c5d2342
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/src/mobile/gsm48_mm.c
2 files changed, 27 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index 8ec1b7a..f185dba 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -161,12 +161,23 @@
#define GSM48_MM_EVENT_SYSINFO 14
#define GSM48_MM_EVENT_USER_PLMN_SEL 15
#define GSM48_MM_EVENT_LOST_COVERAGE 16
+#define GSM48_MM_EVENT_NOTIFICATION17
/* message for MM events */
struct gsm48_mm_event {
- uint32_tmsg_type;
+ uint32_tmsg_type;
- uint8_t sres[4];
+ union {
+ /* GSM48_MM_EVENT_AUTH_RESPONSE */
+ uint8_t sres[4];
+ /* GSM48_MM_EVENT_NOTIFICATION */
+ struct {
+ uint8_t gcr[5];
+ boolch_desc_present;
+ struct gsm48_chan_desc ch_desc;
+ boolgone;
+ } __attribute__((packed)) notification;
+ };
} __attribute__((packed));
/* GSM 04.08 MM timers */
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 488416d..cfdb4f5 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -577,6 +577,7 @@
{ GSM48_MM_EVENT_SYSINFO, "MM_EVENT_SYSINFO" },
{ GSM48_MM_EVENT_USER_PLMN_SEL, "MM_EVENT_USER_PLMN_SEL" },
{ GSM48_MM_EVENT_LOST_COVERAGE, "MM_EVENT_LOST_COVERAGE" },
+ { GSM48_MM_EVENT_NOTIFICATION, "MM_EVENT_NOTIFICATION" },
{ 0,NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34488?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ifee286ba4628356cc19b5dc75f1843287c5d2342
Gerrit-Change-Number: 34488
Gerrit-PatchSet: 10
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: ASCI: Add uplink free/busy event to MM events
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34489?usp=email )
(
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Add uplink free/busy event to MM events
..
ASCI: Add uplink free/busy event to MM events
Related: OS#5364
Change-Id: I3f8d97a0359ea9560d6d6bfd8238ddc6492c56e8
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index f185dba..67abc2f 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -162,6 +162,8 @@
#define GSM48_MM_EVENT_USER_PLMN_SEL 15
#define GSM48_MM_EVENT_LOST_COVERAGE 16
#define GSM48_MM_EVENT_NOTIFICATION17
+#define GSM48_MM_EVENT_UPLINK_FREE 18
+#define GSM48_MM_EVENT_UPLINK_BUSY 19
/* message for MM events */
struct gsm48_mm_event {
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34489?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I3f8d97a0359ea9560d6d6bfd8238ddc6492c56e8
Gerrit-Change-Number: 34489
Gerrit-PatchSet: 10
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-CC: pespin
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: ASCI: Add interface for group receive/transmit mode support to RR layer
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34528?usp=email )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Add interface for group receive/transmit mode support
to RR layer
..
ASCI: Add interface for group receive/transmit mode support to RR layer
This patch includes new messages and description. The are used to bring
RR layer into group receive mode and from there in group transmit mode
and back.
Related: OS#5364
Change-Id: I1abd56c63d15af1cff8bde7589a571cb5bb5506f
---
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/src/mobile/gsm48_rr.c
2 files changed, 48 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index fb07cc9..6bc2f28 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -23,6 +23,15 @@
#defineGSM48_RR_ABORT_REQ 0x60
#defineGSM48_RR_ABORT_IND 0x62
#defineGSM48_RR_ACT_REQ0x70
+/* These are non-stadard primitives, used for group receive/transmit modes. */
+#defineGSM48_RR_GROUP_REQ 0x80/* Join a group channel
in group receive mode. */
+#defineGSM48_RR_GROUP_CNF 0x81/* Group channel has
been joined. */
+#defineGSM48_RR_GROUP_REL_REQ 0x84/* Release group
channel. */
+#defineGSM48_RR_GROUP_REL_IND 0x86/* Group channel has
been released or failed. */
+#defineGSM48_RR_UPLINK_REQ 0x90/* Request uplink for
group transmit mode. */
+#defineGSM48_RR_UPLINK_CNF 0x91/* Access granted. */
+#defineGSM48_RR_UPLINK_REL_REQ 0x94/* Release uplink for
group receive mode. */
+#defineGSM48_RR_UPLINK_REL_IND 0x96/* Access denied or
failed or uplink released. */
#define RR_EST_CAUSE_EMERGENCY 1
#define RR_EST_CAUSE_REESTAB_TCH_F 2
@@ -45,6 +54,8 @@
#define RR_REL_CAUSE_EMERGENCY_ONLY6
#define RR_REL_CAUSE_LOST_SIGNAL 7
#define RR_REL_CAUSE_LINK_FAILURE 8
+#define RR_REL_CAUSE_UPLINK_BUSY 9
+#define RR_REL_CAUSE_UPLINK_REJECTED 10
#define RR_SYNC_CAUSE_CIPHERING1
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index df762d8..e5e2162 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -34,6 +34,21 @@
* When the assignment or handover fails, the old channel is activate and the
* link is established again. Also pending messages are sent.
*
+ * New primitives are invented for group/broadcast calls. They are not
+ * specified in any recommendation. They are:
+ *
+ * GSM48_MM_EVENT_NOTIFICATION: Notify MM layer about received/ceased call.
+ * GSM48_MM_EVENT_UPLINK_BUSY: Notify MM layer about uplink becoming busy.
+ * GSM48_MM_EVENT_UPLINK_FREE: Notify MM layer about uplink becoming free.
+ *
+ * RR_GROUP_REQ: The MM layer requests group channel in receive mode.
+ * RR_GROUP_CNF: The RR confirms group channel.
+ * RR_GROUP_REL_REQ: The MM layer releases group channel.
+ * RR_GROUP_REL_IND: The RR indicates/confirms release of group channel.
+ * RR_UPLINK_REQ: The MM layer requests uplink (group transmit mode).
+ * RR_UPLINK_CNF: The RR layer confirms uplink. (Uplink was granted.)
+ * RR_UPLINK_REL_REQ: The MM layer requests release of uplink.
+ * RR_UPLINK_REL_IND: The RR layer indicates/confirms release of uplink
*/
/* Testing delayed (immediate) assignment / handover
@@ -463,6 +478,14 @@
{ GSM48_RR_ABORT_REQ, "RR_ABORT_REQ" },
{ GSM48_RR_ABORT_IND, "RR_ABORT_IND" },
{ GSM48_RR_ACT_REQ, "RR_ACT_REQ" },
+ { GSM48_RR_GROUP_REQ, "RR_GROUP_REQ" },
+ { GSM48_RR_GROUP_CNF, "RR_GROUP_CNF" },
+ { GSM48_RR_GROUP_REL_REQ, "RR_GROUP_REL_REQ" },
+ { GSM48_RR_GROUP_REL_IND, "RR_GROUP_REL_IND" },
+ { GSM48_RR_UPLINK_REQ, "RR_UPLINK_REQ" },
+ { GSM48_RR_UPLINK_CNF, "RR_UPLINK_CNF" },
+ { GSM48_RR_UPLINK_REL_REQ, "RR_UPLINK_REL_REQ" },
+ { GSM48_RR_UPLINK_REL_IND, "RR_UPLINK_REL_IND" },
{ 0,NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34528?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I1abd56c63d15af1cff8bde7589a571cb5bb5506f
Gerrit-Ch
[S] Change in osmocom-bb[master]: Add header length check to received CCCH messages
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34555?usp=email )
Change subject: Add header length check to received CCCH messages
..
Add header length check to received CCCH messages
Change-Id: I3bc6b0b997e6ea1048c3357d276adfcc1638b02b
---
M src/host/layer23/src/mobile/gsm48_rr.c
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/34555/1
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index e5e2162..d725642 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -4856,6 +4856,11 @@
{
struct gsm48_system_information_type_header *sih = msgb_l3(msg);
+ if (msgb_l3len(msg) < sizeof(*sih)) {
+ LOGP(DRR, LOGL_NOTICE, "Short read of CCCH message.\n");
+ return -EINVAL;
+ }
+
switch (sih->system_information) {
case GSM48_MT_RR_PAG_REQ_1:
return gsm48_rr_rx_pag_req_1(ms, msg);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34555?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I3bc6b0b997e6ea1048c3357d276adfcc1638b02b
Gerrit-Change-Number: 34555
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: fixup ASCI: Add group receive and transmit mode support to MM laye
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34556?usp=email )
Change subject: fixup ASCI: Add group receive and transmit mode support to MM
laye
..
fixup ASCI: Add group receive and transmit mode support to MM laye
Change-Id: Ia6d0ac341b4b80199b344e04068ac152d7cc2ee7
---
M src/host/layer23/src/mobile/gsm48_mm.c
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/34556/1
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 809b777..b68cb38 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -4824,7 +4824,7 @@
GSM48_MM_EVENT_IMSI_DETACH, gsm48_mm_imsi_detach_start},
/* 4.2.2.7 Receiving Group Call (Normal service) */
- // There are event handlers for group call in this implementation.
+ // In this implementation, no events are allowed in this service state
while receiving a group call.
/* 4.2.2.2 Attempt to update / Loc. upd. needed */
{SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_ATTEMPT_UPDATE) |
@@ -4862,7 +4862,7 @@
GSM48_MM_EVENT_TIMEOUT_T3212, gsm48_mm_loc_upd_delay_per}, /* 4.4.2 */
/* 4.2.2.8 Receiving Group Call (Limited service) */
- // There are event handlers for group call in this implementation.
+ // In this implementation, no events are allowed in this service state
while receiving a group call.
/* 4.2.2.4 No IMSI */
/* 4.2.2.5 PLMN search, normal service */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34556?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ia6d0ac341b4b80199b344e04068ac152d7cc2ee7
Gerrit-Change-Number: 34556
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmo-mgw[master]: mgw: Configure IuUP if codec set during MDCX
Attention is currently required from: dexter, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email ) Change subject: mgw: Configure IuUP if codec set during MDCX .. Patch Set 1: Verified+1 Code-Review+1 (1 comment) Patchset: PS1: I've verified that this fixes the issue reported in SYS#6578 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 Gerrit-Change-Number: 34548 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 28 Sep 2023 09:40:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind
Attention is currently required from: fixeria, keith, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34446?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34446 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: keith Gerrit-Comment-Date: Thu, 28 Sep 2023 09:59:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable .. Patch Set 1: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/177916e8_98a21a27 PS1, Line 1447: no ncc-permitted > ACK, I also found it a bit confusing and I was expecting some "all" value. I see how "no ncc-permitted" meaning all is confusing. I'll add "ncc-permitted all" instead. Regarding "no ncc-permitted 2" syntax: I think this will also be confusing when used in combination with ncc-permitted without "no" or when used multiple times, e.g.: ``` ncc-permitted 2 3 4 5 no ncc-permitted 2 no ncc-permitted 3 ``` It's not clear for users reading the config what will happen here, it could be implemented as resulting in "ncc-permitted 1 2 4 5 6 7 8" or resulting in "ncc-permitted 4 5". Therefore I think it's best to not add "no ncc-permitted" for disabling specific NCC values. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 28 Sep 2023 10:10:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-e1d[master]: Automatically reset RIFO on underrun/overflow
Attention is currently required from: jolly, laforge.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email )
Change subject: Automatically reset RIFO on underrun/overflow
..
Patch Set 1:
(3 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/545e43dd_8de573c1
PS1, Line 18: twice the value of max_frame_count. It specifies when the RIFO
will
max_frame_count is set to twice the value of max_frame_count? Sounds wrong.
File src/octoi/e1oip.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/3bde4046_34241e5f
PS1, Line 272: if (rc < 0) {
did you think about returning a specific error code to signal this exact error?
like -ERANGE.
File src/octoi/frame_rifo.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/34554/comment/d375c806_1eb31ddd
PS1, Line 106: int frame_rifo_in(struct frame_rifo *rifo, const uint8_t *frame,
uint32_t fn, int max_frame_count)
can max_frame_count be negative? unsigned?
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34554?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Id7ccbfbdb288990c01f185dec79a1022a68b4748
Gerrit-Change-Number: 34554
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: pespin
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Comment-Date: Thu, 28 Sep 2023 10:31:47 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Add header length check to received CCCH messages
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34555?usp=email ) Change subject: Add header length check to received CCCH messages .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34555?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3bc6b0b997e6ea1048c3357d276adfcc1638b02b Gerrit-Change-Number: 34555 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 28 Sep 2023 10:33:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: fixup ASCI: Add group receive and transmit mode support to MM laye
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34556?usp=email ) Change subject: fixup ASCI: Add group receive and transmit mode support to MM laye .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34556?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia6d0ac341b4b80199b344e04068ac152d7cc2ee7 Gerrit-Change-Number: 34556 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Thu, 28 Sep 2023 10:34:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgw: Configure IuUP if codec set during MDCX
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email ) Change subject: mgw: Configure IuUP if codec set during MDCX .. mgw: Configure IuUP if codec set during MDCX The mgcp client may first configure the connection to use RTP-AMR, but after setting up another call leg may find out that both legs are IuUP and hence want to forward the IuUP between the 2 connections instead. In that case, an MDCX with codec VND.3GPP.IUFP would be set. Until now, osmo-mgw didn't take that scenario into account, and it was only upgrading the rtp conn to iuup internally during CRCX. As a result, in the mentioned scenario osmo-mgw would continue to output RTP instead of IuUP after the MDCX with VND.3GPP.IUFP, which is wrong. Related: SYS#6578 Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve; Verified Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 7795734..809622b 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1293,6 +1293,10 @@ error_code = rc; goto error3; } + /* Upgrade the conn type RTP_DEFAULT->RTP_IUUP if needed based on requested codec: */ + /* TODO: "codec" probably needs to be moved from endp to conn */ + if (conn->type == MGCP_RTP_DEFAULT && strcmp(conn->end.codec->subtype_name, "VND.3GPP.IUFP") == 0) + rc = mgcp_conn_iuup_init(conn); /* check connection mode setting */ if (conn->conn->mode != MGCP_CONN_LOOPBACK -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 Gerrit-Change-Number: 34548 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-mgw[master]: mgw: Configure IuUP if codec set during MDCX
Attention is currently required from: dexter, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email ) Change subject: mgw: Configure IuUP if codec set during MDCX .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34548?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 Gerrit-Change-Number: 34548 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 28 Sep 2023 10:59:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[osmith/1.11.1]: CC: don't start guard timer on mid-call MNCC messages
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/34559?usp=email )
Change subject: CC: don't start guard timer on mid-call MNCC messages
..
CC: don't start guard timer on mid-call MNCC messages
The intent of the guard timer is to clear hung or stuck states
during call setup or teardown. However, there are some MNCC
messages that will be exchanged between OsmoMSC (passing CC
messages to and from the MS) and the external MNCC agent during
the active call state, not related to setup or teardown: DTMF
start and stop, plus call hold and retrieve operations for call
waiting. Unpatched OsmoMSC restarts the guard timer on every
received MNCC message, even those that pass through to CC without
affecting any state, and the result is breakage for users.
Consider the case of an IVR where you have to press some DTMF keys
before you can be transferred to a human operator. You press the
needed keys, get the human operator, and start talking. Then
3 minutes into your conversion (default guard timer duration)
your call unceremoniously disconnects without any warning.
Fix: look at the MNCC message type, and skip the call to start
the guard timer for known-benign MNCC messages.
Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa
---
M src/libmsc/gsm_04_08_cc.c
1 file changed, 49 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/34559/1
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 6148bbd..1e2c5af 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -2383,7 +2383,27 @@
log_mncc_rx_tx(trans, "rx", msg);
- gsm48_start_guard_timer(trans);
+ /*
+* The step of gsm48_start_guard_timer() needs to be done for
+* major state-impacting MNCC messages, but not for those
+* that are a mere pass-through to CC messages to MS.
+*/
+ switch (msg->msg_type) {
+ case MNCC_PROGRESS_REQ:
+ case MNCC_NOTIFY_REQ:
+ case MNCC_FACILITY_REQ:
+ case MNCC_START_DTMF_RSP:
+ case MNCC_START_DTMF_REJ:
+ case MNCC_STOP_DTMF_RSP:
+ case MNCC_HOLD_CNF:
+ case MNCC_HOLD_REJ:
+ case MNCC_RETRIEVE_CNF:
+ case MNCC_RETRIEVE_REJ:
+ case MNCC_USERINFO_REQ:
+ break;
+ default:
+ gsm48_start_guard_timer(trans);
+ }
trans->cc.mncc_initiated = true;
if (trans->msc_a)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34559?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa
Gerrit-Change-Number: 34559
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-CC: falconia
Gerrit-MessageType: newchange
[S] Change in osmo-msc[osmith/1.11.1]: make two functions static
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/34558?usp=email )
Change subject: make two functions static
..
make two functions static
Change-Id: I1de0f35f1606c99f34bbf4033e069aadbc64
---
M include/osmocom/msc/mncc.h
M src/libmsc/gsm_04_08_cc.c
M src/osmo-msc/msc_main.c
3 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/58/34558/1
diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h
index 8a1e4ad..c8f3bfd 100644
--- a/include/osmocom/msc/mncc.h
+++ b/include/osmocom/msc/mncc.h
@@ -219,7 +219,6 @@
const char *get_mncc_name(int value);
void mncc_set_cause(struct gsm_mncc *data, int loc, int val);
-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);
/* input from CC code into mncc_builtin */
int int_mncc_recv(struct gsm_network *net, struct msgb *msg);
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 5908db9..6148bbd 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -129,7 +129,7 @@
/* Call Control */
-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
+static void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
{
net->mncc_recv(net, msg);
}
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 9808e86..913bd21 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -242,8 +242,8 @@
}
}
-struct gsm_network *msc_network_alloc(void *ctx,
- mncc_recv_cb_t mncc_recv)
+static struct gsm_network *msc_network_alloc(void *ctx,
+mncc_recv_cb_t mncc_recv)
{
struct gsm_network *net = gsm_network_init(ctx, mncc_recv);
if (!net)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34558?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I1de0f35f1606c99f34bbf4033e069aadbc64
Gerrit-Change-Number: 34558
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[M] Change in osmo-msc[osmith/1.11.1]: fix codecs in internal call bridge
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/34557?usp=email )
Change subject: fix codecs in internal call bridge
..
fix codecs in internal call bridge
This is a fixup for the patch
'3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G'
I386a6a426c318040b019ab5541689c67e94672a1
After above patch, osmo-msc intelligently decides which codecs to run on
which legs of the RTP streams. In the meantime, it seems the necessary
matching changes to call_leg_local_bridge() had been lost somehow.
Testing 3G to 3G voice now, I noticed that call_leg_local_bridge()
overwrites the intelligent choices made earlier.
The history of an MGW endpoint that should convert from IUFP to plain
AMR, extracted from a pcap, looks like this:
<- CRCX None None
-> CRCX-OK audio 4050 RTP/AVP 112 None
<- MDCX audio 4056 RTP/AVP 112 AMR
-> MDCX-OK audio 4050 RTP/AVP 112 AMR
<- MDCX audio 4056 RTP/AVP 96 VND.3GPP.IUFP
-> MDCX-OK audio 4050 RTP/AVP 96 VND.3GPP.IUFP
So after call_leg_local_bridge(), there is an extra MDCX + MDCX-OK that
switches the codec from 112 AMR back to 96 IUFP.
That is because call_leg_local_bridge() copies the *RAN* side's codec to
both CN sides, which used to be ok when RAN and CN codecs were always
identical.
Instead, adjust only the CN sides of the MGW endpoints, and adjust them
so that both CN sides are identical. osmo-mgw should then be able to
trivially translate the codecs appropriately.
Change-Id: I130bcd77ec57e332370c487a11b0b973b6e1089d
---
M src/libmsc/call_leg.c
1 file changed, 73 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/34557/1
diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c
index d0dc642..b797322 100644
--- a/src/libmsc/call_leg.c
+++ b/src/libmsc/call_leg.c
@@ -352,25 +352,46 @@
int call_leg_local_bridge(struct call_leg *cl1, uint32_t call_id1, struct
gsm_trans *trans1,
struct call_leg *cl2, uint32_t call_id2, struct
gsm_trans *trans2)
{
- struct sdp_audio_codecs *codecs;
+ struct sdp_audio_codecs *cn_codecs = NULL;
cl1->local_bridge = cl2;
cl2->local_bridge = cl1;
- /* We may just copy the codec info we have for the RAN side of the
first leg to the CN side of both legs. This
-* also means that if both legs use different codecs the MGW must
perform transcoding on the second leg. */
- if (!cl1->rtp[RTP_TO_RAN] || !cl1->rtp[RTP_TO_RAN]->codecs_known) {
- LOG_CALL_LEG(cl1, LOGL_ERROR, "RAN-side RTP stream codec is not
known, not ready for bridging\n");
+ /* Marry the two CN sides of the call legs. Call establishment should
have made all efforts for these to be
+* compatible. However, for local bridging, the codecs and payload type
numbers must be exactly identical on
+* both sides. Both sides may so far have different payload type
numbers or slightly differing codecs, but it
+* will only work when the SDP on the RTP_TO_CN sides of the call legs
talk the same payload type numbers.
+* So, simply take the SDP from one RTP_TO_CN side, and overwrite the
other RTP_TO_CN side's SDP with it.
+* If all goes to plan, the codecs will be identical, or possibly the
MGW will do a conversion like AMR-BE to
+* AMR-OA. In the worst case, the other call leg cannot transcode, and
the call fails -- because codec
+* negotiation did not do a good enough job.
+*
+* Copy one call leg's CN config to the other:
+*
+* call leg 1 call leg 2
+* ---MGW-ep--- ---MGW-ep---
+* RAN CNCN RAN
+* AMR:112 AMR:112 AMR:96 AMR:96
+* |
+* +---+
+* |
+* V
+* AMR:112 AMR:112 AMR:112 AMR:96
+* ^MGW-endpoint converts payload type
numbers between 112 and 96.
+*/
+ if (cl1->rtp[RTP_TO_CN] && cl1->rtp[RTP_TO_CN]->codecs_known)
+ cn_codecs = &cl1->rtp[RTP_TO_CN]->codecs;
+ else if (cl2->rtp[RTP_TO_CN] && cl2->rtp[RTP_TO_CN]->codecs_known)
+ cn_codecs = &cl2->rtp[RTP_TO_CN]->codecs;
+ if (!cn_codecs) {
+ LOG_CALL_LEG(cl1, LOGL_ERROR, "RAN-side CN stream codec is not
known, not ready for bridging\n");
+ LOG_CALL_LEG(cl2, LOGL_ERROR, "RAN-side CN stream codec is not
known, not ready for bridging\n");
return -EINVAL;
}
- codecs = &cl1->rtp[RTP_TO_RAN]->codecs;
-
- if (!cl1->rtp[RTP_TO_CN] || !cl2->rtp[RTP_TO_CN])
- return -ENOTCONN;
call_leg_ensure_ci(cl1, RTP_TO_CN, call_id1, trans1,
- codecs, &cl2->rtp[RTP_TO_CN]->local);
+
[S] Change in osmo-msc[osmith/1.11.1]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/34560?usp=email )
Change subject: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel
handling
..
ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling
Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d
Related: OS#4854
---
M src/libmsc/msc_vgcs.c
1 file changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/34560/1
diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c
index f3867fe..772a9e3 100644
--- a/src/libmsc/msc_vgcs.c
+++ b/src/libmsc/msc_vgcs.c
@@ -2508,14 +2508,6 @@
LOG_CELL(cell, LOGL_NOTICE, "Received VGCS/VBS ASSIGNMENT
FAILURE from BSS.\n");
channel_fail:
bss = cell->bss;
- /* Remove cell. */
- tx_ran_msg = (struct ran_msg){
- .msg_type = RAN_MSG_CLEAR_COMMAND,
- .clear_command = {
- .gsm0808_cause =
GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC,
- },
- };
- ran_encode_and_send(fi, &tx_ran_msg, cell->conn, false);
cell_clear(cell,
GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC);
/* Notify BSS FSM about channel failure. */
if (bss)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34560?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d
Gerrit-Change-Number: 34560
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-CC: jolly
Gerrit-CC: laforge
Gerrit-MessageType: newchange
[S] Change in osmo-msc[osmith/1.11.1]: gsup_client_mux: set destination_name in error reply function
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34561?usp=email ) Change subject: gsup_client_mux: set destination_name in error reply function .. gsup_client_mux: set destination_name in error reply function If the GSUP request message to which we are replying is an MT SMS delivery from an SMSC relayed via OsmoHLR, we must set destination_name in our reply - otherwise our reply won't make it back to the SMSC. Related: OS#6135 Change-Id: I892fe87a733a78ed9d5761a8ce238caa135dea1e --- M src/libmsc/gsup_client_mux.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/34561/1 diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c index 1900377..9a0dc16 100644 --- a/src/libmsc/gsup_client_mux.c +++ b/src/libmsc/gsup_client_mux.c @@ -150,6 +150,8 @@ .cause = cause, .message_type = OSMO_GSUP_TO_MSGT_ERROR(gsup_orig->message_type), .message_class = gsup_orig->message_class, + .destination_name = gsup_orig->source_name, + .destination_name_len = gsup_orig->source_name_len, /* RP-Message-Reference is mandatory for SM Service */ .sm_rp_mr = gsup_orig->sm_rp_mr, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34561?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I892fe87a733a78ed9d5761a8ce238caa135dea1e Gerrit-Change-Number: 34561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: falconia Gerrit-MessageType: newchange
[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: set source_name in GSUP reply messages
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/34563?usp=email )
Change subject: SMS over GSUP: set source_name in GSUP reply messages
..
SMS over GSUP: set source_name in GSUP reply messages
For MO-forwardSM and MT-forwardSM request messages, OsmoHLR applies
routing based on the SMSC address for MO or based on the IMSI for MT.
However, reply messages following these requests are routed passively
based on the destination_name IE. This passive message routing path
requires the source_name IE to be set as well - implement this
source_name setting.
Related: OS#6135
Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701
---
M include/osmocom/msc/gsup_client_mux.h
M src/libmsc/gsm_04_11_gsup.c
M src/libmsc/gsup_client_mux.c
3 files changed, 40 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/34563/1
diff --git a/include/osmocom/msc/gsup_client_mux.h
b/include/osmocom/msc/gsup_client_mux.h
index 07f17c2..501b81d 100644
--- a/include/osmocom/msc/gsup_client_mux.h
+++ b/include/osmocom/msc/gsup_client_mux.h
@@ -28,6 +28,7 @@
struct ipaccess_unit *ipa_dev);
int gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct
osmo_gsup_message *gsup_msg);
+void gsup_client_mux_tx_set_source(const struct gsup_client_mux *gcm, struct
osmo_gsup_message *gsup_msg);
void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct
osmo_gsup_message *gsup_orig,
enum gsm48_gmm_cause cause);
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 6225c6c..d1c2f27 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -201,6 +201,7 @@
/* Ensure routing through OsmoHLR to the MT-sending SMSC */
gsup_msg.destination_name = trans->sms.gsup_source_name;
gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+ gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg);
return gsup_client_mux_tx(trans->net->gcm, &gsup_msg);
}
@@ -222,6 +223,7 @@
/* Ensure routing through OsmoHLR to the MT-sending SMSC */
gsup_msg.destination_name = trans->sms.gsup_source_name;
gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+ gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg);
/* SM-RP-Cause value */
gsup_msg.sm_rp_cause = &cause;
diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c
index 9a0dc16..1a3611f 100644
--- a/src/libmsc/gsup_client_mux.c
+++ b/src/libmsc/gsup_client_mux.c
@@ -136,6 +136,25 @@
return osmo_gsup_client_send(gcm->gsup_client, msg);
}
+/* Set GSUP source_name to our local IPA name */
+void gsup_client_mux_tx_set_source(const struct gsup_client_mux *gcm,
+ struct osmo_gsup_message *gsup_msg)
+{
+ const char *local_msc_name;
+
+ if (!gcm)
+ return;
+ if (!gcm->gsup_client)
+ return;
+ if (!gcm->gsup_client->ipa_dev)
+ return;
+ local_msc_name = gcm->gsup_client->ipa_dev->serno;
+ if (!local_msc_name)
+ return;
+ gsup_msg->source_name = (const uint8_t *) local_msc_name;
+ gsup_msg->source_name_len = strlen(local_msc_name) + 1;
+}
+
/* Transmit GSUP error in response to original message */
void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct
osmo_gsup_message *gsup_orig,
enum gsm48_gmm_cause cause)
@@ -158,6 +177,7 @@
};
OSMO_STRLCPY_ARRAY(gsup_reply.imsi, gsup_orig->imsi);
+ gsup_client_mux_tx_set_source(gcm, &gsup_reply);
/* For SS/USSD, it's important to keep both session state and ID IEs */
if (gsup_orig->session_state != OSMO_GSUP_SESSION_STATE_NONE) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34563?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701
Gerrit-Change-Number: 34563
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-CC: falconia
Gerrit-MessageType: newchange
[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: correctly route GSUP responses to MT SMS
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/34562?usp=email )
Change subject: SMS over GSUP: correctly route GSUP responses to MT SMS
..
SMS over GSUP: correctly route GSUP responses to MT SMS
When OsmoMSC is used with OsmoHLR rather than a GSUP-to-MAP gateway,
MT-forwardSM.req GSUP messages delivering MT SMS will be coming from
a separate SMSC relayed via OsmoHLR, rather than from OsmoHLR itself.
When we reply to these messages, in order for these replies to reach
the MT-sending SMSC via OsmoHLR, we need to save source_name from
the request and regurgitate it into destination_name in our response
messages. Implement this logic.
Related: OS#6135
Change-Id: I436e333035b8f6e27f86a49fe293ea48ea07a013
---
M include/osmocom/msc/gsm_04_11.h
M include/osmocom/msc/transaction.h
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_04_11_gsup.c
4 files changed, 46 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/62/34562/1
diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h
index 19aaa3a..17a31ec 100644
--- a/include/osmocom/msc/gsm_04_11.h
+++ b/include/osmocom/msc/gsm_04_11.h
@@ -28,7 +28,8 @@
int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub,
size_t sm_rp_oa_len, const uint8_t *sm_rp_oa,
size_t sm_rp_ud_len, const uint8_t *sm_rp_ud,
- bool sm_rp_mmts_ind);
+ bool sm_rp_mmts_ind, const uint8_t *gsup_source_name,
+ size_t gsup_source_name_len);
void gsm411_sapi_n_reject(struct msc_a *msc_a);
diff --git a/include/osmocom/msc/transaction.h
b/include/osmocom/msc/transaction.h
index a5a2e84..aa529e4 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -149,6 +149,9 @@
bool sm_rp_mmts_ind;
struct gsm_sms *sms;
+
+ uint8_t *gsup_source_name;
+ size_t gsup_source_name_len;
} sms;
struct {
/**
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index adc9d88..aa87a19 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -1230,7 +1230,8 @@
int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub,
size_t sm_rp_oa_len, const uint8_t *sm_rp_oa,
size_t sm_rp_ud_len, const uint8_t *sm_rp_ud,
- bool sm_rp_mmts_ind)
+ bool sm_rp_mmts_ind, const uint8_t *gsup_source_name,
+ size_t gsup_source_name_len)
{
struct gsm_trans *trans;
struct msgb *msg;
@@ -1245,6 +1246,17 @@
if (trans->msc_a != NULL)
gsm411_handle_mmts_ind(trans);
+ /* Save GSUP source_name for subsequent response messages */
+ if (gsup_source_name && gsup_source_name_len) {
+ trans->sms.gsup_source_name = talloc_memdup(trans,
gsup_source_name,
+
gsup_source_name_len);
+ if (!trans->sms.gsup_source_name) {
+ trans_free(trans);
+ return -ENOMEM;
+ }
+ trans->sms.gsup_source_name_len = gsup_source_name_len;
+ }
+
/* Allocate a message buffer for to be encoded SMS */
msg = gsm411_msgb_alloc();
if (!msg) {
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 0f18912..6225c6c 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -198,6 +198,10 @@
gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT,
trans->vsub->imsi, &sm_rp_mr);
+ /* Ensure routing through OsmoHLR to the MT-sending SMSC */
+ gsup_msg.destination_name = trans->sms.gsup_source_name;
+ gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+
return gsup_client_mux_tx(trans->net->gcm, &gsup_msg);
}
@@ -215,6 +219,10 @@
gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR,
trans->vsub->imsi, &sm_rp_mr);
+ /* Ensure routing through OsmoHLR to the MT-sending SMSC */
+ gsup_msg.destination_name = trans->sms.gsup_source_name;
+ gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+
/* SM-RP-Cause value */
gsup_msg.sm_rp_cause = &cause;
@@ -259,7 +267,8 @@
rc = gsm411_send_rp_data(net, vsub,
gsup_msg->sm_rp_oa_len, gsup_msg->sm_rp_oa,
gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui,
- sm_rp_mmts_ind);
+ sm_rp_mmts_ind, gsup_msg->source_name,
+ gsup_msg->source_name_len);
if (rc) {
LOGP(DLSMS, LOGL_NOTICE, "Failed to send MT SMS
[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34564?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Bump version: 1.11.0.7-dbe88 → 1.11.1 Change-Id: I4e8e6bd096010e8ada42827599a7236e0fa98629 --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/64/34564/1 diff --git a/debian/changelog b/debian/changelog index fe631a2..3d5af2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-msc (1.11.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix codecs in internal call bridge + * make two functions static + + [ Mychaela N. Falconia ] + * CC: don't start guard timer on mid-call MNCC messages + * gsup_client_mux: set destination_name in error reply function + * SMS over GSUP: correctly route GSUP responses to MT SMS + * SMS over GSUP: set source_name in GSUP reply messages + + [ Andreas Eversberg ] + * ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling + + -- Oliver Smith Thu, 28 Sep 2023 13:20:23 +0200 + osmo-msc (1.11.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34564?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I4e8e6bd096010e8ada42827599a7236e0fa98629 Gerrit-Change-Number: 34564 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-mgw[osmith/1.12.1]: mgw: Configure IuUP if codec set during MDCX
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34566?usp=email ) Change subject: mgw: Configure IuUP if codec set during MDCX .. mgw: Configure IuUP if codec set during MDCX The mgcp client may first configure the connection to use RTP-AMR, but after setting up another call leg may find out that both legs are IuUP and hence want to forward the IuUP between the 2 connections instead. In that case, an MDCX with codec VND.3GPP.IUFP would be set. Until now, osmo-mgw didn't take that scenario into account, and it was only upgrading the rtp conn to iuup internally during CRCX. As a result, in the mentioned scenario osmo-mgw would continue to output RTP instead of IuUP after the MDCX with VND.3GPP.IUFP, which is wrong. Related: SYS#6578 Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 (cherry picked from commit 58d5b97831a9307737606809eeb013533dd9afb7) --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/66/34566/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 7795734..809622b 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1293,6 +1293,10 @@ error_code = rc; goto error3; } + /* Upgrade the conn type RTP_DEFAULT->RTP_IUUP if needed based on requested codec: */ + /* TODO: "codec" probably needs to be moved from endp to conn */ + if (conn->type == MGCP_RTP_DEFAULT && strcmp(conn->end.codec->subtype_name, "VND.3GPP.IUFP") == 0) + rc = mgcp_conn_iuup_init(conn); /* check connection mode setting */ if (conn->conn->mode != MGCP_CONN_LOOPBACK -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34566?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 Gerrit-Change-Number: 34566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-MessageType: newchange
[S] Change in osmo-mgw[osmith/1.12.1]: mgcp-client: Fix missing include in mgcp_client_pool.h
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34565?usp=email ) Change subject: mgcp-client: Fix missing include in mgcp_client_pool.h .. mgcp-client: Fix missing include in mgcp_client_pool.h struct vty is used as a param but it is never defined. Change-Id: Ia27bb20a79966cb90e04720462d24a236a168ada (cherry picked from commit c415ed511372ba909e95e33845c65804ac50a182) --- M include/osmocom/mgcp_client/mgcp_client_pool.h 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/34565/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_pool.h b/include/osmocom/mgcp_client/mgcp_client_pool.h index ba31fb0..726eea1 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool.h @@ -2,6 +2,8 @@ #include +#include + struct mgcp_client; struct mgcp_client_pool; struct mgcp_client_pool_member; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Ia27bb20a79966cb90e04720462d24a236a168ada Gerrit-Change-Number: 34565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-MessageType: newchange
[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.2-23174 → 1.12.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34567?usp=email ) Change subject: Bump version: 1.12.0.2-23174 → 1.12.1 .. Bump version: 1.12.0.2-23174 → 1.12.1 Change-Id: Iad12bb6378775074ec4be7f655b6ca8c57c7374f --- M debian/changelog 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/67/34567/1 diff --git a/debian/changelog b/debian/changelog index 4b7cef6..179bef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +osmo-mgw (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * mgcp-client: Fix missing include in mgcp_client_pool.h + * mgw: Configure IuUP if codec set during MDCX + + -- Oliver Smith Thu, 28 Sep 2023 13:32:16 +0200 + osmo-mgw (1.12.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34567?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Iad12bb6378775074ec4be7f655b6ca8c57c7374f Gerrit-Change-Number: 34567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[M] Change in osmo-msc[osmith/1.11.1]: fix codecs in internal call bridge
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34557?usp=email ) Change subject: fix codecs in internal call bridge .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34557?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I130bcd77ec57e332370c487a11b0b973b6e1089d Gerrit-Change-Number: 34557 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: make two functions static
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34558?usp=email ) Change subject: make two functions static .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34558?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I1de0f35f1606c99f34bbf4033e069aadbc64 Gerrit-Change-Number: 34558 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[M] Change in osmo-msc[osmith/1.11.1]: CC: don't start guard timer on mid-call MNCC messages
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34559?usp=email ) Change subject: CC: don't start guard timer on mid-call MNCC messages .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34559?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa Gerrit-Change-Number: 34559 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: gsup_client_mux: set destination_name in error reply function
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34561?usp=email ) Change subject: gsup_client_mux: set destination_name in error reply function .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34561?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I892fe87a733a78ed9d5761a8ce238caa135dea1e Gerrit-Change-Number: 34561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: correctly route GSUP responses to MT SMS
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34562?usp=email ) Change subject: SMS over GSUP: correctly route GSUP responses to MT SMS .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34562?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I436e333035b8f6e27f86a49fe293ea48ea07a013 Gerrit-Change-Number: 34562 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34564?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34564?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I4e8e6bd096010e8ada42827599a7236e0fa98629 Gerrit-Change-Number: 34564 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: set source_name in GSUP reply messages
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34563?usp=email ) Change subject: SMS over GSUP: set source_name in GSUP reply messages .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701 Gerrit-Change-Number: 34563 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34560?usp=email ) Change subject: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34560?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d Gerrit-Change-Number: 34560 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly Gerrit-CC: laforge Gerrit-MessageType: abandon
[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.2-23174 → 1.12.1
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34567?usp=email ) Change subject: Bump version: 1.12.0.2-23174 → 1.12.1 .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34567?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Iad12bb6378775074ec4be7f655b6ca8c57c7374f Gerrit-Change-Number: 34567 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-mgw[osmith/1.12.1]: mgw: Configure IuUP if codec set during MDCX
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34566?usp=email ) Change subject: mgw: Configure IuUP if codec set during MDCX .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34566?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Ic94bf90f54d8ba3e65a2cd52734867847f3a60c2 Gerrit-Change-Number: 34566 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: abandon
[S] Change in osmo-mgw[osmith/1.12.1]: mgcp-client: Fix missing include in mgcp_client_pool.h
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34565?usp=email ) Change subject: mgcp-client: Fix missing include in mgcp_client_pool.h .. Abandoned making a patch release on top of master instead -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34565?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Ia27bb20a79966cb90e04720462d24a236a168ada Gerrit-Change-Number: 34565 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: abandon
[M] Change in osmo-msc[osmith/1.11.1]: CC: don't start guard timer on mid-call MNCC messages
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34559?usp=email )
Change subject: CC: don't start guard timer on mid-call MNCC messages
..
CC: don't start guard timer on mid-call MNCC messages
The intent of the guard timer is to clear hung or stuck states
during call setup or teardown. However, there are some MNCC
messages that will be exchanged between OsmoMSC (passing CC
messages to and from the MS) and the external MNCC agent during
the active call state, not related to setup or teardown: DTMF
start and stop, plus call hold and retrieve operations for call
waiting. Unpatched OsmoMSC restarts the guard timer on every
received MNCC message, even those that pass through to CC without
affecting any state, and the result is breakage for users.
Consider the case of an IVR where you have to press some DTMF keys
before you can be transferred to a human operator. You press the
needed keys, get the human operator, and start talking. Then
3 minutes into your conversion (default guard timer duration)
your call unceremoniously disconnects without any warning.
Fix: look at the MNCC message type, and skip the call to start
the guard timer for known-benign MNCC messages.
Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa
---
M src/libmsc/gsm_04_08_cc.c
1 file changed, 49 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 6148bbd..1e2c5af 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -2383,7 +2383,27 @@
log_mncc_rx_tx(trans, "rx", msg);
- gsm48_start_guard_timer(trans);
+ /*
+* The step of gsm48_start_guard_timer() needs to be done for
+* major state-impacting MNCC messages, but not for those
+* that are a mere pass-through to CC messages to MS.
+*/
+ switch (msg->msg_type) {
+ case MNCC_PROGRESS_REQ:
+ case MNCC_NOTIFY_REQ:
+ case MNCC_FACILITY_REQ:
+ case MNCC_START_DTMF_RSP:
+ case MNCC_START_DTMF_REJ:
+ case MNCC_STOP_DTMF_RSP:
+ case MNCC_HOLD_CNF:
+ case MNCC_HOLD_REJ:
+ case MNCC_RETRIEVE_CNF:
+ case MNCC_RETRIEVE_REJ:
+ case MNCC_USERINFO_REQ:
+ break;
+ default:
+ gsm48_start_guard_timer(trans);
+ }
trans->cc.mncc_initiated = true;
if (trans->msc_a)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34559?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa
Gerrit-Change-Number: 34559
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: falconia
Gerrit-MessageType: merged
[M] Change in osmo-msc[osmith/1.11.1]: fix codecs in internal call bridge
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34557?usp=email )
Change subject: fix codecs in internal call bridge
..
fix codecs in internal call bridge
This is a fixup for the patch
'3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G'
I386a6a426c318040b019ab5541689c67e94672a1
After above patch, osmo-msc intelligently decides which codecs to run on
which legs of the RTP streams. In the meantime, it seems the necessary
matching changes to call_leg_local_bridge() had been lost somehow.
Testing 3G to 3G voice now, I noticed that call_leg_local_bridge()
overwrites the intelligent choices made earlier.
The history of an MGW endpoint that should convert from IUFP to plain
AMR, extracted from a pcap, looks like this:
<- CRCX None None
-> CRCX-OK audio 4050 RTP/AVP 112 None
<- MDCX audio 4056 RTP/AVP 112 AMR
-> MDCX-OK audio 4050 RTP/AVP 112 AMR
<- MDCX audio 4056 RTP/AVP 96 VND.3GPP.IUFP
-> MDCX-OK audio 4050 RTP/AVP 96 VND.3GPP.IUFP
So after call_leg_local_bridge(), there is an extra MDCX + MDCX-OK that
switches the codec from 112 AMR back to 96 IUFP.
That is because call_leg_local_bridge() copies the *RAN* side's codec to
both CN sides, which used to be ok when RAN and CN codecs were always
identical.
Instead, adjust only the CN sides of the MGW endpoints, and adjust them
so that both CN sides are identical. osmo-mgw should then be able to
trivially translate the codecs appropriately.
Change-Id: I130bcd77ec57e332370c487a11b0b973b6e1089d
---
M src/libmsc/call_leg.c
1 file changed, 73 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c
index d0dc642..b797322 100644
--- a/src/libmsc/call_leg.c
+++ b/src/libmsc/call_leg.c
@@ -352,25 +352,46 @@
int call_leg_local_bridge(struct call_leg *cl1, uint32_t call_id1, struct
gsm_trans *trans1,
struct call_leg *cl2, uint32_t call_id2, struct
gsm_trans *trans2)
{
- struct sdp_audio_codecs *codecs;
+ struct sdp_audio_codecs *cn_codecs = NULL;
cl1->local_bridge = cl2;
cl2->local_bridge = cl1;
- /* We may just copy the codec info we have for the RAN side of the
first leg to the CN side of both legs. This
-* also means that if both legs use different codecs the MGW must
perform transcoding on the second leg. */
- if (!cl1->rtp[RTP_TO_RAN] || !cl1->rtp[RTP_TO_RAN]->codecs_known) {
- LOG_CALL_LEG(cl1, LOGL_ERROR, "RAN-side RTP stream codec is not
known, not ready for bridging\n");
+ /* Marry the two CN sides of the call legs. Call establishment should
have made all efforts for these to be
+* compatible. However, for local bridging, the codecs and payload type
numbers must be exactly identical on
+* both sides. Both sides may so far have different payload type
numbers or slightly differing codecs, but it
+* will only work when the SDP on the RTP_TO_CN sides of the call legs
talk the same payload type numbers.
+* So, simply take the SDP from one RTP_TO_CN side, and overwrite the
other RTP_TO_CN side's SDP with it.
+* If all goes to plan, the codecs will be identical, or possibly the
MGW will do a conversion like AMR-BE to
+* AMR-OA. In the worst case, the other call leg cannot transcode, and
the call fails -- because codec
+* negotiation did not do a good enough job.
+*
+* Copy one call leg's CN config to the other:
+*
+* call leg 1 call leg 2
+* ---MGW-ep--- ---MGW-ep---
+* RAN CNCN RAN
+* AMR:112 AMR:112 AMR:96 AMR:96
+* |
+* +---+
+* |
+* V
+* AMR:112 AMR:112 AMR:112 AMR:96
+* ^MGW-endpoint converts payload type
numbers between 112 and 96.
+*/
+ if (cl1->rtp[RTP_TO_CN] && cl1->rtp[RTP_TO_CN]->codecs_known)
+ cn_codecs = &cl1->rtp[RTP_TO_CN]->codecs;
+ else if (cl2->rtp[RTP_TO_CN] && cl2->rtp[RTP_TO_CN]->codecs_known)
+ cn_codecs = &cl2->rtp[RTP_TO_CN]->codecs;
+ if (!cn_codecs) {
+ LOG_CALL_LEG(cl1, LOGL_ERROR, "RAN-side CN stream codec is not
known, not ready for bridging\n");
+ LOG_CALL_LEG(cl2, LOGL_ERROR, "RAN-side CN stream codec is not
known, not ready for bridging\n");
return -EINVAL;
}
- codecs = &cl1->rtp[RTP_TO_RAN]->codecs;
-
- if (!cl1->rtp[RTP_TO_CN] || !cl2->rtp[RTP_TO_CN])
- return -ENOTCONN;
call_leg_ensure_ci(cl1, RTP_TO_CN, call_id1, trans1,
- codecs, &cl2->rtp[RTP_TO_CN]->local);
+ cn_codecs, &cl2->rtp[RTP_TO_CN
[S] Change in osmo-msc[osmith/1.11.1]: gsup_client_mux: set destination_name in error reply function
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34561?usp=email ) Change subject: gsup_client_mux: set destination_name in error reply function .. gsup_client_mux: set destination_name in error reply function If the GSUP request message to which we are replying is an MT SMS delivery from an SMSC relayed via OsmoHLR, we must set destination_name in our reply - otherwise our reply won't make it back to the SMSC. Related: OS#6135 Change-Id: I892fe87a733a78ed9d5761a8ce238caa135dea1e --- M src/libmsc/gsup_client_mux.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c index 1900377..9a0dc16 100644 --- a/src/libmsc/gsup_client_mux.c +++ b/src/libmsc/gsup_client_mux.c @@ -150,6 +150,8 @@ .cause = cause, .message_type = OSMO_GSUP_TO_MSGT_ERROR(gsup_orig->message_type), .message_class = gsup_orig->message_class, + .destination_name = gsup_orig->source_name, + .destination_name_len = gsup_orig->source_name_len, /* RP-Message-Reference is mandatory for SM Service */ .sm_rp_mr = gsup_orig->sm_rp_mr, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34561?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I892fe87a733a78ed9d5761a8ce238caa135dea1e Gerrit-Change-Number: 34561 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia Gerrit-MessageType: merged
[S] Change in osmo-msc[osmith/1.11.1]: make two functions static
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34558?usp=email )
Change subject: make two functions static
..
make two functions static
Change-Id: I1de0f35f1606c99f34bbf4033e069aadbc64
---
M include/osmocom/msc/mncc.h
M src/libmsc/gsm_04_08_cc.c
M src/osmo-msc/msc_main.c
3 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h
index 8a1e4ad..c8f3bfd 100644
--- a/include/osmocom/msc/mncc.h
+++ b/include/osmocom/msc/mncc.h
@@ -219,7 +219,6 @@
const char *get_mncc_name(int value);
void mncc_set_cause(struct gsm_mncc *data, int loc, int val);
-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);
/* input from CC code into mncc_builtin */
int int_mncc_recv(struct gsm_network *net, struct msgb *msg);
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 5908db9..6148bbd 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -129,7 +129,7 @@
/* Call Control */
-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
+static void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
{
net->mncc_recv(net, msg);
}
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 9808e86..913bd21 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -242,8 +242,8 @@
}
}
-struct gsm_network *msc_network_alloc(void *ctx,
- mncc_recv_cb_t mncc_recv)
+static struct gsm_network *msc_network_alloc(void *ctx,
+mncc_recv_cb_t mncc_recv)
{
struct gsm_network *net = gsm_network_init(ctx, mncc_recv);
if (!net)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34558?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I1de0f35f1606c99f34bbf4033e069aadbc64
Gerrit-Change-Number: 34558
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: merged
[S] Change in osmo-msc[osmith/1.11.1]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34560?usp=email )
Change subject: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel
handling
..
ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling
Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d
Related: OS#4854
---
M src/libmsc/msc_vgcs.c
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c
index f3867fe..772a9e3 100644
--- a/src/libmsc/msc_vgcs.c
+++ b/src/libmsc/msc_vgcs.c
@@ -2508,14 +2508,6 @@
LOG_CELL(cell, LOGL_NOTICE, "Received VGCS/VBS ASSIGNMENT
FAILURE from BSS.\n");
channel_fail:
bss = cell->bss;
- /* Remove cell. */
- tx_ran_msg = (struct ran_msg){
- .msg_type = RAN_MSG_CLEAR_COMMAND,
- .clear_command = {
- .gsm0808_cause =
GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC,
- },
- };
- ran_encode_and_send(fi, &tx_ran_msg, cell->conn, false);
cell_clear(cell,
GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC);
/* Notify BSS FSM about channel failure. */
if (bss)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34560?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d
Gerrit-Change-Number: 34560
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: jolly
Gerrit-CC: laforge
Gerrit-MessageType: merged
[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: correctly route GSUP responses to MT SMS
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34562?usp=email )
Change subject: SMS over GSUP: correctly route GSUP responses to MT SMS
..
SMS over GSUP: correctly route GSUP responses to MT SMS
When OsmoMSC is used with OsmoHLR rather than a GSUP-to-MAP gateway,
MT-forwardSM.req GSUP messages delivering MT SMS will be coming from
a separate SMSC relayed via OsmoHLR, rather than from OsmoHLR itself.
When we reply to these messages, in order for these replies to reach
the MT-sending SMSC via OsmoHLR, we need to save source_name from
the request and regurgitate it into destination_name in our response
messages. Implement this logic.
Related: OS#6135
Change-Id: I436e333035b8f6e27f86a49fe293ea48ea07a013
---
M include/osmocom/msc/gsm_04_11.h
M include/osmocom/msc/transaction.h
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_04_11_gsup.c
4 files changed, 46 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h
index 19aaa3a..17a31ec 100644
--- a/include/osmocom/msc/gsm_04_11.h
+++ b/include/osmocom/msc/gsm_04_11.h
@@ -28,7 +28,8 @@
int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub,
size_t sm_rp_oa_len, const uint8_t *sm_rp_oa,
size_t sm_rp_ud_len, const uint8_t *sm_rp_ud,
- bool sm_rp_mmts_ind);
+ bool sm_rp_mmts_ind, const uint8_t *gsup_source_name,
+ size_t gsup_source_name_len);
void gsm411_sapi_n_reject(struct msc_a *msc_a);
diff --git a/include/osmocom/msc/transaction.h
b/include/osmocom/msc/transaction.h
index a5a2e84..aa529e4 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -149,6 +149,9 @@
bool sm_rp_mmts_ind;
struct gsm_sms *sms;
+
+ uint8_t *gsup_source_name;
+ size_t gsup_source_name_len;
} sms;
struct {
/**
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index adc9d88..aa87a19 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -1230,7 +1230,8 @@
int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub,
size_t sm_rp_oa_len, const uint8_t *sm_rp_oa,
size_t sm_rp_ud_len, const uint8_t *sm_rp_ud,
- bool sm_rp_mmts_ind)
+ bool sm_rp_mmts_ind, const uint8_t *gsup_source_name,
+ size_t gsup_source_name_len)
{
struct gsm_trans *trans;
struct msgb *msg;
@@ -1245,6 +1246,17 @@
if (trans->msc_a != NULL)
gsm411_handle_mmts_ind(trans);
+ /* Save GSUP source_name for subsequent response messages */
+ if (gsup_source_name && gsup_source_name_len) {
+ trans->sms.gsup_source_name = talloc_memdup(trans,
gsup_source_name,
+
gsup_source_name_len);
+ if (!trans->sms.gsup_source_name) {
+ trans_free(trans);
+ return -ENOMEM;
+ }
+ trans->sms.gsup_source_name_len = gsup_source_name_len;
+ }
+
/* Allocate a message buffer for to be encoded SMS */
msg = gsm411_msgb_alloc();
if (!msg) {
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 0f18912..6225c6c 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -198,6 +198,10 @@
gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT,
trans->vsub->imsi, &sm_rp_mr);
+ /* Ensure routing through OsmoHLR to the MT-sending SMSC */
+ gsup_msg.destination_name = trans->sms.gsup_source_name;
+ gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+
return gsup_client_mux_tx(trans->net->gcm, &gsup_msg);
}
@@ -215,6 +219,10 @@
gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR,
trans->vsub->imsi, &sm_rp_mr);
+ /* Ensure routing through OsmoHLR to the MT-sending SMSC */
+ gsup_msg.destination_name = trans->sms.gsup_source_name;
+ gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+
/* SM-RP-Cause value */
gsup_msg.sm_rp_cause = &cause;
@@ -259,7 +267,8 @@
rc = gsm411_send_rp_data(net, vsub,
gsup_msg->sm_rp_oa_len, gsup_msg->sm_rp_oa,
gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui,
- sm_rp_mmts_ind);
+ sm_rp_mmts_ind, gsup_msg->source_name,
+ gsup_msg->source_name_len);
if (rc) {
LOGP(DLSMS, LOGL_NOTICE, "Failed to send MT SMS, "
"ignoring MT-forwar
[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: set source_name in GSUP reply messages
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/34563?usp=email )
Change subject: SMS over GSUP: set source_name in GSUP reply messages
..
SMS over GSUP: set source_name in GSUP reply messages
For MO-forwardSM and MT-forwardSM request messages, OsmoHLR applies
routing based on the SMSC address for MO or based on the IMSI for MT.
However, reply messages following these requests are routed passively
based on the destination_name IE. This passive message routing path
requires the source_name IE to be set as well - implement this
source_name setting.
Related: OS#6135
Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701
---
M include/osmocom/msc/gsup_client_mux.h
M src/libmsc/gsm_04_11_gsup.c
M src/libmsc/gsup_client_mux.c
3 files changed, 40 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
diff --git a/include/osmocom/msc/gsup_client_mux.h
b/include/osmocom/msc/gsup_client_mux.h
index 07f17c2..501b81d 100644
--- a/include/osmocom/msc/gsup_client_mux.h
+++ b/include/osmocom/msc/gsup_client_mux.h
@@ -28,6 +28,7 @@
struct ipaccess_unit *ipa_dev);
int gsup_client_mux_tx(struct gsup_client_mux *gcm, const struct
osmo_gsup_message *gsup_msg);
+void gsup_client_mux_tx_set_source(const struct gsup_client_mux *gcm, struct
osmo_gsup_message *gsup_msg);
void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct
osmo_gsup_message *gsup_orig,
enum gsm48_gmm_cause cause);
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 6225c6c..d1c2f27 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -201,6 +201,7 @@
/* Ensure routing through OsmoHLR to the MT-sending SMSC */
gsup_msg.destination_name = trans->sms.gsup_source_name;
gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+ gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg);
return gsup_client_mux_tx(trans->net->gcm, &gsup_msg);
}
@@ -222,6 +223,7 @@
/* Ensure routing through OsmoHLR to the MT-sending SMSC */
gsup_msg.destination_name = trans->sms.gsup_source_name;
gsup_msg.destination_name_len = trans->sms.gsup_source_name_len;
+ gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg);
/* SM-RP-Cause value */
gsup_msg.sm_rp_cause = &cause;
diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c
index 9a0dc16..1a3611f 100644
--- a/src/libmsc/gsup_client_mux.c
+++ b/src/libmsc/gsup_client_mux.c
@@ -136,6 +136,25 @@
return osmo_gsup_client_send(gcm->gsup_client, msg);
}
+/* Set GSUP source_name to our local IPA name */
+void gsup_client_mux_tx_set_source(const struct gsup_client_mux *gcm,
+ struct osmo_gsup_message *gsup_msg)
+{
+ const char *local_msc_name;
+
+ if (!gcm)
+ return;
+ if (!gcm->gsup_client)
+ return;
+ if (!gcm->gsup_client->ipa_dev)
+ return;
+ local_msc_name = gcm->gsup_client->ipa_dev->serno;
+ if (!local_msc_name)
+ return;
+ gsup_msg->source_name = (const uint8_t *) local_msc_name;
+ gsup_msg->source_name_len = strlen(local_msc_name) + 1;
+}
+
/* Transmit GSUP error in response to original message */
void gsup_client_mux_tx_error_reply(struct gsup_client_mux *gcm, const struct
osmo_gsup_message *gsup_orig,
enum gsm48_gmm_cause cause)
@@ -158,6 +177,7 @@
};
OSMO_STRLCPY_ARRAY(gsup_reply.imsi, gsup_orig->imsi);
+ gsup_client_mux_tx_set_source(gcm, &gsup_reply);
/* For SS/USSD, it's important to keep both session state and ID IEs */
if (gsup_orig->session_state != OSMO_GSUP_SESSION_STATE_NONE) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34563?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: osmith/1.11.1
Gerrit-Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701
Gerrit-Change-Number: 34563
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: falconia
Gerrit-MessageType: merged
[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email ) Change subject: ASCI: Add group receive and transmit mode support to MM layer .. Patch Set 12: (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34492/comment/058305d5_3478639a PS10, Line 4854:// There are event handlers for group call in this implementation. > not sure what do you mean with this. Oops, I missed some words. I rephrased it. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05957182a57423ad947ab200b52f65fde859e110 Gerrit-Change-Number: 34492 Gerrit-PatchSet: 12 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 28 Sep 2023 11:52:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.3-58d5b → 1.12.1
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34569?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34569?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34569 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1
osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34568?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34568 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34568?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Bump version: 1.11.0.7-dbe88 → 1.11.1 Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/68/34568/1 diff --git a/debian/changelog b/debian/changelog index fe631a2..debce4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-msc (1.11.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix codecs in internal call bridge + * make two functions static + + [ Mychaela N. Falconia ] + * CC: don't start guard timer on mid-call MNCC messages + * gsup_client_mux: set destination_name in error reply function + * SMS over GSUP: correctly route GSUP responses to MT SMS + * SMS over GSUP: set source_name in GSUP reply messages + + [ Andreas Eversberg ] + * ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling + + -- Oliver Smith Thu, 28 Sep 2023 13:53:07 +0200 + osmo-msc (1.11.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34568?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34568 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.3-58d5b → 1.12.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34569?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Bump version: 1.12.0.3-58d5b → 1.12.1 Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/69/34569/1 diff --git a/debian/changelog b/debian/changelog index 4b7cef6..640365d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-mgw (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * mgcp-client: Fix missing include in mgcp_client_pool.h + * mgcp-client: Introduce API osmo_mgcpc_ep_local_name() + * mgw: Configure IuUP if codec set during MDCX + + -- Oliver Smith Thu, 28 Sep 2023 13:53:55 +0200 + osmo-mgw (1.12.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34569?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34569 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: ASCI: Add protocol type to trans_find_by_callref() function
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?usp=email to look at the new patch set (#13). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add protocol type to trans_find_by_callref() function .. ASCI: Add protocol type to trans_find_by_callref() function This is required, because different protocols may share the same callref, but use different protocols. E.g. a voice group call can share the same callref with a voice broadcast call, but these calls are different transactions. Related: OS#5364 Change-Id: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 --- M src/host/layer23/include/osmocom/bb/mobile/transaction.h M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/transaction.c 5 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/34493/13 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34493?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifea3a81aae3b4ae897851f867b13fa987c8cbe11 Gerrit-Change-Number: 34493 Gerrit-PatchSet: 13 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email to look at the new patch set (#14). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. ASCI: Add VTY commands to control voice group/broadcast calls Related: OS#5364 Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 --- M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 248 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/34495/14 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 14 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: ASCI: Show NCH position in VTY together with system information
Attention is currently required from: jolly. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email to look at the new patch set (#14). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: ASCI: Show NCH position in VTY together with system information .. ASCI: Show NCH position in VTY together with system information Related: OS#5364 Change-Id: I5e0a9d469eb70608502dca881808621fa153b666 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/96/34496/14 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5e0a9d469eb70608502dca881808621fa153b666 Gerrit-Change-Number: 34496 Gerrit-PatchSet: 14 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix reception of MM messages at gsm48_mm_data_ind()
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34570?usp=email )
Change subject: Fix reception of MM messages at gsm48_mm_data_ind()
..
Fix reception of MM messages at gsm48_mm_data_ind()
The patch "ASCI: Add GCC/BCC (call control) to mobility management"
breaks reception of MM messages. No MM connection setup is possible.
This patch fixes the issue.
Change-Id: I263739bb0220d19f14114714fe9d82505bdbd267
---
M src/host/layer23/src/mobile/gsm48_mm.c
1 file changed, 24 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/34570/1
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index cfdb4f5..8c57785 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -4068,7 +4068,7 @@
struct gsm48_mm_conn *conn;
struct gsm48_mmxx_hdr *mmh;
int msg_supported = 0; /* determine, if message is supported at all */
- int rr_prim = -1, rr_est = -1; /* no prim set */
+ int rr_prim, rr_est = -1; /* no prim set */
uint8_t skip_ind;
int i, rc;
@@ -4108,11 +4108,7 @@
rr_prim = GSM48_MMBCC_DATA_IND;
break;
default:
- LOGP(DMM, LOGL_NOTICE, "Protocol type 0x%02x unsupported.\n",
-pdisc);
- msgb_free(msg);
- return gsm48_mm_tx_mm_status(ms,
- GSM48_REJECT_MSG_TYPE_NOT_IMPLEMENTED);
+ goto forward_msg;
}
transaction_id = ((gh->proto_discr & 0xf0) ^ 0x80) >> 4; /* flip */
@@ -4159,6 +4155,7 @@
}
/* forward message */
+forward_msg:
switch (pdisc) {
case GSM48_PDISC_MM:
skip_ind = (gh->proto_discr & 0xf0) >> 4;
@@ -4190,6 +4187,13 @@
rc = -ENOTSUP;
msgb_free(msg);
return rc;
+
+ default:
+ LOGP(DMM, LOGL_NOTICE, "Protocol type 0x%02x unsupported.\n",
+pdisc);
+ msgb_free(msg);
+ return gsm48_mm_tx_mm_status(ms,
+ GSM48_REJECT_MSG_TYPE_NOT_IMPLEMENTED);
}
LOGP(DMM, LOGL_INFO, "(ms %s) Received '%s' in MM state %s\n", ms->name,
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34570?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I263739bb0220d19f14114714fe9d82505bdbd267
Gerrit-Change-Number: 34570
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email to look at the new patch set (#13). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ASCI: Add group receive and transmit mode support to MM layer .. ASCI: Add group receive and transmit mode support to MM layer Related: OS#5364 Change-Id: I05957182a57423ad947ab200b52f65fde859e110 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h M src/host/layer23/src/mobile/gsm48_mm.c 2 files changed, 677 insertions(+), 77 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/34492/13 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05957182a57423ad947ab200b52f65fde859e110 Gerrit-Change-Number: 34492 Gerrit-PatchSet: 13 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Bump version: 1.12.0.3-58d5b → 1.12.1 Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/71/34571/1 diff --git a/debian/changelog b/debian/changelog index 4b7cef6..640365d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-mgw (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * mgcp-client: Fix missing include in mgcp_client_pool.h + * mgcp-client: Introduce API osmo_mgcpc_ep_local_name() + * mgw: Configure IuUP if codec set during MDCX + + -- Oliver Smith Thu, 28 Sep 2023 13:53:55 +0200 + osmo-mgw (1.12.0) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Bump version: 1.11.0.7-dbe88 → 1.11.1 Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/72/34572/1 diff --git a/debian/changelog b/debian/changelog index fe631a2..debce4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-msc (1.11.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix codecs in internal call bridge + * make two functions static + + [ Mychaela N. Falconia ] + * CC: don't start guard timer on mid-call MNCC messages + * gsup_client_mux: set destination_name in error reply function + * SMS over GSUP: correctly route GSUP responses to MT SMS + * SMS over GSUP: set source_name in GSUP reply messages + + [ Andreas Eversberg ] + * ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling + + -- Oliver Smith Thu, 28 Sep 2023 13:53:07 +0200 + osmo-msc (1.11.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34572 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: Fix reception of MM messages at gsm48_mm_data_ind()
Attention is currently required from: jolly.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34570?usp=email )
Change subject: Fix reception of MM messages at gsm48_mm_data_ind()
..
Patch Set 1: Code-Review+2
(1 comment)
File src/host/layer23/src/mobile/gsm48_mm.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/34570/comment/6400f0c6_cdc8b1ce
PS1, Line 4091: switch (pdisc) {
Sounds like you probably want to put all the code from here to line 4155 to a
subfunction to simplify this one and avoid the goto. Can be done in another
patch.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34570?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I263739bb0220d19f14114714fe9d82505bdbd267
Gerrit-Change-Number: 34570
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Comment-Date: Thu, 28 Sep 2023 11:59:57 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email ) Change subject: ASCI: Add group receive and transmit mode support to MM layer .. Patch Set 13: (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34492/comment/9783c735_a3e48771 PS10, Line 4854:// There are event handlers for group call in this implementation. > Oops, I missed some words. I rephrased it. v13 still hasn't this rephreased afaict. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05957182a57423ad947ab200b52f65fde859e110 Gerrit-Change-Number: 34492 Gerrit-PatchSet: 13 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 28 Sep 2023 12:01:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: missing bump in LIBVERSION due to new API (+1:same:+1) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 28 Sep 2023 12:02:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34572 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 28 Sep 2023 12:04:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_srv: Set io_fd pointer to NULL after freeing
Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34525?usp=email ) Change subject: stream_srv: Set io_fd pointer to NULL after freeing .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34525?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idb815a3e4e51189f9f1f3cceedd570dff9caf401 Gerrit-Change-Number: 34525 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Thu, 28 Sep 2023 12:22:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_srv: Set io_fd pointer to NULL after freeing
arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34525?usp=email ) Change subject: stream_srv: Set io_fd pointer to NULL after freeing .. stream_srv: Set io_fd pointer to NULL after freeing Change-Id: Idb815a3e4e51189f9f1f3cceedd570dff9caf401 --- M src/stream_srv.c 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/stream_srv.c b/src/stream_srv.c index b404604..ca22e1b 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -858,6 +858,7 @@ break; case OSMO_STREAM_MODE_OSMO_IO: osmo_iofd_free(conn->iofd); + conn->iofd = NULL; break; default: OSMO_ASSERT(false); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34525?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idb815a3e4e51189f9f1f3cceedd570dff9caf401 Gerrit-Change-Number: 34525 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit
Attention is currently required from: dexter, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email ) Change subject: mgw: TC_conn_timeout Fix timeout left set upon test exit .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9447fa6c6b3103e05fa3ee756ee572ddecb69006 Gerrit-Change-Number: 34549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 28 Sep 2023 12:44:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email )
Change subject: mgw: TC_conn_timeout Fix timeout left set upon test exit
..
mgw: TC_conn_timeout Fix timeout left set upon test exit
The test mentioned in a comment that the value is reset upon each test
start, but that's false.
Change-Id: I9447fa6c6b3103e05fa3ee756ee572ddecb69006
---
M mgw/MGCP_Test.ttcn
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index 73591b2..0cedb0e 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -2562,7 +2562,7 @@
f_init(ep);
log("Setting conn-timeout to 1s");
- f_vty_config(MGWVTY, "mgcp", "conn-timeout 1"); /* reset in
f_init_vty() */
+ f_vty_config(MGWVTY, "mgcp", "conn-timeout 1");
log("Sending RTP data for 1.5s");
flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111,
"GSM-HR-08/8000/1"));
@@ -2587,6 +2587,9 @@
f_sleep(0.2);
f_rtpem_conn_refuse_verify(RTPEM[0]);
+ log("Setting conn-timeout back to 0 (disabled)");
+ f_vty_config(MGWVTY, "mgcp", "conn-timeout 0");
+
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34549?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I9447fa6c6b3103e05fa3ee756ee572ddecb69006
Gerrit-Change-Number: 34549
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero
Attention is currently required from: daniel, laforge. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email ) Change subject: osmo_io: Init struct msghdr to zero .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe Gerrit-Change-Number: 34337 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 28 Sep 2023 13:20:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero
daniel has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email )
Change subject: osmo_io: Init struct msghdr to zero
..
osmo_io: Init struct msghdr to zero
Avoid uninitialized read, found with valgrind
Syscall param recvmsg(msg) points to uninitialised byte(s)
at 0x49FD865: __recvmsg_syscall (recvmsg.c:27)
by 0x49FD865: recvmsg (recvmsg.c:41)
by 0x4891FAE: iofd_poll_ofd_cb_recvmsg_sendmsg (osmo_io_poll.c:66)
by 0x48921B2: iofd_poll_ofd_cb_dispatch (osmo_io_poll.c:119)
by 0x48941F1: poll_disp_fds (select.c:419)
by 0x4894299: _osmo_select_main (select.c:457)
by 0x4894304: osmo_select_main (select.c:496)
by 0x10DC3E: test_segm_ipa_stream_srv_run (stream_test.c:628)
by 0x10E2A5: main (stream_test.c:879)
Address 0x1ffefffa68 is on thread 1's stack
in frame #1, created by iofd_poll_ofd_cb_recvmsg_sendmsg (osmo_io_poll.c:45)
Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe
---
M src/core/osmo_io_poll.c
1 file changed, 30 insertions(+), 4 deletions(-)
Approvals:
lynxis lazus: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c
index c230188..d207047 100644
--- a/src/core/osmo_io_poll.c
+++ b/src/core/osmo_io_poll.c
@@ -58,10 +58,12 @@
hdr.msg = msg;
hdr.iov[0].iov_base = msg->tail;
hdr.iov[0].iov_len = msgb_tailroom(msg);
- hdr.hdr.msg_iov = &hdr.iov[0];
- hdr.hdr.msg_iovlen = 1;
- hdr.hdr.msg_name = &hdr.osa.u.sa;
- hdr.hdr.msg_namelen = sizeof(struct osmo_sockaddr);
+ hdr.hdr = (struct msghdr) {
+ .msg_iov = &hdr.iov[0],
+ .msg_iovlen = 1,
+ .msg_name = &hdr.osa.u.sa,
+ .msg_namelen = sizeof(struct osmo_sockaddr),
+ };
rc = recvmsg(ofd->fd, &hdr.hdr, flags);
if (rc > 0)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34337?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I21114ad57784126cfdeb4a932ed44dbf23946fbe
Gerrit-Change-Number: 34337
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-CC: laforge
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, daniel, pespin. Hello Jenkins Builder, daniel, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by daniel, Verified+1 by Jenkins Builder Change subject: osmo_io: Clean up code .. osmo_io: Clean up code - Remove osmo_io_init() from header, since it has no function definition - Add osmo_iofd_init() to header Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 --- M include/osmocom/core/osmo_io.h 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/34524/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, daniel, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code .. Patch Set 2: (1 comment) File include/osmocom/core/osmo_io.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11516): https://gerrit.osmocom.org/c/libosmocore/+/34524/comment/63c435b2_ec65b3cc PS2, Line 72: void osmo_iofd_init(); Bad function definition - void osmo_iofd_init() should probably be void osmo_iofd_init(void) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 28 Sep 2023 13:42:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1
Attention is currently required from: osmith. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Bump version: 1.12.0.3-58d5b → 1.12.1 Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 --- M debian/changelog M src/libosmo-mgcp-client/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/71/34571/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-MessageType: newpatchset
[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Patch Set 2: (1 comment) Patchset: PS1: > missing bump in LIBVERSION due to new API (+1:same:+1) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 28 Sep 2023 14:00:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_srv: Fix connection error handling
Attention is currently required from: daniel, laforge, pespin.
arehbein has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email )
Change subject: stream_srv: Fix connection error handling
..
Patch Set 2:
(3 comments)
Patchset:
PS2:
This patch didn't really introduce the (possible) issues I'm addressing here,
but I think it would be better if we fixed them while we're at it
File src/stream_srv.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/01098932_6b4c22fa
PS2, Line 489: if (OSMO_UNLIKELY(res <= 0)) {
Why do we not call `osmo_stream_srv_clear_tx_queue()` here, if the connection
is dead anyways?
https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/a563c839_25e5d060
PS2, Line 496: if (osmo_iofd_txqueue_len(iofd) == 0)
Can it not happen that messages can't be sent out, so that this condition never
holds true? In that case, the connection won't be closed as announced (I think
this is a problem without this change, as well).
Also, `osmo_stream_srv_clear_tx_queue()` isn't called anywhere except in
`osmo-hnbgw.git:src/osmo-hnbgw/hnbgw.c` on connection restart (or something
among those lines) as far as I can tell, so if messages can't be sent out and
`OSMO_STREAM_SRV_F_FLUSH_DESTROY` is set, then it looks like we will have some
sort of endless loop here.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I84eea2717f3762830f3f5b115e6fc8545eaa4fd5
Gerrit-Change-Number: 34338
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: arehbein
Gerrit-CC: laforge
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Attention: daniel
Gerrit-Comment-Date: Thu, 28 Sep 2023 14:08:52 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, daniel, pespin. Hello Jenkins Builder, daniel, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo_io: Clean up code .. osmo_io: Clean up code - Remove osmo_io_init() from header, since it has no function definition - Add osmo_iofd_init() to header Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 --- M include/osmocom/core/osmo_io.h 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/34524/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 28 Sep 2023 14:13:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 .. Bump version: 1.12.0.3-58d5b → 1.12.1 Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 --- M debian/changelog M src/libosmo-mgcp-client/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 4b7cef6..1e23bc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-mgw (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * mgcp-client: Fix missing include in mgcp_client_pool.h + * mgcp-client: Introduce API osmo_mgcpc_ep_local_name() + * mgw: Configure IuUP if codec set during MDCX + + -- Oliver Smith Thu, 28 Sep 2023 15:58:17 +0200 + osmo-mgw (1.12.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 6446fed..b2bed9a 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -19,7 +19,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=12:0:0 +MGCP_CLIENT_LIBVERSION=13:0:1 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmocore[master]: osmo_io: Clean up code
Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 28 Sep 2023 14:14:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1
Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34572 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 28 Sep 2023 14:18:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 .. Bump version: 1.11.0.7-dbe88 → 1.11.1 Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index fe631a2..debce4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-msc (1.11.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix codecs in internal call bridge + * make two functions static + + [ Mychaela N. Falconia ] + * CC: don't start guard timer on mid-call MNCC messages + * gsup_client_mux: set destination_name in error reply function + * SMS over GSUP: correctly route GSUP responses to MT SMS + * SMS over GSUP: set source_name in GSUP reply messages + + [ Andreas Eversberg ] + * ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling + + -- Oliver Smith Thu, 28 Sep 2023 13:53:07 +0200 + osmo-msc (1.11.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34572 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
