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

[S] Change in libosmocore[master]: osmo_io: Clean up code

by Jenkins Builder

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 <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 13:42:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Clean up code

by arehbein

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 <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero

by daniel

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 <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Init struct msghdr to zero

by lynxis lazus

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 <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 13:20:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit

by pespin

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 <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mgw: TC_conn_timeout Fix timeout left set upon test exit

by fixeria

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 <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 12:44:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Set io_fd pointer to NULL after freeing

by arehbein

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 <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Set io_fd pointer to NULL after freeing

by daniel

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 <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 12:22:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by pespin

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 12:04:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1

by pespin

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 12:02:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer

by pespin

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 12:01:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: Fix reception of MM messages at gsm48_mm_data_ind()

by pespin

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 28 Sep 2023 11:59:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by osmith

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 <osmith(a)sysmocom.de> 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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1

by osmith

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 <osmith(a)sysmocom.de> 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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: Fix reception of MM messages at gsm48_mm_data_ind()

by jolly

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 <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer

by jolly

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Add protocol type to trans_find_by_callref() function

by jolly

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls

by jolly

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Show NCH position in VTY together with system information

by jolly

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by osmith

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 <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.3-58d5b → 1.12.1

by osmith

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 <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.3-58d5b → 1.12.1

by osmith

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 <osmith(a)sysmocom.de> 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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by osmith

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 <osmith(a)sysmocom.de> 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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer

by jolly

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 <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 11:52:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: make two functions static

by osmith

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: I1de0f35f1606c997777f34bbf4033e069aadbc64 --- 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: I1de0f35f1606c997777f34bbf4033e069aadbc64 Gerrit-Change-Number: 34558 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-msc[osmith/1.11.1]: CC: don't start guard timer on mid-call MNCC messages

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-msc[osmith/1.11.1]: fix codecs in internal call bridge

by osmith

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 CN CN 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]->local); call_leg_ensure_ci(cl2, RTP_TO_CN, call_id2, trans2, - codecs, &cl1->rtp[RTP_TO_CN]->local); + cn_codecs, &cl1->rtp[RTP_TO_CN]->local); return 0; } -- 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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: gsup_client_mux: set destination_name in error reply function

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: correctly route GSUP responses to MT SMS

by osmith

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-forwardSM-Req message...\n"); -- 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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: set source_name in GSUP reply messages

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: mgcp-client: Fix missing include in mgcp_client_pool.h

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: mgw: Configure IuUP if codec set during MDCX

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.2-23174 → 1.12.1

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: set source_name in GSUP reply messages

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: correctly route GSUP responses to MT SMS

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: gsup_client_mux: set destination_name in error reply function

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-msc[osmith/1.11.1]: CC: don't start guard timer on mid-call MNCC messages

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: make two functions static

by osmith

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: I1de0f35f1606c997777f34bbf4033e069aadbc64 Gerrit-Change-Number: 34558 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-msc[osmith/1.11.1]: fix codecs in internal call bridge

by osmith

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 <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: Bump version: 1.12.0.2-23174 → 1.12.1

by osmith

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 <osmith(a)sysmocom.de> 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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: mgw: Configure IuUP if codec set during MDCX

by osmith

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 <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[osmith/1.12.1]: mgcp-client: Fix missing include in mgcp_client_pool.h

by osmith

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 <stdbool.h> +#include <osmocom/vty/vty.h> + 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 <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: gsup_client_mux: set destination_name in error reply function

by osmith

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 <osmith(a)sysmocom.de> Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: correctly route GSUP responses to MT SMS

by osmith

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, " "ignoring MT-forwardSM-Req message...\n"); -- 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 <osmith(a)sysmocom.de> Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by osmith

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 <osmith(a)sysmocom.de> 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 <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.11.1]: SMS over GSUP: set source_name in GSUP reply messages

by osmith

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 <osmith(a)sysmocom.de> Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-msc[osmith/1.11.1]: CC: don't start guard timer on mid-call MNCC messages

by osmith

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 <osmith(a)sysmocom.de> Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log September 2023