osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email )
Change subject: tests: don't run osmotestconfig.py in distcheck
......................................................................
tests: don't run osmotestconfig.py in distcheck
Call osmotestconfig.py from contrib/jenkins.sh, instead of running it as
part of the vty-tests. Previously it would run twice, once during
"make check" and another time during "make distcheck".
A follow-up patch sets state-dir to /var/lib/osmocom/osmo-sgsn in the
config that will actually be installed, and because the user that runs
the VTY tests typically does not have write access, a copy of the config
gets created in the tests directory that does not have this option.
This works fine with the VTY tests, except for osmotestconfig.py when
running as part of distcheck. I've tried to figure out why exactly it
does not work, but this isn't trivial because the script doesn't show
where the actual error is (OS#6456). It doesn't seem like a good use of
time to look into this further for now, instead it should be enough
running osmotestconfig.py once in contrib/jenkins.sh, and not have it
run as part of the VTY tests anymore.
Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3
---
M contrib/jenkins.sh
M tests/Makefile.am
2 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/64/36864/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 321beef..1b7a4d1 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -69,6 +69,8 @@
$MAKE $PARALLEL_MAKE distcheck \
|| cat-testlogs.sh
+(cd tests && osmotestconfig.py -p $(realpath ../) -w $(realpath ../) -v)
+
if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
make -C "$base/doc/manuals" publish
fi
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2c07ac9..da94ebd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,7 +52,6 @@
vty-python-test: $(top_builddir)/src/sgsn/osmo-sgsn
osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
- osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
$(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v
rm -f $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3
Gerrit-Change-Number: 36864
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email )
Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED
......................................................................
Patch Set 1:
(1 comment)
File src/libmsc/gsm_04_11.c:
https://gerrit.osmocom.org/c/osmo-msc/+/36862/comment/ce69cb7d_5b064562
PS1, Line 1276: /* FIXME: MT SMS is not guaranteed to be delivered (e.g. the MS may be detached) */
> Delivered doesn't imply it was received?
I think it does, otherwise where (to whom) it was delivered if it was not received by the subscriber?
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8
Gerrit-Change-Number: 36862
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 17 May 2024 14:28:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email )
Change subject: gsm411_send_rp_data(): add FIXME for MSC_CTR_SMS_DELIVERED
......................................................................
Patch Set 1:
(1 comment)
File src/libmsc/gsm_04_11.c:
https://gerrit.osmocom.org/c/osmo-msc/+/36862/comment/26f02385_6fcd0584
PS1, Line 1276: /* FIXME: MT SMS is not guaranteed to be delivered (e.g. the MS may be detached) */
But the counter is fine I guess? Delivered doesn't imply it was received?
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36862?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I5380035294d2fca481620638b59eae779670e9f8
Gerrit-Change-Number: 36862
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 17 May 2024 14:25:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email )
Change subject: SMS-over-GSUP: set log context in gsm411_gsup_rx()
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36861?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3414953d2aa7b075fcee1cf6e5e76c527ae7b507
Gerrit-Change-Number: 36861
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 17 May 2024 14:24:35 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36863?usp=email )
Change subject: [WIP] libvlr: proper handling of the MNRF and sending of readyForSM
......................................................................
[WIP] libvlr: proper handling of the MNRF and sending of readyForSM
This is an early, non-working attempt to implement proper handing
of the MNRF (MS Not Reachable Flag) and sending of the readyForSM
primitive (reason=MS_PRESENT) to the SMSC.
Change-Id: Idbb3c6e9a33ca0ff3e157dd6250bee600631b4bb
---
M src/libmsc/gsm_04_11.c
M src/libmsc/gsm_04_11_gsup.c
M src/libvlr/vlr_lu_fsm.c
3 files changed, 44 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/36863/1
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 11b3a02..3cd4a60 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -182,6 +182,10 @@
sms_free(sms);
}
+ /* Set the MNRF to trigger sending readyForSM */
+ if (trans->vsub != NULL)
+ trans->vsub->ms_not_reachable_flag = true;
+
/* Destroy this transaction */
trans_free(trans);
}
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 328d047..39dd784 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -155,6 +155,18 @@
if (msg_is_err && !gsup_msg->sm_rp_cause)
goto msg_error;
+#if 0
+ /* XXX: maybe include tthe .sm_alert_rsn == OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT? */
+ if (*(gsup_msg->sm_rp_mr) == 0xff) {
+ if (vsub->sub_pres_vlr_fsm != NULL) { /* XXX: no such field */
+ osmo_fsm_inst_dispatch(vsub->sub_pres_vlr_fsm,
+ msg_is_err ? SUB_PRES_VLR_E_READY_SM_ERR
+ : SUB_PRES_VLR_E_READY_SM_CNF, NULL);
+ }
+ return 0;
+ }
+#endif
+
/* Attempt to find DTAP-transaction */
trans = trans_find_by_sm_rp_mr(net, vsub, *(gsup_msg->sm_rp_mr));
if (!trans) {
diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c
index 5d8f78b..475fdcd 100644
--- a/src/libvlr/vlr_lu_fsm.c
+++ b/src/libvlr/vlr_lu_fsm.c
@@ -215,7 +215,19 @@
osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL);
return;
}
- /* FIXME: Send READY_FOR_SM via GSUP */
+
+#if 0
+ /* XXX: assuming SMS-over-GSUP and no built-in SMSC */
+ struct osmo_gsup_message gsup_msg = {
+ .message_class = OSMO_GSUP_MESSAGE_CLASS_SMS,
+ .message_type = OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST,
+ .sm_alert_rsn = OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT,
+ .sm_rp_mr = 0xff,
+ };
+ OSMO_STRLCPY_ARRAY(gsup_msg->imsi, vsub->imsi);
+ gsup_client_mux_tx(vsub->vlr->gcm, &gsup_msg);
+#endif
+
osmo_fsm_inst_state_chg(fi, SUB_PRES_VLR_S_WAIT_FOR_HLR,
LU_TIMEOUT_LONG, 0);
}
@@ -272,9 +284,8 @@
return (struct vlr_subscr*)fi->priv;
}
-/* THIS IS CURRENTLY DEAD CODE, SINCE WE NEVER SET vsub->ms_not_reachable_flag = true.
- *
- * Note that the start event is dispatched right away, so in case the FSM immediately concludes from that
+
+/* Note that the start event is dispatched right away, so in case the FSM immediately concludes from that
* event, the created FSM struct may no longer be valid as it already deallocated again, and it may
* furthermore already have invoked the parent FSM instance's deallocation as well. Hence, instead of
* returning, store the created FSM instance address in *fi_p before dispatching the event. It is thus
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36863?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Idbb3c6e9a33ca0ff3e157dd6250bee600631b4bb
Gerrit-Change-Number: 36863
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange