October 2024 - gerrit-log - lists.osmocom.org

[L] Change in osmo-sgsn[master]: Add Routing Areas
by fixeria 11 Oct '24

11 Oct '24

Attention is currently required from: daniel, lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email ) Change subject: Add Routing Areas ...................................................................... Patch Set 16: (1 comment) File tests/gprs_routing_area/gprs_routing_area_test.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/9e892ffd_09fdfc13?us… : PS15, Line 329: static struct log_info_cat gprs_categories[] = { > I've removed more categories, the remaining ones might become handy or a somehow related. Yet you're missing to add `DRA` here... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2474b19a7471a1dea3c863ddf8372b16180211aa Gerrit-Change-Number: 37864 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Oct 2024 15:34:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: Replace libosmo-sccp references with libosmo-sigtran
by pespin 11 Oct '24

11 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38391?usp=email ) Change subject: Replace libosmo-sccp references with libosmo-sigtran ...................................................................... Replace libosmo-sccp references with libosmo-sigtran Change-Id: I8556a9eb4e111340e2415c5adf0ad91927ce53ec --- M _testenv/testenv/podman_install.py M sccp/SCCP_Tests.ttcn M sccp/SCCP_Tests_RAW.ttcn M sgsn/testenv_generic.cfg M sgsn/testenv_sns.cfg M smlc/testenv.cfg 6 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/38391/1 diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 50ebea8..9c680b9 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -24,7 +24,7 @@ git_dir = os.path.join(testenv.args.cache, "git") bb_dir = os.path.join(git_dir, "osmocom-bb") trxcon_dir = os.path.join(bb_dir, "src/host/trxcon") - sccp_dir = os.path.join(git_dir, "libosmo-sccp") + sccp_dir = os.path.join(git_dir, "libosmo-sigtran") jobs = multiprocessing.cpu_count() + 1 os.makedirs(git_dir, exist_ok=True) @@ -59,9 +59,9 @@ ) -def clone_libosmo_sccp(): +def clone_libosmo_sigtran(): if os.path.exists(sccp_dir): - logging.debug("libosmo-sccp: already cloned") + logging.debug("libosmo-sigtran: already cloned") return testenv.cmd.run( @@ -72,7 +72,7 @@ "clone", "--depth", "1", - "https://gerrit.osmocom.org/libosmo-sccp", + "https://gerrit.osmocom.org/libosmo-sigtran", ] ) @@ -104,7 +104,7 @@ ) if not os.path.exists(sccp_demo_user_path): - clone_libosmo_sccp() + clone_libosmo_sigtran() logging.info("Building sccp_demo_user") testenv.cmd.run(["autoreconf", "-fi"], cwd=sccp_dir) testenv.cmd.run(["./configure"], cwd=sccp_dir) diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn index 62c62c6..e63dfce 100644 --- a/sccp/SCCP_Tests.ttcn +++ b/sccp/SCCP_Tests.ttcn @@ -3,7 +3,7 @@ * All Rights Reserved * * The idea is that these tests are executed against sccp_demo_user from - * libosmo-sccp.git in server mode. + * libosmo-sigtran.git in server mode. * * Released under the terms of GNU General Public License, Version 2 or * (at your option) any later version. @@ -36,7 +36,7 @@ port TELNETasp_PT SCCP_DEMO_USER_VTY; /* SCCP protocol runs on top of M3UA Emulation. - * "System Under Test" is libosmo-sccp's sccp_demo_user example program. */ + * "System Under Test" is libosmo-sigtran's sccp_demo_user example program. */ var SCCP_CT vc_SCCP_A; var M3UA_CT vc_M3UA; port SCCPasp_PT A_PORT; @@ -96,7 +96,7 @@ } /* - * libosmo-sccp does not support Global Title address as a routing indicator. + * libosmo-sigtran does not support Global Title address as a routing indicator. * But sccp_demo_user should not crash if such a message is received (see OS#2666). */ testcase TC_routing_global_title_crash() runs on MTC_CT system system_CT { @@ -121,7 +121,7 @@ * The M3UA Emulation layer has buffered the packet and is going * to send it when the sccp_demo_user SCCP client connects. * - * libosmo-sccp will echo the packet back at us in an SCCP UDTS packet. + * libosmo-sigtran will echo the packet back at us in an SCCP UDTS packet. * However, the current M3UA Emulation implementation will discard this * response because it arrives on a separate SCTP association and the * emulation only supports one association at a time. diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5849dad..f1f602c 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -2,7 +2,7 @@ * All Rights Reserved * * The idea is that these tests are executed against sccp_demo_user from - * libosmo-sccp.git in server mode. + * libosmo-sigtran.git in server mode. * * Released under the terms of GNU General Public License, Version 2 or * (at your option) any later version. @@ -33,7 +33,7 @@ port TELNETasp_PT SCCP_DEMO_USER_VTY; /* SCCP raw port runs on top of M3UA Emulation. - * "System Under Test" is libosmo-sccp's sccp_demo_user example program. */ + * "System Under Test" is libosmo-sigtran's sccp_demo_user example program. */ var M3UA_CT vc_M3UA; port SCCP_CODEC_PT MTP3; diff --git a/sgsn/testenv_generic.cfg b/sgsn/testenv_generic.cfg index d439c43..d58b49d 100644 --- a/sgsn/testenv_generic.cfg +++ b/sgsn/testenv_generic.cfg @@ -4,7 +4,7 @@ [stp] program=osmo-stp -make=libosmo-sccp +make=libosmo-sigtran package=osmo-stp copy=osmo-stp.cfg diff --git a/sgsn/testenv_sns.cfg b/sgsn/testenv_sns.cfg index 7feb5d3..4972e4d 100644 --- a/sgsn/testenv_sns.cfg +++ b/sgsn/testenv_sns.cfg @@ -4,7 +4,7 @@ [stp] program=osmo-stp -make=libosmo-sccp +make=libosmo-sigtran package=osmo-stp copy=osmo-stp.cfg diff --git a/smlc/testenv.cfg b/smlc/testenv.cfg index a52cb12..2fbdbf3 100644 --- a/smlc/testenv.cfg +++ b/smlc/testenv.cfg @@ -4,7 +4,7 @@ [stp] program=osmo-stp -make=libosmo-sccp +make=libosmo-sigtran package=osmo-stp copy=osmo-stp.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8556a9eb4e111340e2415c5adf0ad91927ce53ec Gerrit-Change-Number: 38391 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-sgsn[master]: Add Routing Areas
by fixeria 11 Oct '24

11 Oct '24

Attention is currently required from: daniel, lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email ) Change subject: Add Routing Areas ...................................................................... Patch Set 16: (1 comment) File tests/testsuite.at: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/18b2a505_060bea5e?us… : PS15, Line 21: ignore > Done Done, but no changes from previous revision? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2474b19a7471a1dea3c863ddf8372b16180211aa Gerrit-Change-Number: 37864 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Oct 2024 15:33:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[L] Change in osmo-sgsn[master]: Add Routing Areas
by lynxis lazus 11 Oct '24

11 Oct '24

Attention is currently required from: daniel, fixeria. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email ) Change subject: Add Routing Areas ...................................................................... Patch Set 16: (3 comments) File src/sgsn/gprs_routing_area.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/f543733a_d70cc753?us… : PS15, Line 1: /* SGSN Routing Area for 2G */ > missing a copyright header Done File tests/gprs_routing_area/gprs_routing_area_test.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/67a0255d_087372ef?us… : PS15, Line 329: static struct log_info_cat gprs_categories[] = { > Most likely not, I copied it over from the other tests. I've removed more categories, the remaining ones might become handy or a somehow related. File tests/testsuite.at: https://gerrit.osmocom.org/c/osmo-sgsn/+/37864/comment/13181808_5e1ac476?us… : PS15, Line 21: ignore > But in this specific case the stderr contains logging generated by test. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2474b19a7471a1dea3c863ddf8372b16180211aa Gerrit-Change-Number: 37864 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Oct 2024 15:29:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

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

11 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38109?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: pespin: Looks good to me, approved dexter: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified 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: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7f831e7ee0014a2241a69f7c75f2c6404bbb7087 Gerrit-Change-Number: 38109 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

11 Oct '24

lynxis lazus has submitted this change. ( 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 include/osmocom/msc/sgs_iface.h M include/osmocom/msc/vlr_sgs.h M src/libmsc/paging.c M src/libmsc/sgs_iface.c M src/libvlr/vlr_sgs_fsm.c 5 files changed, 13 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/sgs_iface.h b/include/osmocom/msc/sgs_iface.h index a319663..b5ff489 100644 --- a/include/osmocom/msc/sgs_iface.h +++ b/include/osmocom/msc/sgs_iface.h @@ -86,7 +86,7 @@ struct sgs_state *sgs_iface_init(void *ctx, struct gsm_network *network); int sgs_iface_rx(struct sgs_connection *sgc, struct msgb *msg); enum sgsap_service_ind sgs_serv_ind_from_paging_cause(enum paging_cause); -int sgs_iface_tx_paging(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind); +int sgs_iface_paging_cb(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind); int sgs_iface_tx_dtap_ud(struct msc_a *msc_a, struct msgb *msg); void sgs_iface_tx_release(struct vlr_subscr *vsub); void sgs_iface_tx_serv_abrt(struct vlr_subscr *vsub); diff --git a/include/osmocom/msc/vlr_sgs.h b/include/osmocom/msc/vlr_sgs.h index aade5d3..7193fa5 100644 --- a/include/osmocom/msc/vlr_sgs.h +++ b/include/osmocom/msc/vlr_sgs.h @@ -81,7 +81,7 @@ typedef void (*vlr_sgs_lu_response_cb_t) (struct sgs_lu_response *response); /* This callback function is called in cases where a paging request is required - * after the LU is completed */ + * after the LU is completed or when a paging expired */ typedef int (*vlr_sgs_lu_paging_cb_t) (struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind); /* This callback function is called to send the MM info to the UE. */ diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index 9b3dad5..6e3d20e 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -71,7 +71,7 @@ case OSMO_RAT_UTRAN_IU: return ran_peers_down_paging(net->iu.sri, CELL_IDENT_LAC, vsub, pr->cause); case OSMO_RAT_EUTRAN_SGS: - return sgs_iface_tx_paging(vsub, sgs_serv_ind_from_paging_cause(pr->cause)); + return sgs_iface_paging_cb(vsub, sgs_serv_ind_from_paging_cause(pr->cause)); default: LOG_PAGING(vsub, pr, LOGL_ERROR, "Cannot page, subscriber not attached\n"); return -EINVAL; diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index a845ab8..0147d3f 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -466,16 +466,21 @@ } } -/*! 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. */ -int sgs_iface_tx_paging(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind) +int sgs_iface_paging_cb(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind) { struct msgb *resp; 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"); @@ -662,7 +667,7 @@ /* Perform actual location update */ memcpy(vlr_sgs_cfg.timer, sgc->sgs->cfg.timer, sizeof(vlr_sgs_cfg.timer)); memcpy(vlr_sgs_cfg.counter, sgc->sgs->cfg.counter, sizeof(vlr_sgs_cfg.counter)); - rc = vlr_sgs_loc_update(gsm_network->vlr, &vlr_sgs_cfg, sgs_tx_loc_upd_resp_cb, sgs_iface_tx_paging, + rc = vlr_sgs_loc_update(gsm_network->vlr, &vlr_sgs_cfg, sgs_tx_loc_upd_resp_cb, sgs_iface_paging_cb, sgs_tx_mm_info_cb, mme_name, type, imsi, &new_lai, last_eutran_plmn); if (rc != 0) { resp = gsm29118_create_lu_rej(imsi, SGSAP_SGS_CAUSE_IMSI_UNKNOWN, NULL); diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index 2771cf5..9aac74b 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -24,7 +24,6 @@ #include <osmocom/msc/debug.h> #include <osmocom/msc/vlr.h> #include <osmocom/msc/vlr_sgs.h> -#include <osmocom/msc/paging.h> #include "vlr_sgs_fsm.h" #include "vlr_core.h" @@ -64,8 +63,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: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7a3d15e8f0fb51c6b32add2de5024fc4d599ecf0 Gerrit-Change-Number: 38107 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

11 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38108?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: laforge: Looks good to me, but someone else must approve dexter: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, approved 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: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I89ffdb98e98133bd28023a19076f3a5f02e520d2 Gerrit-Change-Number: 38108 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

11 Oct '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38110?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved 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: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia3170c3fe48402ab01bf994fd8d3fa8eec699647 Gerrit-Change-Number: 38110 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

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

11 Oct '24

lynxis lazus has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 05bea8a..8170a1f 100644 --- a/configure.ac +++ b/configure.ac @@ -234,6 +234,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 b5ff489..00e7ebc 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 c27caab..dafb41c 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 ed36302..6536d0b 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 328d047..3566e76 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 ab40f02..86b4a4f 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 59f1a57..97f723c 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 dfed117..92b166f 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 6e3d20e..8c166c9 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 0147d3f..178aa64 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 9aac74b..c7a9fdd 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 "vlr_sgs_fsm.h" #include "vlr_core.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: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8b18b05091b35e744b3234d1ce0d537f56bccf07 Gerrit-Change-Number: 38111 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: netdev: osmo_netdev_set_ifupdown_ind_cb(): Fix documentation copy-pas...
by pespin 11 Oct '24

11 Oct '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/38376?usp=email ) Change subject: netdev: osmo_netdev_set_ifupdown_ind_cb(): Fix documentation copy-paste error ...................................................................... netdev: osmo_netdev_set_ifupdown_ind_cb(): Fix documentation copy-paste error Change-Id: I334bc7aa2fde4a880fdf25d57d24b05be8e8df85 --- M src/core/netdev.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/core/netdev.c b/src/core/netdev.c index 318134a..7ef7657 100644 --- a/src/core/netdev.c +++ b/src/core/netdev.c @@ -750,9 +750,9 @@ return netdev->priv_data; } -/*! Set data_ind_cb callback, called when a new packet is received on the network interface. +/*! Set ifupdown_ind_cb callback, called when the link status (UP/DOWN) changes. * \param[in] netdev The netdev object where the field is set - * \param[in] data_ind_cb the user provided function to be called when the link status (UP/DOWN) changes + * \param[in] ifupdown_ind_cb the user provided function to be called when the link status (UP/DOWN) changes */ void osmo_netdev_set_ifupdown_ind_cb(struct osmo_netdev *netdev, osmo_netdev_ifupdown_ind_cb_t ifupdown_ind_cb) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I334bc7aa2fde4a880fdf25d57d24b05be8e8df85 Gerrit-Change-Number: 38376 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0