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

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

by keith

Attention is currently required from: laforge. keith has posted comments on 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 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I guess pointer dereferencing can be considered reasonably expensive then? :-) -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 May 2022 14:24:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

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

by keith

Attention is currently required from: laforge. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28135 ) Change subject: sms_queue: Make deletion of messages from DB VTY-configurable ...................................................................... Patch Set 1: (1 comment) File src/libmsc/smsc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/28135/comment/c8a92703_94b55f8e PS1, Line 82: "database delete-delivered (0|1)", I was thinking to make an sms node and move max-pending, max-failure here, which can currently only be changed at runtime. Also, why (0|1) and not the no delete-delivered logic? I don't want to hold it up, I can submit a subsequent patch with my ideas for review. -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 May 2022 14:22:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

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

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28135 ) Change subject: sms_queue: Make deletion of messages from DB VTY-configurable ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 May 2022 12:58:42 +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_queue: Use local variable rather than 9x pointer de-ref in function

by pespin

Attention is currently required from: laforge. pespin has posted comments on 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 ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 May 2022 12:57:58 +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: Give smsc its own VTY

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28133 ) Change subject: sms: Give smsc its own VTY ...................................................................... Patch Set 2: Code-Review+1 -- 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: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 May 2022 12:57:42 +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: Encapsulate SMS queue related config parameters

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28132 ) Change subject: sms: Encapsulate SMS queue related config parameters ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I559ab7a6e0502a1a12a662ebd5591875d47ec7b2 Gerrit-Change-Number: 28132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 May 2022 12:55:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: switch from libdbi to lbsqlite3

by pespin

Attention is currently required from: neels, laforge, keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28114 ) Change subject: switch from libdbi to lbsqlite3 ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia334904289f92d014e7bd16b02b3b5817c12c790 Gerrit-Change-Number: 28114 Gerrit-PatchSet: 10 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Tue, 17 May 2022 12:53:38 +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_queue: Use local variable rather than 9x pointer de-ref in function

by laforge

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/28134/1 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/28135/1 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: sms: Encapsulate SMS queue related config parameters

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28132 to look at the new patch set (#2). Change subject: sms: Encapsulate SMS queue related config parameters ...................................................................... sms: Encapsulate SMS queue related config parameters Introduce a 'struct sms_queue_config' that holds all config parameters related to the SMS queue. Change-Id: I559ab7a6e0502a1a12a662ebd5591875d47ec7b2 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/sms_queue.h M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/sms_queue.c M src/osmo-msc/msc_main.c 6 files changed, 53 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/28132/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I559ab7a6e0502a1a12a662ebd5591875d47ec7b2 Gerrit-Change-Number: 28132 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022