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

[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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

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

1 year, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023