osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30206 )
Change subject: sgsn_libgtp: cb_data_ind: remove mm_idle assert
......................................................................
sgsn_libgtp: cb_data_ind: remove mm_idle assert
Log an error message and drop the packet instead of asserting if
mm state fsm is in ST_MM_IDLE while the gmm fsm is in
ST_GMM_REGISTERED_NORMAL.
Fixes: OS#5725
Change-Id: I9dab98917c622b36dae22399bb359d747a598208
---
M src/sgsn/sgsn_libgtp.c
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/06/30206/1
diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c
index 5300800..033637d 100644
--- a/src/sgsn/sgsn_libgtp.c
+++ b/src/sgsn/sgsn_libgtp.c
@@ -768,15 +768,24 @@
msgb_free(msg);
return -1;
case ST_GMM_REGISTERED_NORMAL:
- OSMO_ASSERT(mm->gb.mm_state_fsm->state != ST_MM_IDLE);
- if (mm->gb.mm_state_fsm->state == ST_MM_STANDBY) {
+ switch (mm->gb.mm_state_fsm->state) {
+ case ST_MM_IDLE:
+ LOGP(DGPRS, LOGL_ERROR, "Dropping DL packet for MS in MM state %s\n",
+ osmo_fsm_inst_state_name(mm->gb.mm_state_fsm));
+ msgb_free(msg);
+ return -1;
+ case ST_MM_READY:
+ /* Go ahead */
+ break;
+ case ST_MM_STANDBY:
LOGMMCTXP(LOGL_INFO, mm, "Paging MS in GMM state %s, MM state %s\n",
osmo_fsm_inst_state_name(mm->gmm_fsm),
osmo_fsm_inst_state_name(mm->gb.mm_state_fsm));
gprs_gb_page_ps_ra(mm);
- }
- /* FIXME: queue the packet we received from GTP */
+ /* FIXME: queue the packet we received from GTP */
+ break;
+ }
break;
default:
LOGP(DGPRS, LOGL_ERROR, "GTP DATA IND for TLLI %08X in state "
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I9dab98917c622b36dae22399bb359d747a598208
Gerrit-Change-Number: 30206
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30197 )
Change subject: osmux: Support recreating lost RTP packets at start of the batch
......................................................................
Patch Set 3:
(1 comment)
File src/osmux_input.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/30197/comment/337c0055_8e3ba0df
PS3, Line 454: 1-
> What? to me it's super clear that "1-" and "2-" are a numbered list, no matter what you use as a suf […]
ok nvm
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30197
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I9596501adf5b7b91983618c92c7b1792ee9461a3
Gerrit-Change-Number: 30197
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:44:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30195 )
Change subject: osmux: Avoid filling in seqnum holes upon rx of RTP pkt with M bit set
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
File src/osmux_input.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/30195/comment/543f6d5b_234fb2d1
PS3, Line 488: clone_req.rtph->marker = false;
> No, the fact that the currently incoming RTP packet being enqueued has no M bit set (as asserted by […]
now I see it, thanks
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30195
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I561fb836989d31f43a15b193ed9bec4103ea0f2b
Gerrit-Change-Number: 30195
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:43:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30121 )
Change subject: [codecs filter] MT call: apply remote call leg codecs
......................................................................
Patch Set 1:
(1 comment)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/30121/comment/fdf05879_fa07a988
PS1, Line 723: trans->bearer_cap = bearer_cap;
> The main aim in this function is to send a Bearer Cap to the MS in a CC Setup message, that is what […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30121
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I84d9bbca3e4061da622b1b2fc0bde8868e7e3521
Gerrit-Change-Number: 30121
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:25:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30120 )
Change subject: [codecs filter] MT call: apply BSS codec list
......................................................................
Patch Set 1:
(1 comment)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/30120/comment/972caea8_8b46bed8
PS1, Line 685: codec_filter_set_bss(&trans->cc.codecs, &trans->msc_a->cc.compl_l3_codec_list_bss_supported);
> i also stumbled on this when separating the patches, but this place here is so early in the CC that […]
ACK let's push this forward and have a look at cleaning up/improving those aspects later.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30120
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I530409a64d11da48518a3dc60aa3a4e47c384663
Gerrit-Change-Number: 30120
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:24:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30119 )
Change subject: [codecs filter] MO call: apply BSS codec list
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/30119/comment/82d1fcbf_57d3b826
PS1, Line 619: codec_filter_run(&trans->cc.codecs);
> i first wanted to run it implicitly whenever any of the input information changes, so that it always […]
For the sake of clarity understanding what is needed when I 'd prefer to get rid of it here and apply it only when needed.
In any case, you can leave it here for now, maybe add a "/* FIXME: Probably this is not needed here */"
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30119
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I062268406ae3f3a63a7f413db51c509c9eaf9e8a
Gerrit-Change-Number: 30119
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:23:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30117 )
Change subject: [codecs filter] add trans.cc.codecs
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
> see the list of [codecs filter] patches; i could merge all of those to one patch, but it would make […]
I'm happy that you are splitting patches, don't make me wrong. But perhaps this specific code should go inside the first one which actually uses that variable.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30117
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ib3fdeff8d1e1ea0760168d63ee6e1b1fb993aa5f
Gerrit-Change-Number: 30117
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:21:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30116 )
Change subject: [codecs filter] add codec_filter.h,c
......................................................................
Patch Set 1:
(1 comment)
File src/libmsc/codec_filter.c:
https://gerrit.osmocom.org/c/osmo-msc/+/30116/comment/4f5cb35a_f86dcefa
PS1, Line 124: /* If osmo-msc were able to trigger a re-assignment after the remote side has picked a codec mismatching the
> yes. […]
Okk good. Maybe simply add a "#define ALLOW_REASSIGNMENT 0" on top of the file and potentially add there a comment pointing to a ticket explaining what can be done to improve it?
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30116
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I4d90f7ca62f2307a7b93dd164aeecbf4bd98ff0a
Gerrit-Change-Number: 30116
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:20:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30197 )
Change subject: osmux: Support recreating lost RTP packets at start of the batch
......................................................................
Patch Set 3:
(1 comment)
File src/osmux_input.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/30197/comment/eb038687_550e33dd
PS3, Line 454: 1-
> how about "1)" or "1." instead, IMHO that makes it clearer that these are numbered list items. […]
What? to me it's super clear that "1-" and "2-" are a numbered list, no matter what you use as a suffix :/
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30197
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I9596501adf5b7b91983618c92c7b1792ee9461a3
Gerrit-Change-Number: 30197
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:17:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30195 )
Change subject: osmux: Avoid filling in seqnum holes upon rx of RTP pkt with M bit set
......................................................................
Patch Set 3:
(2 comments)
Patchset:
PS3:
> this seems to contradict https://gerrit.osmocom. […]
Those are 2 different RTP packets, see my other comment here.
File src/osmux_input.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/30195/comment/680e5f2a_a41c5466
PS3, Line 488: clone_req.rtph->marker = false;
> You can drop this again then
No, the fact that the currently incoming RTP packet being enqueued has no M bit set (as asserted by code added in line 438) has nothing to do with the fact that the last RTP packet which wa previously enqueued ("last" ptr) has the M bit set or not.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30195
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I561fb836989d31f43a15b193ed9bec4103ea0f2b
Gerrit-Change-Number: 30195
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 17 Nov 2022 11:16:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment