May 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: common/Release.key: update

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28164 ) Change subject: common/Release.key: update ...................................................................... common/Release.key: update The current key is about to expire (2022-05-22). Update to the new one, obtained from: https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian… Change-Id: I30d51435108c4763a92d57de223503d4ca4b0969 --- M common/Release.key 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/common/Release.key b/common/Release.key index a737316..4257562 100644 --- a/common/Release.key +++ b/common/Release.key @@ -7,14 +7,14 @@ 5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy -b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4 -pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH -/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY -VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi -K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa -X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW -XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig -7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXoL5 +awIbAwUJEF/xbwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fBFkH +/Ry9IT3WkpyrKLi6wlTKBZTDGz58xDEd6i4fKr1sepgfexzmu/t1125A4Jyuy5Qp +wolWdVIxmo8Mo9/u16ssGV/Iiy4y+3v+yfOExUeaM5XS4eW5cWcySBi+y3PGL17o +Qf/iZDnzJtx16kMgD+lybTFSRDhRg4BV1egMMtOV/XIhC7mp0Gt6oOU72fGuWFKs +3prY+XmL20x8+FfI35sXRAQu2L7OBDnUJoHHuHIT1s5no5JSYubctY/KNT/9YGme +DSspyOxXJTo6YgOJStyMQZ3DaE4XxSnGpzPV27OnfMWjRf+KLvgFjx9n/zPIzBTh +Q9gL7GfQUOkJ5L0GrOvVxBiIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= -=/Tek +=zwAO -----END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30d51435108c4763a92d57de223503d4ca4b0969 Gerrit-Change-Number: 28164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: common/Release.key: update

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28164 ) Change subject: common/Release.key: update ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I30d51435108c4763a92d57de223503d4ca4b0969 Gerrit-Change-Number: 28164 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:35:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Make default SMS validity period configurable via VTY

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28137 ) Change subject: sms: Make default SMS validity period configurable via VTY ...................................................................... sms: Make default SMS validity period configurable via VTY Change-Id: Ie2c81c1d5795dd9aaf07b9766013f20b01abc762 --- M include/osmocom/msc/sms_queue.h M src/libmsc/smpp_openbsc.c M src/libmsc/sms_queue.c M src/libmsc/smsc_vty.c M tests/test_nodes.vty 5 files changed, 18 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved keith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/sms_queue.h b/include/osmocom/msc/sms_queue.h index ccc56ab..c3a6cfb 100644 --- a/include/osmocom/msc/sms_queue.h +++ b/include/osmocom/msc/sms_queue.h @@ -13,6 +13,7 @@ int max_pending; /* maximum number of gsm_sms_pending in RAM */ bool delete_delivered; /* delete delivered SMS from DB? */ bool delete_expired; /* delete expired SMS from DB? */ + unsigned int default_validity_mins; /* default validity period in minutes */ }; struct sms_queue_config *sms_queue_cfg_alloc(void *ctx); diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 4ce6c27..64d4f1e 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -263,7 +263,7 @@ t_validity_absolute = smpp_parse_time_format((const char *) submit->validity_period, &t_now); if (!t_validity_absolute) - sms->validity_minutes = 7 * 24 * 60; /* default: 7 days */ + sms->validity_minutes = net->sms_queue_cfg->default_validity_mins; else sms->validity_minutes = (t_validity_absolute - t_now) / 60; diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 7d1860f..24811c5 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -474,6 +474,7 @@ sqcfg->max_fail = 1; sqcfg->delete_delivered = true; sqcfg->delete_expired = true; + sqcfg->default_validity_mins = 7 * 24 * 60; /* 7 days */ sqcfg->db_file_path = talloc_strdup(ctx, SMS_DEFAULT_DB_FILE_PATH); return sqcfg; diff --git a/src/libmsc/smsc_vty.c b/src/libmsc/smsc_vty.c index b2d191a..547b7d5 100644 --- a/src/libmsc/smsc_vty.c +++ b/src/libmsc/smsc_vty.c @@ -98,6 +98,17 @@ return CMD_SUCCESS; } +DEFUN(cfg_sms_def_val_per, cfg_sms_def_val_per_cmd, + "validity-period default <1-5256000>", + "Configure validity period for SMS\n" + "Default SMS validity period in minutes\n" + "Default SMS validity period in minutes\n") +{ + smqcfg->default_validity_mins = atoi(argv[0]); + return CMD_SUCCESS; +} + + /*********************************************************************** * View / Enable Node ***********************************************************************/ @@ -166,6 +177,8 @@ vty_out(vty, " database delete-delivered %u%s", smqcfg->delete_delivered, VTY_NEWLINE); vty_out(vty, " database delete-expired %u%s", smqcfg->delete_expired, VTY_NEWLINE); + vty_out(vty, " validity-period default %u%s", smqcfg->default_validity_mins, VTY_NEWLINE); + return 0; } @@ -183,6 +196,7 @@ install_element(SMSC_NODE, &cfg_sms_queue_fail_cmd); install_element(SMSC_NODE, &cfg_sms_db_del_delivered_cmd); install_element(SMSC_NODE, &cfg_sms_db_del_expired_cmd); + install_element(SMSC_NODE, &cfg_sms_def_val_per_cmd); /* enable node */ install_element(ENABLE_NODE, &smsqueue_trigger_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index ac3ff16..cb617fc 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -183,6 +183,7 @@ queue max-failure 1 database delete-delivered 1 database delete-expired 1 + validity-period default 10080 end OsmoMSC# configure terminal -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie2c81c1d5795dd9aaf07b9766013f20b01abc762 Gerrit-Change-Number: 28137 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Introduce VTY-configurable minimum SMS validity period

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28138 ) Change subject: sms: Introduce VTY-configurable minimum SMS validity period ...................................................................... sms: Introduce VTY-configurable minimum SMS validity period This is meant as a safeguard against users or user equipment which doesn't set a reasonable validity period. Using this setting, the SMSC administrator can set a minimum SMS validity period. Any SMS submitted with lower validity period will be extended to that minimum. Change-Id: I192528a6f9059d158fa12876a247d61bd7edaec8 Related: OS#5567 --- M include/osmocom/msc/sms_queue.h M src/libmsc/gsm_04_11.c M src/libmsc/smpp_openbsc.c M src/libmsc/sms_queue.c M src/libmsc/smsc_vty.c M tests/test_nodes.vty 6 files changed, 24 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/sms_queue.h b/include/osmocom/msc/sms_queue.h index c3a6cfb..a6e6aeb 100644 --- a/include/osmocom/msc/sms_queue.h +++ b/include/osmocom/msc/sms_queue.h @@ -13,6 +13,7 @@ int max_pending; /* maximum number of gsm_sms_pending in RAM */ bool delete_delivered; /* delete delivered SMS from DB? */ bool delete_expired; /* delete expired SMS from DB? */ + unsigned int minimum_validity_mins; /* minimum validity period in minutes */ unsigned int default_validity_mins; /* default validity period in minutes */ }; diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 722973e..743e272 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -626,6 +626,12 @@ osmo_hexdump(gsms->user_data, gsms->user_data_len)); gsms->validity_minutes = gsm340_validity_period(sms_vpf, sms_vp); + if (gsms->validity_minutes < net->sms_queue_cfg->minimum_validity_mins) { + LOG_TRANS(trans, LOGL_INFO, "Overriding user-provided validity period (%lu) " + "with minimum SMSC validity period (%u) minutes\n", gsms->validity_minutes, + net->sms_queue_cfg->minimum_validity_mins); + gsms->validity_minutes = net->sms_queue_cfg->minimum_validity_mins; + } rc = sms_route_mt_sms(trans, gsms); diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 64d4f1e..91666a9 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -267,6 +267,13 @@ else sms->validity_minutes = (t_validity_absolute - t_now) / 60; + if (sms->validity_minutes < net->sms_queue_cfg->minimum_validity_mins) { + LOGP(DLSMS, LOGL_INFO, "SMS to %s: Overriding ESME-provided validity period (%lu) " + "with minimum SMSC validity period (%u) minutes\n", submit->destination_addr, + sms->validity_minutes, net->sms_queue_cfg->minimum_validity_mins); + sms->validity_minutes = net->sms_queue_cfg->minimum_validity_mins; + } + *psms = sms; return ESME_ROK; } diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 24811c5..9f18f4f 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -475,6 +475,7 @@ sqcfg->delete_delivered = true; sqcfg->delete_expired = true; sqcfg->default_validity_mins = 7 * 24 * 60; /* 7 days */ + sqcfg->minimum_validity_mins = 1; sqcfg->db_file_path = talloc_strdup(ctx, SMS_DEFAULT_DB_FILE_PATH); return sqcfg; diff --git a/src/libmsc/smsc_vty.c b/src/libmsc/smsc_vty.c index 547b7d5..e99b236 100644 --- a/src/libmsc/smsc_vty.c +++ b/src/libmsc/smsc_vty.c @@ -99,12 +99,16 @@ } DEFUN(cfg_sms_def_val_per, cfg_sms_def_val_per_cmd, - "validity-period default <1-5256000>", + "validity-period (minimum|default) <1-5256000>", "Configure validity period for SMS\n" + "Minimum SMS validity period in minutes\n" "Default SMS validity period in minutes\n" - "Default SMS validity period in minutes\n") + "Validity period in minutes\n") { - smqcfg->default_validity_mins = atoi(argv[0]); + if (!strcmp(argv[0], "minimum")) + smqcfg->minimum_validity_mins = atoi(argv[1]); + else + smqcfg->default_validity_mins = atoi(argv[1]); return CMD_SUCCESS; } @@ -177,6 +181,7 @@ vty_out(vty, " database delete-delivered %u%s", smqcfg->delete_delivered, VTY_NEWLINE); vty_out(vty, " database delete-expired %u%s", smqcfg->delete_expired, VTY_NEWLINE); + vty_out(vty, " validity-period minimum %u%s", smqcfg->minimum_validity_mins, VTY_NEWLINE); vty_out(vty, " validity-period default %u%s", smqcfg->default_validity_mins, VTY_NEWLINE); return 0; diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index cb617fc..8ffb2bd 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -183,6 +183,7 @@ queue max-failure 1 database delete-delivered 1 database delete-expired 1 + validity-period minimum 1 validity-period default 10080 end -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I192528a6f9059d158fa12876a247d61bd7edaec8 Gerrit-Change-Number: 28138 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: Parse and use SMPP-provided validity period

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28136 ) Change subject: smpp: Parse and use SMPP-provided validity period ...................................................................... smpp: Parse and use SMPP-provided validity period Before this patch, we always ignored any SMPP-provided validity period and used '0' which is now, and means it expires immediately. As SMPP allows for validity_period of NULL, use 7 days as SMSC default in such situations. Change-Id: Iad9f2697f045ed3bc0eb74c3a9730861f82e6c48 Closes: OS#5567 --- M configure.ac M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/smpp_utils.c M tests/smpp/smpp_test.c M tests/smpp/smpp_test.ok 6 files changed, 165 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 45f6806..4b67ea6 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,8 @@ PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.4.0) +AC_CHECK_FUNC([timegm], [AC_DEFINE(HAVE_TIMEGM, 1, Define if libc implements timegm)]) + old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 54cd75b..4ce6c27 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -1,6 +1,6 @@ /* OpenBSC SMPP 3.4 interface, SMSC-side implementation */ -/* (C) 2012-2013 by Harald Welte <laforge(a)gnumonks.org> +/* (C) 2012-2022 by Harald Welte <laforge(a)gnumonks.org> * * All Rights Reserved * @@ -24,6 +24,7 @@ #include <string.h> #include <stdint.h> #include <errno.h> +#include <time.h> #include <smpp34.h> #include <smpp34_structs.h> @@ -122,6 +123,8 @@ static int submit_to_sms(struct gsm_sms **psms, struct gsm_network *net, const struct submit_sm_t *submit) { + time_t t_now = time(NULL); + time_t t_validity_absolute; const uint8_t *sms_msg = NULL; unsigned int sms_msg_len = 0; struct vlr_subscr *dest; @@ -258,6 +261,12 @@ sms->user_data_len = sms_msg_len; } + t_validity_absolute = smpp_parse_time_format((const char *) submit->validity_period, &t_now); + if (!t_validity_absolute) + sms->validity_minutes = 7 * 24 * 60; /* default: 7 days */ + else + sms->validity_minutes = (t_validity_absolute - t_now) / 60; + *psms = sms; return ESME_ROK; } diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index 4c0d701..257589e 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -158,6 +158,7 @@ int smpp_determine_scheme(uint8_t dcs, uint8_t *data_coding, int *mode); +time_t smpp_parse_time_format(const char *vp, time_t *t_now); struct gsm_sms; diff --git a/src/libmsc/smpp_utils.c b/src/libmsc/smpp_utils.c index 7fffdd2..3c7757b 100644 --- a/src/libmsc/smpp_utils.c +++ b/src/libmsc/smpp_utils.c @@ -1,5 +1,5 @@ -/* (C) 2012-2013 by Harald Welte <laforge(a)gnumonks.org> +/* (C) 2012-2022 by Harald Welte <laforge(a)gnumonks.org> * * All Rights Reserved * @@ -17,6 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" + +#include <time.h> #include "smpp_smsc.h" #include <osmocom/core/logging.h> @@ -59,3 +62,105 @@ return 0; } + +/* convert a 'struct tm' holding relative time to an absolute one by adding it to t_now */ +static void relative2absolute(struct tm *tm, time_t t_now) +{ + struct tm tm_now; + + localtime_r(&t_now, &tm_now); + + tm->tm_year += tm_now.tm_year; + tm->tm_mon += tm_now.tm_mon; + tm->tm_mday += tm_now.tm_mday; + tm->tm_hour += tm_now.tm_hour; + tm->tm_min += tm_now.tm_min; + tm->tm_sec += tm_now.tm_sec; +} + +#ifndef HAVE_TIMEGM +/* for systems without a timegm() function, provide a reimplementation */ +static time_t timegm(struct tm *tm) +{ + const char *orig_tz = getenv("TZ"); + time_t ret; + + setenv("TZ", "UTC", 1); + + ret = mktime(tm); + + if (orig_tz) + setenv("TZ", orig_tz, 1); + else + unsetenv("TZ"); + + return ret; +} +#endif + + +/*! Parse a SMPP time format as defined in SMPP v3.4 7.1.1. + * \param[in] vp string containing the time as encoded in SMPP v3.4 + * \param[in] t_now pointer to a time value for 'now'. Can be NULL, then we call time() ourselves. + * \returns time_t value in seconds since the epoch of the absolute decoded time */ +time_t smpp_parse_time_format(const char *vp, time_t *t_now) +{ + unsigned int year, month, day, hour, minute, second, tenth, gmt_off_quarter; + char plus_minus_relative; + int gmt_off_minutes; + struct tm tm; + time_t ret; + int rc; + + memset(&tm, 0, sizeof(tm)); + + if (vp[0] == '\0') + return 0; + + /* YYMMDDhhmmsstnnp (where p can be -, + or R) */ + rc = sscanf(vp, "%2u%2u%2u%2u%2u%2u%1u%2u%c", &year, &month, &day, &hour, &minute, + &second, &tenth, &gmt_off_quarter, &plus_minus_relative); + if (rc != 9) + return (time_t) -1; + + tm.tm_year = year; + /* month handling differs between absolute/relative below... */ + tm.tm_mday = day; + tm.tm_hour = hour; + tm.tm_min = minute; + tm.tm_sec = second; + tm.tm_isdst = 0; + + switch (plus_minus_relative) { + case '+': /* time is in quarter hours advanced compared to UTC */ + if (year < 70) + tm.tm_year += 100; + tm.tm_mon = month - 1; + gmt_off_minutes = 15 * gmt_off_quarter; + tm.tm_min -= gmt_off_minutes; + ret = timegm(&tm); + break; + case '-': /* time is in quarter hours retared compared to UTC */ + if (year < 70) + tm.tm_year += 100; + tm.tm_mon = month - 1; + gmt_off_minutes = 15 * gmt_off_quarter; + tm.tm_min += gmt_off_minutes; + ret = timegm(&tm); + break; + case 'R': + /* relative time */ + tm.tm_mon = month; + if (t_now) + relative2absolute(&tm, *t_now); + else + relative2absolute(&tm, time(NULL)); + /* here we do want local time, as we're passing local time in above! */ + ret = mktime(&tm); + break; + default: + return (time_t) -1; + } + + return ret; +} diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index d86da54..4640a5f 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -1,5 +1,6 @@ /* * (C) 2013 by Holger Hans Peter Freyther + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -62,6 +63,41 @@ } } +static const char *smpp_time_tests[] = { + "\0", + "220517175524000+", + "220517175524000-", + "220517175524004+", /* 1 hour advanced compared to GMT */ + "220517175524004-", /* 1 hour retarded compared to GMT */ + "000000010000000R", /* 1 hour */ + "000001000000000R", /* 1 day */ +}; + +static void test_smpp_parse_time_format(void) +{ + time_t t_now = 1652745600; /* 2022-05-17 00:00:00 UTC */ + char *orig_tz; + + printf("Testing SMPP time format parser\n"); + + /* relative time format conversion depends on the local time */ + orig_tz = getenv("TZ"); + setenv("TZ", "UTC", 1); + + for (unsigned int i = 0; i < ARRAY_SIZE(smpp_time_tests); i++) { + time_t t = smpp_parse_time_format(smpp_time_tests[i], &t_now); + char buf[32]; + strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", gmtime(&t)); + printf("'%s': %ld == %s\n", smpp_time_tests[i], t, buf); + } + + if (orig_tz) + setenv("TZ", orig_tz, 1); + else + unsetenv("TZ"); + +} + static const struct log_info_cat smpp_mirror_default_categories[] = { [DSMPP] = { .name = "DSMPP", @@ -85,5 +121,7 @@ log_set_print_category_hex(osmo_stderr_target, 0); test_coding_scheme(); + test_smpp_parse_time_format(); + return EXIT_SUCCESS; } diff --git a/tests/smpp/smpp_test.ok b/tests/smpp/smpp_test.ok index fd44804..feb75a6 100644 --- a/tests/smpp/smpp_test.ok +++ b/tests/smpp/smpp_test.ok @@ -1 +1,9 @@ Testing coding scheme support +Testing SMPP time format parser +'': 0 == 1970-01-01 00:00:00 +'220517175524000+': 1652810124 == 2022-05-17 17:55:24 +'220517175524000-': 1652810124 == 2022-05-17 17:55:24 +'220517175524004+': 1652806524 == 2022-05-17 16:55:24 +'220517175524004-': 1652813724 == 2022-05-17 18:55:24 +'000000010000000R': 1652749200 == 2022-05-17 01:00:00 +'000001000000000R': 1652832000 == 2022-05-18 00:00:00 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad9f2697f045ed3bc0eb74c3a9730861f82e6c48 Gerrit-Change-Number: 28136 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms_queue: Use local variable rather than 9x pointer de-ref in function

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28134 ) Change subject: sms_queue: Use local variable rather than 9x pointer de-ref in function ...................................................................... sms_queue: Use local variable rather than 9x pointer de-ref in function Change-Id: Idf6eb9ec6603a0643033396ed9227e4319724145 --- M src/libmsc/sms_queue.c 1 file changed, 10 insertions(+), 9 deletions(-) Approvals: keith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index a47f8e0..ff4940a 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -584,6 +584,7 @@ void *handler_data, void *signal_data) { struct gsm_network *network = handler_data; + struct gsm_sms_queue *smq = network->sms_queue; struct sms_signal_data *sig_sms = signal_data; struct gsm_sms_pending *pending; struct vlr_subscr *vsub; @@ -591,7 +592,7 @@ /* We got a new SMS and maybe should launch the queue again. */ if (signal == S_SMS_SUBMITTED || signal == S_SMS_SMMA) { /* TODO: For SMMA we might want to re-use the radio connection. */ - sms_queue_trigger(network->sms_queue); + sms_queue_trigger(smq); return 0; } @@ -604,26 +605,26 @@ * sms that are not in our control as we just have a channel * open anyway. */ - pending = sms_find_pending(network->sms_queue, sig_sms->sms->id); + pending = sms_find_pending(smq, sig_sms->sms->id); if (!pending) return 0; switch (signal) { case S_SMS_DELIVERED: - smsq_rate_ctr_inc(network->sms_queue, SMSQ_CTR_SMS_DELIVERY_ACK); + smsq_rate_ctr_inc(smq, SMSQ_CTR_SMS_DELIVERY_ACK); /* Remember the subscriber and clear the pending entry */ vsub = pending->vsub; vlr_subscr_get(vsub, __func__); db_sms_delete_sent_message_by_id(pending->sms_id); - sms_pending_free(network->sms_queue, pending); + sms_pending_free(smq, pending); /* Attempt to send another SMS to this subscriber */ sms_send_next(vsub); vlr_subscr_put(vsub, __func__); break; case S_SMS_MEM_EXCEEDED: - smsq_rate_ctr_inc(network->sms_queue, SMSQ_CTR_SMS_DELIVERY_NOMEM); - sms_pending_free(network->sms_queue, pending); - sms_queue_trigger(network->sms_queue); + smsq_rate_ctr_inc(smq, SMSQ_CTR_SMS_DELIVERY_NOMEM); + sms_pending_free(smq, pending); + sms_queue_trigger(smq); break; case S_SMS_UNKNOWN_ERROR: /* @@ -637,12 +638,12 @@ * should flag the SMS as bad. */ if (sig_sms->paging_result) { - smsq_rate_ctr_inc(network->sms_queue, SMSQ_CTR_SMS_DELIVERY_ERR); + smsq_rate_ctr_inc(smq, SMSQ_CTR_SMS_DELIVERY_ERR); /* BAD SMS? */ db_sms_inc_deliver_attempts(sig_sms->sms); sms_pending_failed(pending, 0); } else { - smsq_rate_ctr_inc(network->sms_queue, SMSQ_CTR_SMS_DELIVERY_TIMEOUT); + smsq_rate_ctr_inc(smq, SMSQ_CTR_SMS_DELIVERY_TIMEOUT); sms_pending_failed(pending, 1); } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Idf6eb9ec6603a0643033396ed9227e4319724145 Gerrit-Change-Number: 28134 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms_queue: Make deletion of messages from DB VTY-configurable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28135 ) Change subject: sms_queue: Make deletion of messages from DB VTY-configurable ...................................................................... sms_queue: Make deletion of messages from DB VTY-configurable This introduces some VTY settings that determine if delivered or expired messages should be removed from he SQL database or not. Change-Id: Id6174875d5c01c40d987077651b27ae1acbcaa93 --- M include/osmocom/msc/sms_queue.h M src/libmsc/sms_queue.c M src/libmsc/smsc_vty.c M tests/test_nodes.vty 4 files changed, 39 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved keith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/sms_queue.h b/include/osmocom/msc/sms_queue.h index 76f885b..ccc56ab 100644 --- a/include/osmocom/msc/sms_queue.h +++ b/include/osmocom/msc/sms_queue.h @@ -1,6 +1,8 @@ #ifndef SMS_QUEUE_H #define SMS_QUEUE_H +#include <stdbool.h> + struct gsm_network; struct gsm_sms_queue; struct vty; @@ -9,6 +11,8 @@ char *db_file_path; /* SMS database file path */ int max_fail; /* maximum number of delivery failures */ int max_pending; /* maximum number of gsm_sms_pending in RAM */ + bool delete_delivered; /* delete delivered SMS from DB? */ + bool delete_expired; /* delete expired SMS from DB? */ }; struct sms_queue_config *sms_queue_cfg_alloc(void *ctx); diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index ff4940a..7d1860f 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -472,6 +472,8 @@ sqcfg->max_pending = 20; sqcfg->max_fail = 1; + sqcfg->delete_delivered = true; + sqcfg->delete_expired = true; sqcfg->db_file_path = talloc_strdup(ctx, SMS_DEFAULT_DB_FILE_PATH); return sqcfg; @@ -615,7 +617,8 @@ /* Remember the subscriber and clear the pending entry */ vsub = pending->vsub; vlr_subscr_get(vsub, __func__); - db_sms_delete_sent_message_by_id(pending->sms_id); + if (smq->cfg->delete_delivered) + db_sms_delete_sent_message_by_id(pending->sms_id); sms_pending_free(smq, pending); /* Attempt to send another SMS to this subscriber */ sms_send_next(vsub); @@ -653,7 +656,8 @@ } /* While here, attempt to remove an expired SMS from the DB. */ - db_sms_delete_oldest_expired_message(); + if (smq->cfg->delete_expired) + db_sms_delete_oldest_expired_message(); return 0; } diff --git a/src/libmsc/smsc_vty.c b/src/libmsc/smsc_vty.c index cdb81c6..b2d191a 100644 --- a/src/libmsc/smsc_vty.c +++ b/src/libmsc/smsc_vty.c @@ -76,6 +76,28 @@ return CMD_SUCCESS; } +#define DB_STR "SMS Database Configuration\n" + +DEFUN(cfg_sms_db_del_delivered, cfg_sms_db_del_delivered_cmd, + "database delete-delivered (0|1)", + DB_STR "Configure if delivered SMS are deleted from DB\n" + "Do not delete SMS after delivery\n" + "Delete SMS after delivery\n") +{ + smqcfg->delete_delivered = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_sms_db_del_expired, cfg_sms_db_del_expired_cmd, + "database delete-expired (0|1)", + DB_STR "Configure if expired SMS are deleted from DB\n" + "Do not delete SMS after expiration of validity period\n" + "Delete SMS after expiration of validity period\n") +{ + smqcfg->delete_expired = atoi(argv[0]); + return CMD_SUCCESS; +} + /*********************************************************************** * View / Enable Node ***********************************************************************/ @@ -141,6 +163,9 @@ vty_out(vty, " queue max-pending %u%s", smqcfg->max_pending, VTY_NEWLINE); vty_out(vty, " queue max-failure %u%s", smqcfg->max_fail, VTY_NEWLINE); + vty_out(vty, " database delete-delivered %u%s", smqcfg->delete_delivered, VTY_NEWLINE); + vty_out(vty, " database delete-expired %u%s", smqcfg->delete_expired, VTY_NEWLINE); + return 0; } @@ -156,6 +181,8 @@ install_element(SMSC_NODE, &cfg_sms_database_cmd); install_element(SMSC_NODE, &cfg_sms_queue_max_cmd); install_element(SMSC_NODE, &cfg_sms_queue_fail_cmd); + install_element(SMSC_NODE, &cfg_sms_db_del_delivered_cmd); + install_element(SMSC_NODE, &cfg_sms_db_del_expired_cmd); /* enable node */ install_element(ENABLE_NODE, &smsqueue_trigger_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a67f202..ac3ff16 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -181,6 +181,8 @@ smsc queue max-pending 20 queue max-failure 1 + database delete-delivered 1 + database delete-expired 1 end OsmoMSC# configure terminal -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id6174875d5c01c40d987077651b27ae1acbcaa93 Gerrit-Change-Number: 28135 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Give smsc its own VTY config node

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28133 ) Change subject: sms: Give smsc its own VTY config node ...................................................................... sms: Give smsc its own VTY config node The pre-historic sms_queue code used to have very strange aspects, such as having some parameters (max-failure, max-pending) which could only be sent from the 'enable' node, but not from a config file. Before adding more configuration parameters, let's clean this up by introducing a proper VTY config node for the 'smsc'; move the existing config commands there and add new ones for max-failure and max-pending. As the sms_queue data structure is only allocated after the config file parsing happens, we are introducing a new 'sms_queue_config' data structure. This encapsulates the public readable/writable config parameters. Change-Id: Ie8e0ab1a9f979337ff06544b9ab3820954d9804a --- M include/osmocom/msc/sms_queue.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/msc_vty.c M src/libmsc/sms_queue.c A src/libmsc/smsc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 8 files changed, 178 insertions(+), 73 deletions(-) Approvals: laforge: Looks good to me, approved keith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/sms_queue.h b/include/osmocom/msc/sms_queue.h index 492ae72..76f885b 100644 --- a/include/osmocom/msc/sms_queue.h +++ b/include/osmocom/msc/sms_queue.h @@ -21,8 +21,6 @@ /* vty helper functions */ int sms_queue_stats(struct gsm_sms_queue *, struct vty* vty); -int sms_queue_set_max_pending(struct gsm_sms_queue *, int max); -int sms_queue_set_max_failure(struct gsm_sms_queue *, int fail); int sms_queue_clear(struct gsm_sms_queue *); int sms_queue_sms_is_pending(struct gsm_sms_queue *smsq, unsigned long long sms_id); diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 2a3b18b..1e13846 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -24,11 +24,13 @@ SMPP_ESME_NODE, HLR_NODE, CFG_SGS_NODE, + SMSC_NODE, }; int bsc_vty_init_extra(void); void msc_vty_init(struct gsm_network *msc_network); +void smsc_vty_init(struct gsm_network *msc_network); struct gsm_network *gsmnet_from_vty(struct vty *vty); diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index e6a2dc1..d3b6035 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -67,6 +67,7 @@ sdp_msg.c \ silent_call.c \ sms_queue.c \ + smsc_vty.c \ transaction.c \ msc_net_init.c \ ctrl_commands.c \ diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 5ceb6c4..be05a95 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -410,7 +410,7 @@ #define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n" #define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n" -DEFUN(cfg_sms_database, cfg_sms_database_cmd, +DEFUN_DEPRECATED(cfg_sms_database, cfg_sms_database_cmd, "sms-database PATH", "Set the path to the MSC-SMS database file\n" "Relative or absolute file system path to the database file (default is '" SMS_DEFAULT_DB_FILE_PATH "')\n") @@ -754,8 +754,6 @@ static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); - if (gsmnet->sms_queue_cfg->db_file_path && strcmp(gsmnet->sms_queue_cfg->db_file_path, SMS_DEFAULT_DB_FILE_PATH)) - vty_out(vty, " sms-database %s%s", gsmnet->sms_queue_cfg->db_file_path, VTY_NEWLINE); if (gsmnet->mncc_sock_path) vty_out(vty, " mncc external %s%s", gsmnet->mncc_sock_path, VTY_NEWLINE); vty_out(vty, " mncc guard-timeout %i%s", @@ -1860,51 +1858,6 @@ return CMD_SUCCESS; } -DEFUN(show_smsqueue, - show_smsqueue_cmd, - "show sms-queue", - SHOW_STR "Display SMSqueue statistics\n") -{ - sms_queue_stats(gsmnet->sms_queue, vty); - return CMD_SUCCESS; -} - -DEFUN(smsqueue_trigger, - smsqueue_trigger_cmd, - "sms-queue trigger", - "SMS Queue\n" "Trigger sending messages\n") -{ - sms_queue_trigger(gsmnet->sms_queue); - return CMD_SUCCESS; -} - -DEFUN(smsqueue_max, - smsqueue_max_cmd, - "sms-queue max-pending <1-500>", - "SMS Queue\n" "SMS to deliver in parallel\n" "Amount\n") -{ - sms_queue_set_max_pending(gsmnet->sms_queue, atoi(argv[0])); - return CMD_SUCCESS; -} - -DEFUN(smsqueue_clear, - smsqueue_clear_cmd, - "sms-queue clear", - "SMS Queue\n" "Clear the queue of pending SMS\n") -{ - sms_queue_clear(gsmnet->sms_queue); - return CMD_SUCCESS; -} - -DEFUN(smsqueue_fail, - smsqueue_fail_cmd, - "sms-queue max-failure <1-500>", - "SMS Queue\n" "Maximum amount of delivery failures\n" "Amount\n") -{ - sms_queue_set_max_failure(gsmnet->sms_queue, atoi(argv[0])); - return CMD_SUCCESS; -} - DEFUN(cfg_mncc_int, cfg_mncc_int_cmd, "mncc-int", "Configure internal MNCC handler") @@ -2118,6 +2071,7 @@ ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc); #endif sgs_vty_init(); + smsc_vty_init(msc_network); osmo_fsm_vty_add_cmds(); @@ -2143,14 +2097,9 @@ install_element_ve(&subscriber_mstest_open_cmd); install_element_ve(&subscriber_paging_cmd); install_element_ve(&show_stats_cmd); - install_element_ve(&show_smsqueue_cmd); install_element_ve(&logging_fltr_imsi_cmd); install_element(ENABLE_NODE, &ena_subscr_expire_cmd); - install_element(ENABLE_NODE, &smsqueue_trigger_cmd); - install_element(ENABLE_NODE, &smsqueue_max_cmd); - install_element(ENABLE_NODE, &smsqueue_clear_cmd); - install_element(ENABLE_NODE, &smsqueue_fail_cmd); install_element(ENABLE_NODE, &subscriber_send_pending_sms_cmd); install_element(ENABLE_NODE, &subscriber_sms_delete_all_cmd); diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index e0433ee..a47f8e0 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -672,22 +672,6 @@ return 0; } -int sms_queue_set_max_pending(struct gsm_sms_queue *smsq, int max_pending) -{ - LOGP(DLSMS, LOGL_NOTICE, "SMSqueue old max: %d new: %d\n", - smsq->cfg->max_pending, max_pending); - smsq->cfg->max_pending = max_pending; - return 0; -} - -int sms_queue_set_max_failure(struct gsm_sms_queue *smsq, int max_fail) -{ - LOGP(DLSMS, LOGL_NOTICE, "SMSqueue max failure old: %d new: %d\n", - smsq->cfg->max_fail, max_fail); - smsq->cfg->max_fail = max_fail; - return 0; -} - int sms_queue_clear(struct gsm_sms_queue *smsq) { struct gsm_sms_pending *pending, *tmp; diff --git a/src/libmsc/smsc_vty.c b/src/libmsc/smsc_vty.c new file mode 100644 index 0000000..cdb81c6 --- /dev/null +++ b/src/libmsc/smsc_vty.c @@ -0,0 +1,168 @@ +/* SMSC interface to VTY */ +/* (C) 2016-2018 by sysmocom s.m.f.c. GmbH <info(a)sysmocom.de> + * Based on OpenBSC interface to quagga VTY (libmsc/vty_interface_layer3.c) + * (C) 2009-2022 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2009-2011 by Holger Hans Peter Freyther + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include "config.h" + +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/misc.h> + +#include <osmocom/msc/vty.h> +#include <osmocom/msc/gsm_data.h> +#include <osmocom/msc/sms_queue.h> + + +static struct gsm_network *gsmnet; +static struct sms_queue_config *smqcfg; + +/*********************************************************************** + * SMSC Config Node + ***********************************************************************/ + +static struct cmd_node smsc_node = { + SMSC_NODE, + "%s(config-smsc)# ", + 1, +}; + +DEFUN(cfg_smsc, cfg_smsc_cmd, + "smsc", "Configure SMSC options") +{ + vty->node = SMSC_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_sms_database, cfg_sms_database_cmd, + "database PATH", + "Set the path to the MSC-SMS database file\n" + "Relative or absolute file system path to the database file (default is '" SMS_DEFAULT_DB_FILE_PATH "')\n") +{ + osmo_talloc_replace_string(smqcfg, &smqcfg->db_file_path, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_sms_queue_max, cfg_sms_queue_max_cmd, + "queue max-pending <1-500>", + "SMS Queue\n" "SMS to deliver in parallel\n" "Amount\n") +{ + smqcfg->max_pending = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_sms_queue_fail, cfg_sms_queue_fail_cmd, + "queue max-failure <1-500>", + "SMS Queue\n" "Maximum number of delivery failures before giving up\n" "Amount\n") +{ + smqcfg->max_fail = atoi(argv[0]); + return CMD_SUCCESS; +} + +/*********************************************************************** + * View / Enable Node + ***********************************************************************/ + +DEFUN(show_smsqueue, + show_smsqueue_cmd, + "show sms-queue", + SHOW_STR "Display SMSqueue statistics\n") +{ + sms_queue_stats(gsmnet->sms_queue, vty); + return CMD_SUCCESS; +} + +DEFUN(smsqueue_trigger, + smsqueue_trigger_cmd, + "sms-queue trigger", + "SMS Queue\n" "Trigger sending messages\n") +{ + sms_queue_trigger(gsmnet->sms_queue); + return CMD_SUCCESS; +} + +DEFUN(smsqueue_max, + smsqueue_max_cmd, + "sms-queue max-pending <1-500>", + "SMS Queue\n" "SMS to deliver in parallel\n" "Amount\n") +{ + int max_pending = atoi(argv[0]); + vty_out(vty, "%% SMSqueue old max: %d new: %d%s", + smqcfg->max_pending, max_pending, VTY_NEWLINE); + smqcfg->max_pending = max_pending; + return CMD_SUCCESS; +} + +DEFUN(smsqueue_clear, + smsqueue_clear_cmd, + "sms-queue clear", + "SMS Queue\n" "Clear the queue of pending SMS\n") +{ + sms_queue_clear(gsmnet->sms_queue); + return CMD_SUCCESS; +} + +DEFUN(smsqueue_fail, + smsqueue_fail_cmd, + "sms-queue max-failure <1-500>", + "SMS Queue\n" "Maximum amount of delivery failures\n" "Amount\n") +{ + int max_fail = atoi(argv[0]); + vty_out(vty, "%% SMSqueue max failure old: %d new: %d%s", + smqcfg->max_fail, max_fail, VTY_NEWLINE); + smqcfg->max_fail = max_fail; + return CMD_SUCCESS; +} + +static int config_write_smsc(struct vty *vty) +{ + vty_out(vty, "smsc%s", VTY_NEWLINE); + + if (smqcfg->db_file_path && strcmp(smqcfg->db_file_path, SMS_DEFAULT_DB_FILE_PATH)) + vty_out(vty, " database %s%s", smqcfg->db_file_path, VTY_NEWLINE); + + vty_out(vty, " queue max-pending %u%s", smqcfg->max_pending, VTY_NEWLINE); + vty_out(vty, " queue max-failure %u%s", smqcfg->max_fail, VTY_NEWLINE); + + return 0; +} + +void smsc_vty_init(struct gsm_network *msc_network) +{ + OSMO_ASSERT(gsmnet == NULL); + gsmnet = msc_network; + smqcfg = msc_network->sms_queue_cfg; + + /* config node */ + install_element(CONFIG_NODE, &cfg_smsc_cmd); + install_node(&smsc_node, config_write_smsc); + install_element(SMSC_NODE, &cfg_sms_database_cmd); + install_element(SMSC_NODE, &cfg_sms_queue_max_cmd); + install_element(SMSC_NODE, &cfg_sms_queue_fail_cmd); + + /* enable node */ + install_element(ENABLE_NODE, &smsqueue_trigger_cmd); + install_element(ENABLE_NODE, &smsqueue_max_cmd); + install_element(ENABLE_NODE, &smsqueue_clear_cmd); + install_element(ENABLE_NODE, &smsqueue_fail_cmd); + + /* view / enable node */ + install_element_ve(&show_smsqueue_cmd); +} diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 9329de5..bdffb41 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -205,7 +205,7 @@ break; case 'l': fprintf(stderr, "Command line argument '-%c' is deprecated, use VTY " - "parameter 'msc' / 'sms-database %s' instead.\n", c, optarg); + "parameter 'smsc' / 'database %s' instead.\n", c, optarg); exit(2); break; case 'c': diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 14f15a2..a67f202 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -5,6 +5,7 @@ network msc sgs + smsc mncc-int hlr ... @@ -46,7 +47,6 @@ OsmoMSC(config)# msc OsmoMSC(config-msc)# list ... - sms-database PATH assign-tmsi lcls-permitted no lcls-permitted @@ -178,6 +178,9 @@ local-port 29118 local-ip 0.0.0.0 vlr-name vlr.example.net +smsc + queue max-pending 20 + queue max-failure 1 end OsmoMSC# configure terminal -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie8e0ab1a9f979337ff06544b9ab3820954d9804a Gerrit-Change-Number: 28133 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Introduce VTY-configurable minimum SMS validity period

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28138 ) Change subject: sms: Introduce VTY-configurable minimum SMS validity period ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I192528a6f9059d158fa12876a247d61bd7edaec8 Gerrit-Change-Number: 28138 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:34:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Make default SMS validity period configurable via VTY

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28137 ) Change subject: sms: Make default SMS validity period configurable via VTY ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie2c81c1d5795dd9aaf07b9766013f20b01abc762 Gerrit-Change-Number: 28137 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:34:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022