Attention is currently required from: pespin.
neels 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 3:
(1 comment)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/30120/comment/d79aa975_2c5d9d98
PS1, Line 685: codec_filter_set_bss(&trans->cc.codecs, &trans->msc_a->cc.compl_l3_codec_list_bss_supported);
> ACK let's push this forward and have a look at cleaning up/improving those aspects later.
now it is run() for logging (this log originally came in some later patch)
--
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: 3
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Mar 2023 01:45:56 +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.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/30120
to look at the new patch set (#3).
Change subject: [codecs filter] MT call: apply BSS codec list
......................................................................
[codecs filter] MT call: apply BSS codec list
For MT call, initialize the codecs filter and apply the
Codec List (BSS Supported) from Compl L3.
Related: SYS#5066
Change-Id: I530409a64d11da48518a3dc60aa3a4e47c384663
---
M src/libmsc/gsm_04_08_cc.c
M tests/msc_vlr/msc_vlr_test_call.err
2 files changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/30120/3
--
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: 3
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-MessageType: newpatchset
Attention is currently required from: pespin.
neels 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 2:
(2 comments)
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/c/osmo-msc/+/30119/comment/1bcc085a_8d9f5358
PS1, Line 619: codec_filter_run(&trans->cc.codecs);
> For the sake of clarity understanding what is needed when I 'd prefer to get rid of it here and appl […]
Done
https://gerrit.osmocom.org/c/osmo-msc/+/30119/comment/d34f5efe_b1007521
PS1, Line 623: ec_filte
actually it is used here. The filter result should make sense for this log line, hence above run().
But correct, it will be run every time the result is used (or logged).
--
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: 2
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Mar 2023 01:39:49 +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: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30117 )
Change subject: [codecs filter] add trans.cc.codecs
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS1:
> I'm happy that you are splitting patches, don't make me wrong. […]
the new member will be used in many different places, see the patches marked "[codecs filter]", the commit log explains why no users are in this patch
--
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: 2
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Mar 2023 01:36:18 +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, fixeria.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/30114
to look at the new patch set (#3).
Change subject: add codec_mapping.h,c
......................................................................
add codec_mapping.h,c
Converting between different codec representations is confusing. This
codec mapping provides a consolidated overview of all our codec
representations, and how they match up.
In particular, it adds the SDP codec representation repertoire,
preparing the use of full SDP on the MNCC interface.
Related: SYS#5066
Change-Id: Iaa307be6a8487aa8d4ba7cd59d5c5ef04818a744
---
M include/osmocom/msc/Makefile.am
A include/osmocom/msc/codec_mapping.h
M src/libmsc/Makefile.am
A src/libmsc/codec_mapping.c
4 files changed, 600 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/30114/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30114
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Iaa307be6a8487aa8d4ba7cd59d5c5ef04818a744
Gerrit-Change-Number: 30114
Gerrit-PatchSet: 3
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-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31712 )
Change subject: fix coverity (false) warning in codec-list vty
......................................................................
fix coverity (false) warning in codec-list vty
Since there were complaints about this old parsing code during recent
code review in Ifdc9e04bf1d623da65bfb8a2fddea765601f6d9b, and now also
coverity finds something odd in it, just rewrite this.
Related: CID#310912
Change-Id: I96cd5d88ec6808a2915c6bccd0c0140216f328f2
---
M src/osmo-bsc/bsc_vty.c
M tests/msc.vty
2 files changed, 42 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/31712/1
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index c219ff4..5589b21 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -2712,6 +2712,7 @@
{
struct bsc_msc_data *data = bsc_msc_data(vty);
struct gsm_audio_support tmp[ARRAY_SIZE(data->audio_support)];
+ const char *arg = NULL;
int i;
/* Nr of arguments must fit in the array */
@@ -2724,35 +2725,28 @@
/* check all given arguments first */
for (i = 0; i < argc; i++) {
int j;
+ int ver;
+ arg = argv[i];
- /* check for hrX or frX */
- if (strlen(argv[i]) != 3
- || argv[i][1] != 'r'
- || (argv[i][0] != 'h' && argv[i][0] != 'f')
- || argv[i][2] < '0'
- || argv[i][2] > '9') {
- vty_out(vty, "Codec name must be hrX or frX. Was '%s'%s", argv[i], VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- /* store in tmp[] first, to not overwrite data->audio_support[] in case of error */
- tmp[i].ver = atoi(argv[i] + 2);
- if (strncmp("hr", argv[i], 2) == 0)
+ if (strncmp("hr", arg, 2) == 0)
tmp[i].hr = 1;
- else if (strncmp("fr", argv[i], 2) == 0)
+ else if (strncmp("fr", arg, 2) == 0)
tmp[i].hr = 0;
+ else
+ goto invalid_arg;
- /* forbid invalid versions */
- if (tmp[i].ver < 1 || tmp[i].ver > 7
- || (tmp[i].hr && tmp[i].ver == 2)) {
- vty_out(vty, "'%s' is not a valid codec version%s", argv[i], VTY_NEWLINE);
- return CMD_WARNING;
- }
+ ver = atoi(arg + 2);
+ if (ver < 1 || ver > 7)
+ goto invalid_arg;
+ tmp[i].ver = ver;
+
+ if (tmp[i].hr == 1 && ver == 2)
+ goto invalid_arg;
/* prevent duplicate entries */
for (j = 0; j < i; j++) {
if (gsm_audio_support_cmp(&tmp[j], &tmp[i]) == 0) {
- vty_out(vty, "duplicate entry in 'msc' / 'codec-support': %s%s", argv[i], VTY_NEWLINE);
+ vty_out(vty, "duplicate entry in 'msc' / 'codec-support': %s%s", arg, VTY_NEWLINE);
return CMD_WARNING;
}
}
@@ -2762,6 +2756,10 @@
data->audio_length = argc;
return CMD_SUCCESS;
+
+invalid_arg:
+ vty_out(vty, "%s is not a valid codec version%s", osmo_quote_cstr_c(OTC_SELECT, arg, -1), VTY_NEWLINE);
+ return CMD_WARNING;
}
#define LEGACY_STR "This command has no effect, it is kept to support legacy config files\n"
diff --git a/tests/msc.vty b/tests/msc.vty
index 74eca2a..092e5f0 100644
--- a/tests/msc.vty
+++ b/tests/msc.vty
@@ -33,16 +33,16 @@
...
OsmoBSC(config-msc)# codec-list foo
-Codec name must be hrX or frX. Was 'foo'
+"foo" is not a valid codec version
OsmoBSC(config-msc)# codec-list fr10
-Codec name must be hrX or frX. Was 'fr10'
+"fr10" is not a valid codec version
OsmoBSC(config-msc)# codec-list hr10
-Codec name must be hrX or frX. Was 'hr10'
+"hr10" is not a valid codec version
OsmoBSC(config-msc)# codec-list FR1
-Codec name must be hrX or frX. Was 'FR1'
+"FR1" is not a valid codec version
OsmoBSC(config-msc)# # Ensure the codec-list with wrong args did not change the config
OsmoBSC(config-msc)# show running-config
@@ -62,7 +62,7 @@
...
OsmoBSC(config-msc)# codec-list fr0 fr1
-'fr0' is not a valid codec version
+"fr0" is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
@@ -71,7 +71,7 @@
...
OsmoBSC(config-msc)# codec-list hr0 hr1
-'hr0' is not a valid codec version
+"hr0" is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
@@ -80,7 +80,7 @@
...
OsmoBSC(config-msc)# codec-list fr8 fr9
-'fr8' is not a valid codec version
+"fr8" is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
@@ -89,7 +89,7 @@
...
OsmoBSC(config-msc)# codec-list hr8 hr9
-'hr8' is not a valid codec version
+"hr8" is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
@@ -98,7 +98,7 @@
...
OsmoBSC(config-msc)# codec-list fr2 hr2
-'hr2' is not a valid codec version
+"hr2" is not a valid codec version
OsmoBSC(config-msc)# show running-config
...
msc 0
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31712
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I96cd5d88ec6808a2915c6bccd0c0140216f328f2
Gerrit-Change-Number: 31712
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: msuraev, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31678 )
Change subject: pcu_sock: fix PCU socket accept behavior
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bts/+/31678/comment/0f687ed6_df225735
PS1, Line 10: then the new connection should replace the old one
> Thanks for your input. […]
One approach is to `accept()` a new connection and then immediately `close()` if there is already an active one. Another approach is to disable read events on the listening socket by calling `osmo_fd_read_disable(&listen_bfd)` when we get the first connection - this is what osmo-bsc does, AFAICS.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31678
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I695b93fd8109ef4943f36716563c147927611e85
Gerrit-Change-Number: 31678
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Mar 2023 01:24:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31497 )
Change subject: pcu_sock: activate/deactivate PDCH on pcu reconnect
......................................................................
Patch Set 12:
(1 comment)
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31497/comment/5c130ffc_6bccb557
PS12, Line 67: is_ericsson_bts
I find this check weird. There seems to be nothing that prevents osmo-pcu to connect to osmo-bsc, even if non-Ericsson BTS is configured. So there *can* be a connection, but `pcu_connected()` will be saying there is no? Why not rather check `pcu_connected(bts) && is_ericsson_bts(bts)` in place?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31497
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9ea0c53a5e68a51c781ef43bae71f947cdb95678
Gerrit-Change-Number: 31497
Gerrit-PatchSet: 12
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Mar 2023 00:44:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31700 )
Change subject: [codecs filter] use codecs filter on crcx ok
......................................................................
Patch Set 1:
(2 comments)
File src/libmsc/gsm_04_08_cc.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4553):
https://gerrit.osmocom.org/c/osmo-msc/+/31700/comment/250b8d11_4bed6a0f
PS1, Line 1927: switch(cc_trans->cc.state) {
space required before the open parenthesis '('
File src/libmsc/msc_a.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4553):
https://gerrit.osmocom.org/c/osmo-msc/+/31700/comment/b7a605d1_8aae18c3
PS1, Line 1463: /* If an error occured, it was logged in cc_assignment_done() */
'occured' may be misspelled - perhaps 'occurred'?
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31700
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I03753df567d1dc24852e6fbb681fbba81d2a545d
Gerrit-Change-Number: 31700
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Tue, 07 Mar 2023 00:41:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment