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

Change in osmo-msc[master]: sms_queue: refactor sms_pending add/remove code

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28118 ) Change subject: sms_queue: refactor sms_pending add/remove code ...................................................................... sms_queue: refactor sms_pending add/remove code This avoids every caller from manually having to remember to increment the count, the stat_item and llist_{add,del}. Change-Id: Ice4c73727ef2d7e4118f0ef5fe24cae943c7528f --- M src/libmsc/sms_queue.c 1 file changed, 19 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 1d14ff0..461b3af 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -206,9 +206,19 @@ return pending; } -/* release a gsm_sms_pending object */ -static void sms_pending_free(struct gsm_sms_pending *pending) +/* add (append) a gsm_sms_pending to the queue pending_sms list */ +static void sms_pending_add(struct gsm_sms_queue *smsq, struct gsm_sms_pending *pending) { + smsq->pending += 1; + smsq_stat_item_inc(smsq, SMSQ_STAT_SMS_RAM_PENDING); + llist_add_tail(&pending->entry, &smsq->pending_sms); +} + +/* release a gsm_sms_pending object */ +static void sms_pending_free(struct gsm_sms_queue *smsq, struct gsm_sms_pending *pending) +{ + smsq->pending -= 1; + smsq_stat_item_dec(smsq, SMSQ_STAT_SMS_RAM_PENDING); vlr_subscr_put(pending->vsub, VSUB_USE_SMS_PENDING); llist_del(&pending->entry); talloc_free(pending); @@ -247,9 +257,7 @@ if (pending->failed_attempts < smsq->max_fail) return sms_pending_resend(pending); - sms_pending_free(pending); - smsq->pending -= 1; - smsq_stat_item_dec(smsq, SMSQ_STAT_SMS_RAM_PENDING); + sms_pending_free(smsq, pending); } /* Resend all SMS that are scheduled for a resend. This is done to @@ -270,9 +278,7 @@ /* the sms is gone? Move to the next */ if (!sms) { - sms_pending_free(pending); - smsq->pending -= 1; - smsq_stat_item_dec(smsq, SMSQ_STAT_SMS_RAM_PENDING); + sms_pending_free(smsq, pending); sms_queue_trigger(smsq); } else { pending->resend = 0; @@ -407,9 +413,7 @@ } attempted += 1; - smsq->pending += 1; - smsq_stat_item_inc(smsq, SMSQ_STAT_SMS_RAM_PENDING); - llist_add_tail(&pending->entry, &smsq->pending_sms); + sms_pending_add(smsq, pending); _gsm411_send_sms(smsq->network, sms->receiver, sms); } while (attempted < attempts && rounds < 1000); @@ -447,9 +451,7 @@ goto no_pending_sms; } - smsq->pending += 1; - smsq_stat_item_inc(smsq, SMSQ_STAT_SMS_RAM_PENDING); - llist_add_tail(&pending->entry, &smsq->pending_sms); + sms_pending_add(smsq, pending); _gsm411_send_sms(smsq->network, sms->receiver, sms); return; @@ -594,21 +596,17 @@ case S_SMS_DELIVERED: smsq_rate_ctr_inc(network->sms_queue, SMSQ_CTR_SMS_DELIVERY_ACK); /* Remember the subscriber and clear the pending entry */ - network->sms_queue->pending -= 1; - smsq_stat_item_dec(network->sms_queue, SMSQ_STAT_SMS_RAM_PENDING); vsub = pending->vsub; vlr_subscr_get(vsub, __func__); db_sms_delete_sent_message_by_id(pending->sms_id); - sms_pending_free(pending); + sms_pending_free(network->sms_queue, 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); - network->sms_queue->pending -= 1; - smsq_stat_item_dec(network->sms_queue, SMSQ_STAT_SMS_RAM_PENDING); - sms_pending_free(pending); + sms_pending_free(network->sms_queue, pending); sms_queue_trigger(network->sms_queue); break; case S_SMS_UNKNOWN_ERROR: @@ -681,10 +679,8 @@ llist_for_each_entry_safe(pending, tmp, &smsq->pending_sms, entry) { LOGP(DLSMS, LOGL_NOTICE, "SMSqueue clearing for sub %llu\n", pending->vsub->id); - sms_pending_free(pending); + sms_pending_free(smsq, pending); } - smsq->pending = 0; - smsq_stat_item_set(smsq, SMSQ_STAT_SMS_RAM_PENDING, 0); return 0; } 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice4c73727ef2d7e4118f0ef5fe24cae943c7528f Gerrit-Change-Number: 28118 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

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

by laforge

Attention is currently required from: neels, pespin, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28114 ) Change subject: WIP: switch from libdbi to lbsqlite3 ...................................................................... Patch Set 8: Verified+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: 8 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 16 May 2022 20:17:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

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

by laforge

Attention is currently required from: neels, laforge, pespin, keith. laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28114 ) Change subject: WIP: switch from libdbi to lbsqlite3 ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- 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: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: deleteVote

3 years, 1 month

1
0
0 0

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

by laforge

Attention is currently required from: neels, laforge, pespin, keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28114 ) Change subject: WIP: switch from libdbi to lbsqlite3 ...................................................................... Set Ready For Review -- 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: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 16 May 2022 20:16:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: fsm_vty: use unsigned int when left-shifting 31 bits!

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28128 ) Change subject: fsm_vty: use unsigned int when left-shifting 31 bits! ...................................................................... fsm_vty: use unsigned int when left-shifting 31 bits! fsm_vty.c:64:8: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' Change-Id: I637bce52fae947922cbb8642a0313d174c827422 --- M src/vty/fsm_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/28128/1 diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c index 025d0d8..777d38c 100644 --- a/src/vty/fsm_vty.c +++ b/src/vty/fsm_vty.c @@ -61,7 +61,7 @@ if (fsm->event_names) { for (evt_name = fsm->event_names; evt_name->str != NULL; evt_name++) { vty_out(vty, "%s Event %02u (0x%08x): '%s'%s", prefix, evt_name->value, - (1 << evt_name->value), evt_name->str, VTY_NEWLINE); + (1U << evt_name->value), evt_name->str, VTY_NEWLINE); } } else vty_out(vty, "%s No event names are defined for this FSM! Please fix!%s", prefix, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I637bce52fae947922cbb8642a0313d174c827422 Gerrit-Change-Number: 28128 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: prevent marking FACCH frames as AMR's special DTX frames

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28127 ) Change subject: coding: prevent marking FACCH frames as AMR's special DTX frames ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2e6f4b748c6445725211e264ab5f3f5a2712087a Gerrit-Change-Number: 28127 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 May 2022 20:10:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: don't enqueue write messages if ESME is disconnected

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28126 ) Change subject: smpp: don't enqueue write messages if ESME is disconnected ...................................................................... smpp: don't enqueue write messages if ESME is disconnected If the ESME has been disconnected (dead socket) but still is in memory (other users hold a use count), we shouldn't enqueue messages to the write queue. This prevents messages like DSMPP write_queue.c:112 wqueue(0x7f8bc392f6e0) is full. Rejecting msgb Change-Id: I10a270f1d555782be272f4d78da43190618a9950 Closes: OS#3278 --- M src/libmsc/smpp_smsc.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 6712032..34391c2 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -347,8 +347,15 @@ #define PACK_AND_SEND(esme, ptr) pack_and_send(esme, (ptr)->command_id, ptr) static int pack_and_send(struct osmo_esme *esme, uint32_t type, void *ptr) { - struct msgb *msg = msgb_alloc(4096, "SMPP_Tx"); + struct msgb *msg; int rc, rlen; + + /* the socket was closed. Avoid allocating + enqueueing msgb, see + * https://osmocom.org/issues/3278 */ + if (esme->wqueue.bfd.fd == -1) + return -EIO; + + msg = msgb_alloc(4096, "SMPP_Tx"); if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I10a270f1d555782be272f4d78da43190618a9950 Gerrit-Change-Number: 28126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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 osmo-msc[master]: smpp: Fix use-after-free bug when ESME disconnects but has write pending

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28125 ) Change subject: smpp: Fix use-after-free bug when ESME disconnects but has write pending ...................................................................... smpp: Fix use-after-free bug when ESME disconnects but has write pending When the SMPP code free's an ESME it also free's the related write_queue and the osmo_fd contained therein. So if this happens while we are in esme_link_read_cb(), we must return -EBADF to make osmo_wqueue_bfd_cb() of libosmocore avoid further accessing related memory. Change-Id: I441d3b05c2f2556c530783a7f66c73adf6d845a1 Closes: OS#5565 --- M src/libmsc/smpp_smsc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 4581865..6712032 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -888,7 +888,7 @@ esme->acl->esme = NULL; smpp_esme_put(esme); - return 0; + return -EBADF; } /* call-back of write queue once it wishes to write a message to the socket */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I441d3b05c2f2556c530783a7f66c73adf6d845a1 Gerrit-Change-Number: 28125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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 libosmocore[master]: coding: prevent marking FACCH frames as AMR's special DTX frames

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28127 ) Change subject: coding: prevent marking FACCH frames as AMR's special DTX frames ...................................................................... coding: prevent marking FACCH frames as AMR's special DTX frames Both gsm0503_tch_a[fh]s_decode_dtx() functions accept an optional 'dtx' pointer, which is used to indicate type of a received AMR block to the caller in DTX mode of operation. If not NULL, it's expected to be updated by gsm0503_detect_a[fh]s_dtx_frame() every time one of the mentioned functions is called. However, in case of FACCH both functions return early, so the value of dtx remains unchanged and thus FACCH frames may be misinterpreted as AMR's special DTX frames. This is rather critical during the DTX silence periods, when all special DTX frames (e.g. SID_UPDATE) are being treated as SUB frames. Each unsuccessful FACCH decoding attempt will 'poison' SUB measurements, causing unexpected RxQual- SUB values in the Uplink measurement reports. Fix this by resetting *dtx to AMR_OTHER in the FACCH specific path. Change-Id: I2e6f4b748c6445725211e264ab5f3f5a2712087a Related: SYS#5853 --- M src/coding/gsm0503_coding.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/28127/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 98439e3..e81bf02 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2171,6 +2171,12 @@ gsm0503_tch_fr_deinterleave(cB, iB); if (steal > 0) { + /* If not NULL, dtx indicates type of previously decoded TCH/AFS frame. + * It's normally updated by gsm0503_detect_afs_dtx_frame(), which is not + * reached in case of FACCH. Reset it here to avoid FACCH/F frames being + * misinterpreted as AMR's special DTX frames. */ + if (dtx != NULL) + *dtx = AMR_OTHER; rv = _xcch_decode_cB(tch_data, cB, n_errors, n_bits_total); if (rv) { /* Error decoding FACCH frame */ @@ -2633,6 +2639,13 @@ /* if we found a stole FACCH, but only at correct alignment */ if (steal > 0) { + /* If not NULL, dtx indicates type of previously decoded TCH/AHS frame. + * It's normally updated by gsm0503_detect_ahs_dtx_frame(), which is not + * reached in case of FACCH. Reset it here to avoid FACCH/H frames being + * misinterpreted as AMR's special DTX frames. */ + if (dtx != NULL) + *dtx = AMR_OTHER; + for (i = 0; i < 6; i++) { gsm0503_tch_burst_unmap(&iB[i * 114], &bursts[i * 116], NULL, i >> 2); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2e6f4b748c6445725211e264ab5f3f5a2712087a Gerrit-Change-Number: 28127 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: don't enqueue write messages if ESME is disconnected

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28126 ) Change subject: smpp: don't enqueue write messages if ESME is disconnected ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I10a270f1d555782be272f4d78da43190618a9950 Gerrit-Change-Number: 28126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 May 2022 16:07:14 +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