- gerrit-log - lists.osmocom.org

[S] Change in osmo-msc[master]: libvlr: replace direct call of paging_expired() into a callback
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38107?usp=email ) Change subject: libvlr: replace direct call of paging_expired() into a callback ...................................................................... libvlr: replace direct call of paging_expired() into a callback libmsc internal functions shouldn't be called from within the libvlr. Re-use the paging callback with an osmocom specific indication to inform it to cancel paging. Change-Id: I7a3d15e8f0fb51c6b32add2de5024fc4d599ecf0 --- M src/libmsc/sgs_iface.c M src/libvlr/vlr_sgs_fsm.c 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/07/38107/1 diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index a845ab8..c1b6b71 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -466,7 +466,7 @@ } } -/*! Page UE through SGs interface +/*! Page UE through SGs interface or inform about an expired paging * \param[in] vsub subscriber context * \param[in] serv_ind service indicator (sms or voide) * \returns 0 in case of success, -EINVAL in case of error. */ @@ -476,6 +476,11 @@ struct gsm29118_paging_req paging_params; struct sgs_mme_ctx *mme; + if (serv_ind == SGSAP_SERV_IND_PAGING_TIMEOUT) { + paging_expired(vsub); + return 0; + } + /* See also: 3GPP TS 29.118, chapter 5.1.2.2 Paging Initiation */ if (vsub->sgs_fsm->state == SGS_UE_ST_NULL && vsub->conf_by_radio_contact_ind == true) { LOGPFSMSL(vsub->sgs_fsm, DPAG, LOGL_ERROR, "Will not Page (conf_by_radio_contact_ind == true)\n"); diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index 2771cf5..12cad1b 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -64,8 +64,8 @@ vlr_subscr_set_last_used_eutran_plmn_id(vsub, NULL); /* Make sure any ongoing paging is aborted. */ - if (vsub->cs.is_paging) - paging_expired(vsub); + if (vsub->cs.is_paging && vsub->sgs.paging_cb) + vsub->sgs.paging_cb(vsub, SGSAP_SERV_IND_PAGING_TIMEOUT); /* Ensure that Ts5 (pending paging via SGs) is deleted */ if (vlr_sgs_pag_pend(vsub)) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38107?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7a3d15e8f0fb51c6b32add2de5024fc4d599ecf0 Gerrit-Change-Number: 38107 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: vlr.h: remove unused ran_conn out of the header
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38103?usp=email ) Change subject: vlr.h: remove unused ran_conn out of the header ...................................................................... vlr.h: remove unused ran_conn out of the header The ran_conn isn't used at all by the VLR Change-Id: I247d636d835c09f7a7b66dee52eb8608aa358815 --- M include/osmocom/msc/vlr.h M src/libmsc/msc_a.c M src/libmsc/msc_ho.c M src/libmsc/msc_vgcs.c M src/libmsc/msub.c 5 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/03/38103/1 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index a7707fd..562b30f 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -13,7 +13,6 @@ #include <osmocom/gsm/gsm0808.h> #include <osmocom/gsm/gsup.h> #include <osmocom/gsm/ipa.h> -#include <osmocom/msc/ran_conn.h> #include <osmocom/msc/msc_common.h> #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/msc/vlr_sgs.h> diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index db1d998..f90a59a 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -37,6 +37,7 @@ #include <osmocom/msc/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/transaction_cc.h> +#include <osmocom/msc/ran_conn.h> #include <osmocom/msc/ran_peer.h> #include <osmocom/msc/ran_msg_a.h> #include <osmocom/msc/ran_msg_iu.h> diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index 54a959d..cea658c 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -23,6 +23,7 @@ #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/msc/msc_ho.h> +#include <osmocom/msc/ran_conn.h> #include <osmocom/msc/ran_msg.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msc_i.h> diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 264fa49..4660a2c 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -86,6 +86,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/sccp_ran.h> +#include <osmocom/msc/ran_conn.h> #include <osmocom/msc/ran_infra.h> #include <osmocom/msc/ran_peer.h> #include <osmocom/msc/ran_msg_a.h> diff --git a/src/libmsc/msub.c b/src/libmsc/msub.c index ac93665..8df8d26 100644 --- a/src/libmsc/msub.c +++ b/src/libmsc/msub.c @@ -28,6 +28,7 @@ #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msc_i.h> #include <osmocom/msc/msc_t.h> +#include <osmocom/msc/ran_conn.h> #include <osmocom/msc/vlr.h> #include <osmocom/msc/e_link.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38103?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I247d636d835c09f7a7b66dee52eb8608aa358815 Gerrit-Change-Number: 38103 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: libvlr/vlr: remove gsm_subscriber.h
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38106?usp=email ) Change subject: libvlr/vlr: remove gsm_subscriber.h ...................................................................... libvlr/vlr: remove gsm_subscriber.h There is no need for gsm_subscriber.h except its include of osmocom/core/stats.h Change-Id: I8e1839d0be0a04deba639f267f14ffc3d5ccc42b --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/38106/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 2140d25..db4156f 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -21,6 +21,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/fsm.h> +#include <osmocom/core/stats.h> #include <osmocom/core/utils.h> #include <osmocom/core/timer.h> #include <osmocom/core/tdef.h> @@ -30,7 +31,6 @@ #include <osmocom/gsm/apn.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/ipa.h> -#include <osmocom/msc/gsm_subscriber.h> #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/msc/vlr_sgs.h> #include <osmocom/msc/vlr.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38106?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8e1839d0be0a04deba639f267f14ffc3d5ccc42b Gerrit-Change-Number: 38106 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: msc/gsup_client_mux.h: remove include of itself
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38108?usp=email ) Change subject: msc/gsup_client_mux.h: remove include of itself ...................................................................... msc/gsup_client_mux.h: remove include of itself Change-Id: I89ffdb98e98133bd28023a19076f3a5f02e520d2 --- M include/osmocom/msc/gsup_client_mux.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/38108/1 diff --git a/include/osmocom/msc/gsup_client_mux.h b/include/osmocom/msc/gsup_client_mux.h index 501b81d..f327786 100644 --- a/include/osmocom/msc/gsup_client_mux.h +++ b/include/osmocom/msc/gsup_client_mux.h @@ -1,7 +1,6 @@ #pragma once #include <osmocom/gsm/gsup.h> -#include <osmocom/msc/gsup_client_mux.h> struct gsup_client_mux; struct ipaccess_unit; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38108?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I89ffdb98e98133bd28023a19076f3a5f02e520d2 Gerrit-Change-Number: 38108 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: libvlr: use correct log facility within the VLR
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38110?usp=email ) Change subject: libvlr: use correct log facility within the VLR ...................................................................... libvlr: use correct log facility within the VLR Change-Id: Ia3170c3fe48402ab01bf994fd8d3fa8eec699647 --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/10/38110/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index e8ff1b1..e190132 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -476,7 +476,7 @@ for (tried = 0; tried < 100; tried++) { rc = osmo_get_rand_id((uint8_t *) &tmsi, sizeof(tmsi)); if (rc < 0) { - LOGP(DDB, LOGL_ERROR, "osmo_get_rand_id() failed: %s\n", strerror(-rc)); + LOGP(DVLR, LOGL_ERROR, "osmo_get_rand_id() failed: %s\n", strerror(-rc)); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38110?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia3170c3fe48402ab01bf994fd8d3fa8eec699647 Gerrit-Change-Number: 38110 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-msc[master]: libvlr: fix tab/space issue
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38109?usp=email ) Change subject: libvlr: fix tab/space issue ...................................................................... libvlr: fix tab/space issue Change-Id: I7f831e7ee0014a2241a69f7c75f2c6404bbb7087 --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/09/38109/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index db4156f..e8ff1b1 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -1293,7 +1293,7 @@ } /* Dispatch result to vsub->lu_fsm, which will either handle the result by itself (Check IMEI early) or dispatch - * it further to lu_compl_vlr_fsm (Check IMEI after LU). */ + * it further to lu_compl_vlr_fsm (Check IMEI after LU). */ if (gsup->message_type == OSMO_GSUP_MSGT_CHECK_IMEI_RESULT) { if (gsup->imei_result == OSMO_GSUP_IMEI_RESULT_ACK) osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_IMEI_ACK, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38109?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7f831e7ee0014a2241a69f7c75f2c6404bbb7087 Gerrit-Change-Number: 38109 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-msc[master]: Move vlr.h & vlr_sgs.h into osmocom/vlr/
by lynxis lazus 11 Sep '24

11 Sep '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38111?usp=email ) Change subject: Move vlr.h & vlr_sgs.h into osmocom/vlr/ ...................................................................... Move vlr.h & vlr_sgs.h into osmocom/vlr/ Prepare libvlr to be independent, start by moving the vlr headers into its own directory. Change-Id: I8b18b05091b35e744b3234d1ce0d537f56bccf07 --- M configure.ac M include/osmocom/Makefile.am M include/osmocom/msc/Makefile.am M include/osmocom/msc/sgs_iface.h M include/osmocom/msc/transaction_cc.h A include/osmocom/vlr/Makefile.am R include/osmocom/vlr/vlr.h R include/osmocom/vlr/vlr_sgs.h M src/libmsc/ctrl_commands.c M src/libmsc/db.c M src/libmsc/e_link.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c M src/libmsc/gsm_09_11.c M src/libmsc/mncc_call.c M src/libmsc/msc_a.c M src/libmsc/msc_a_remote.c M src/libmsc/msc_ho.c M src/libmsc/msc_net_init.c M src/libmsc/msc_t.c M src/libmsc/msc_vgcs.c M src/libmsc/msc_vty.c M src/libmsc/msub.c M src/libmsc/paging.c M src/libmsc/ran_conn.c M src/libmsc/ran_peer.c M src/libmsc/sgs_iface.c M src/libmsc/silent_call.c M src/libmsc/sms_queue.c M src/libmsc/transaction.c M src/libsmpputil/smpp_msc.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c M src/libvlr/vlr_sgs_fsm.c M tests/db_sms/db_sms_test.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_tests.h M tests/sms_queue/sms_queue_test.c 44 files changed, 51 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/38111/1 diff --git a/configure.ac b/configure.ac index 89d37c2..7d7f4c9 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,7 @@ include/osmocom/Makefile include/osmocom/msc/Makefile include/osmocom/smpp/Makefile + include/osmocom/vlr/Makefile src/Makefile src/libmsc/Makefile src/libvlr/Makefile diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index b07a004..e4ac924 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ msc \ smpp \ + vlr \ $(NULL) diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index a940056..b6901b9 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -53,8 +53,6 @@ sms_queue.h \ transaction.h \ transaction_cc.h \ - vlr.h \ - vlr_sgs.h \ vty.h \ asci_gcr.h \ asci_vty.h \ diff --git a/include/osmocom/msc/sgs_iface.h b/include/osmocom/msc/sgs_iface.h index a319663..169bb59 100644 --- a/include/osmocom/msc/sgs_iface.h +++ b/include/osmocom/msc/sgs_iface.h @@ -22,8 +22,8 @@ #include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/gsm/protocol/gsm_29_118.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/paging.h> #include <osmocom/core/socket.h> diff --git a/include/osmocom/msc/transaction_cc.h b/include/osmocom/msc/transaction_cc.h index 963cb45..c19c033 100644 --- a/include/osmocom/msc/transaction_cc.h +++ b/include/osmocom/msc/transaction_cc.h @@ -28,7 +28,7 @@ #include <osmocom/msc/codec_mapping.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> void trans_cc_filter_init(struct gsm_trans *trans); void trans_cc_filter_set_ran(struct gsm_trans *trans, enum osmo_rat_type ran_type); diff --git a/include/osmocom/vlr/Makefile.am b/include/osmocom/vlr/Makefile.am new file mode 100644 index 0000000..f47da40 --- /dev/null +++ b/include/osmocom/vlr/Makefile.am @@ -0,0 +1,4 @@ +noinst_HEADERS = \ + vlr.h \ + vlr_sgs.h \ + $(NULL) diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/vlr/vlr.h similarity index 99% rename from include/osmocom/msc/vlr.h rename to include/osmocom/vlr/vlr.h index 562b30f..8686020 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -15,7 +15,7 @@ #include <osmocom/gsm/ipa.h> #include <osmocom/msc/msc_common.h> #include <osmocom/gsupclient/gsup_client.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr_sgs.h> #define LOGGSUPP(level, gsup, fmt, args...) \ LOGP(DVLR, level, "GSUP(%s) " fmt, (gsup)->imsi, ## args) diff --git a/include/osmocom/msc/vlr_sgs.h b/include/osmocom/vlr/vlr_sgs.h similarity index 100% rename from include/osmocom/msc/vlr_sgs.h rename to include/osmocom/vlr/vlr_sgs.h diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c index 87e9afd..d228309 100644 --- a/src/libmsc/ctrl_commands.c +++ b/src/libmsc/ctrl_commands.c @@ -25,7 +25,7 @@ #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/db.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <stdbool.h> diff --git a/src/libmsc/db.c b/src/libmsc/db.c index d12f04c..04e11c5 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -35,7 +35,7 @@ #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/db.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/core/talloc.h> diff --git a/src/libmsc/e_link.c b/src/libmsc/e_link.c index b26f53b..5107c22 100644 --- a/src/libmsc/e_link.c +++ b/src/libmsc/e_link.c @@ -29,7 +29,7 @@ #include <osmocom/msc/e_link.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_roles.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_infra.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msc_a_remote.h> diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 17350fa..34f7b76 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -39,7 +39,7 @@ #include <osmocom/msc/msc_vgcs.h> #include <osmocom/msc/signal.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/gsm/gsm48.h> diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 63b1699..3aded52 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -48,7 +48,7 @@ #include <osmocom/msc/mncc_int.h> #include <osmocom/abis/e1_input.h> #include <osmocom/core/bitvec.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/paging.h> diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index aa87a19..7b614ec 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -52,7 +52,7 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/db.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/paging.h> diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 1afdfab..9832454 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -30,7 +30,7 @@ #include <osmocom/msc/transaction.h> #include <osmocom/msc/msc_common.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/msc_a.h> diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index e293890..0a988af 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -43,7 +43,7 @@ #include <osmocom/msc/gsm_04_80.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/transaction.h> #include <osmocom/gsupclient/gsup_client.h> diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index 557f2d7..a42baff 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -34,7 +34,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/rtp_stream.h> #include <osmocom/msc/msub.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/codec_mapping.h> struct osmo_fsm mncc_call_fsm; diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index f90a59a..ad96319 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -34,7 +34,7 @@ #include <osmocom/msc/msc_i.h> #include <osmocom/msc/paging.h> #include <osmocom/msc/signal.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/transaction_cc.h> #include <osmocom/msc/ran_conn.h> diff --git a/src/libmsc/msc_a_remote.c b/src/libmsc/msc_a_remote.c index 3b9693e..ae9d6b7 100644 --- a/src/libmsc/msc_a_remote.c +++ b/src/libmsc/msc_a_remote.c @@ -34,7 +34,7 @@ #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msc_t.h> #include <osmocom/msc/e_link.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_peer.h> static struct osmo_fsm msc_a_remote_fsm; diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index cea658c..d5dba30 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -34,7 +34,7 @@ #include <osmocom/msc/neighbor_ident.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/ran_peer.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/call_leg.h> diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 1fc712a..9b8a8b3 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -27,7 +27,7 @@ #include <osmocom/crypt/utran_cipher.h> #include <osmocom/msc/gsm_data.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/gsm_04_11_gsup.h> #include <osmocom/msc/gsm_09_11.h> diff --git a/src/libmsc/msc_t.c b/src/libmsc/msc_t.c index eb6c797..65ebb69 100644 --- a/src/libmsc/msc_t.c +++ b/src/libmsc/msc_t.c @@ -35,7 +35,7 @@ #include <osmocom/msc/call_leg.h> #include <osmocom/msc/rtp_stream.h> #include <osmocom/msc/ran_infra.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_i.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/codec_mapping.h> diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 4660a2c..528d282 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -93,7 +93,7 @@ #include <osmocom/msc/msub.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/msc_a.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/rtp_stream.h> #include <osmocom/msc/codec_mapping.h> #include <osmocom/msc/msc_vgcs.h> diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 1f389f4..d5aee0e 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -52,7 +52,7 @@ #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/db.h> #include <osmocom/msc/sms_queue.h> @@ -63,7 +63,7 @@ #include <osmocom/msc/mncc_int.h> #include <osmocom/msc/osmux.h> #include <osmocom/msc/rrlp.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/sgs_vty.h> #include <osmocom/msc/sccp_ran.h> #include <osmocom/msc/ran_peer.h> diff --git a/src/libmsc/msub.c b/src/libmsc/msub.c index 8df8d26..c821c1c 100644 --- a/src/libmsc/msub.c +++ b/src/libmsc/msub.c @@ -29,7 +29,7 @@ #include <osmocom/msc/msc_i.h> #include <osmocom/msc/msc_t.h> #include <osmocom/msc/ran_conn.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/e_link.h> const struct value_string msc_role_names[] = { diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index 9b3dad5..95acc47 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -22,7 +22,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/paging.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_peer.h> #include <osmocom/msc/sgs_iface.h> #include <osmocom/msc/signal.h> diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 0763801..a86b27e 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -26,7 +26,7 @@ #include <osmocom/core/signal.h> #include <osmocom/msc/ran_conn.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/signal.h> diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 8604443..09e57eb 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -30,7 +30,7 @@ #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_i.h> #include <osmocom/msc/msc_a.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_conn.h> #include <osmocom/msc/cell_id_list.h> #include <osmocom/msc/msc_vgcs.h> diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index c1b6b71..07a1baa 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -33,8 +33,8 @@ #include <osmocom/netif/stream.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/msub.h> diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 4de12b9..a59e3af 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -31,7 +31,7 @@ #include <osmocom/msc/debug.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/paging.h> #include <osmocom/msc/transaction.h> diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 9f18f4f..7dd14ff 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -37,7 +37,7 @@ #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/signal.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 7ae4c7d..b7c7beb 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -24,7 +24,7 @@ #include <osmocom/msc/debug.h> #include <osmocom/core/talloc.h> #include <osmocom/msc/gsm_04_08.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/paging.h> diff --git a/src/libsmpputil/smpp_msc.c b/src/libsmpputil/smpp_msc.c index 0c2a928..d68dcc0 100644 --- a/src/libsmpputil/smpp_msc.c +++ b/src/libsmpputil/smpp_msc.c @@ -46,7 +46,7 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/smpp/smpp_smsc.h> diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index e190132..dbf9e67 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -32,8 +32,8 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/ipa.h> #include <osmocom/gsupclient/gsup_client.h> -#include <osmocom/msc/vlr_sgs.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/paging.h> diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 629625e..c2e185b 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -22,7 +22,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsup.h> #include <osmocom/gsm/gsm48.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include "vlr_core.h" diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index b5052b0..0f7efc6 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -23,7 +23,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsup.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include "vlr_core.h" diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index 41b8800..ec11448 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -1,6 +1,6 @@ #pragma once -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> struct osmo_gsup_message; diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 5d8f78b..d622baa 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -21,7 +21,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsm48.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include "vlr_core.h" diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c index 61db585..a0147c0 100644 --- a/src/libvlr/vlr_sgs.c +++ b/src/libvlr/vlr_sgs.c @@ -23,8 +23,8 @@ #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include "vlr_sgs_fsm.h" const struct value_string sgs_state_timer_names[] = { diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index 12cad1b..3497ef4 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -22,8 +22,8 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/paging.h> #include "vlr_sgs_fsm.h" diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c index 7c015d3..352ec01 100644 --- a/tests/db_sms/db_sms_test.c +++ b/tests/db_sms/db_sms_test.c @@ -32,7 +32,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/db.h> /* Talloc context of this unit test */ diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 029e8b5..54ea2f7 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -23,7 +23,7 @@ #include "msc_vlr_tests.h" -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #if 0 static void test_early_stage() diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index b0605f1..f095a7f 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -28,7 +28,7 @@ #include <osmocom/crypt/utran_cipher.h> #include <osmocom/msc/gsm_data.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/mncc.h> diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index cc78e14..bca60b1 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -24,7 +24,7 @@ #include <osmocom/core/application.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/db.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38111?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8b18b05091b35e744b3234d1ce0d537f56bccf07 Gerrit-Change-Number: 38111 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ci[master]: gerrit-verifications,master-builds: Add pyosmocom
by laforge 11 Sep '24

11 Sep '24

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email ) Change subject: gerrit-verifications,master-builds: Add pyosmocom ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9ec289f8d3116bbc8291298146c58d0209684439 Gerrit-Change-Number: 38024 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Sep 2024 21:38:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: gerrit-verifications,master-builds: Add pyosmocom
by laforge 11 Sep '24

11 Sep '24

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email ) Change subject: gerrit-verifications,master-builds: Add pyosmocom ...................................................................... Patch Set 4: (1 comment) File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/38024/comment/38037688_f453eea1?usp=… : PS4, Line 425: a1: !!python/tuple ["test", "pylint", "docs"] > this is different from gerrit-verifications. should be the same? […] the 'distcheck' is a NOP in jenkins.sh, so it doesn't make a practical diference. But I've removed it for gerrit-verifications.yml to be consistent. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9ec289f8d3116bbc8291298146c58d0209684439 Gerrit-Change-Number: 38024 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Sep 2024 21:37:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ci[master]: gerrit-verifications,master-builds: Add pyosmocom
by laforge 11 Sep '24

11 Sep '24

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gerrit-verifications,master-builds: Add pyosmocom ...................................................................... gerrit-verifications,master-builds: Add pyosmocom Change-Id: I9ec289f8d3116bbc8291298146c58d0209684439 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/24/38024/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9ec289f8d3116bbc8291298146c58d0209684439 Gerrit-Change-Number: 38024 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log